wangchengming/YouKeChuanMei_VUE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复PPT分析，时间解析错误

Browse Source
This commit is contained in:
wangchengming 2025-10-28 16:00:30 +08:00
parent ff6b88d496
commit ca707233fb
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@ -32,6 +32,7 @@
"js-cookie": "3.0.5", "js-cookie": "3.0.5",
"jsencrypt": "3.3.2", "jsencrypt": "3.3.2",
"lib-flexible-computer": "^1.0.2", "lib-flexible-computer": "^1.0.2",
"moment": "^2.30.1",
"nprogress": "0.2.0", "nprogress": "0.2.0",
"pinia": "3.0.2", "pinia": "3.0.2",
"splitpanes": "4.0.4", "splitpanes": "4.0.4",

6
src/views/mediaLibrary/exportDialog.vue
View File

@ -1156,7 +1156,7 @@ const exportForm = ref({
// 基础字段是否全选 // 基础字段是否全选
const baseFieldCheckAll = ref(false) const baseFieldCheckAll = ref(false)
const baseFieldIsIndeterminate = ref(true) const baseFieldIsIndeterminate = ref(false)
// 基础字段 // 基础字段
const baseFields = ref([]) const baseFields = ref([])
const _baseFields = ref(null) const _baseFields = ref(null)
@ -1165,7 +1165,7 @@ const checkedBaseFields = ref([])
// 报价字段是否全选 // 报价字段是否全选
const priceFieldCheckAll = ref(false) const priceFieldCheckAll = ref(false)
const priceFieldIsIndeterminate = ref(true) const priceFieldIsIndeterminate = ref(false)
// 报价字段 // 报价字段
const priceFields = ref([]) const priceFields = ref([])
// const _priceFields = ref(null) // const _priceFields = ref(null)
@ -1292,6 +1292,8 @@ const getMediaExcelPriceField = () => {
// 类型切换 // 类型切换
const handleChangeType = (_type) => { const handleChangeType = (_type) => {
activeIndex.value = _type activeIndex.value = _type
priceFieldCheckAll.value = false
priceFieldIsIndeterminate.value = false
if (ToolOptions.value.length == 8) { if (ToolOptions.value.length == 8) {
switch (_type) { switch (_type) {
case 0: case 0:

6
src/views/mediaTool/pptAnalysisIndex.vue
View File

@ -72,9 +72,9 @@
:stroke-width="2" :color="colors" /> :stroke-width="2" :color="colors" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作时间" align="center" prop="completed_at" width="210"> <el-table-column label="操作时间" align="center" prop="created_at" width="210">
<template #default="scope"> <template #default="scope">
<span>{{ dayjs(scope.row.completed_at).format('YYYY-MM-DD HH:mm:ss') }}</span> <span>{{ moment(scope.row.created_at, "ddd, DD MMM YYYY HH:mm:ss [GMT]").format('YYYY-MM-DD HH:mm:ss') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" :width="160" align="center"> <el-table-column label="操作" :width="160" align="center">
@ -100,7 +100,7 @@
<script setup> <script setup>
import { onMounted, nextTick, defineEmits, ref } from 'vue' import { onMounted, nextTick, defineEmits, ref } from 'vue'
import { Close } from '@element-plus/icons-vue' import { Close } from '@element-plus/icons-vue'
import dayjs from 'dayjs' import moment from 'moment'
import { uploadPPTAnalysisFile, pptAnalysisTaskPageList, pptAnalysisStatistics, deletePPTAnalysisTask, exportPPTAnalysisReport } from "@/api/pptAnalysis" import { uploadPPTAnalysisFile, pptAnalysisTaskPageList, pptAnalysisStatistics, deletePPTAnalysisTask, exportPPTAnalysisReport } from "@/api/pptAnalysis"

5
src/views/supplier/supplierForm.vue
View File

@ -379,7 +379,10 @@ const data = reactive({
bangongDizhi: [{ required: true, message: "办公地址不能为空", trigger: "blur" }], bangongDizhi: [{ required: true, message: "办公地址不能为空", trigger: "blur" }],
contactDuties: [{ required: true, message: "联系人职务不能为空", trigger: "blur" }], contactDuties: [{ required: true, message: "联系人职务不能为空", trigger: "blur" }],
contactName: [{ required: true, message: "联系人姓名不能为空", trigger: "blur" }], contactName: [{ required: true, message: "联系人姓名不能为空", trigger: "blur" }],
phone: [{ required: true, message: "联系人电话不能为空", trigger: "blur" }, { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的联系人电话(手机号)", trigger: "blur" }], phone: [
{ required: true, message: "联系人电话不能为空", trigger: "blur" },
// { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的联系人电话(手机号)", trigger: "blur" }
],
hzCgAmount: [{ required: true, message: "合作采购金额不能为空", trigger: "change" }], hzCgAmount: [{ required: true, message: "合作采购金额不能为空", trigger: "change" }],
supplierPeihe: [{ required: true, message: "供应商配合度不能为空", trigger: "change" }], supplierPeihe: [{ required: true, message: "供应商配合度不能为空", trigger: "change" }],
hzZkLd: [{ required: true, message: "合作折扣力度不能为空", trigger: "change" }], hzZkLd: [{ required: true, message: "合作折扣力度不能为空", trigger: "change" }],