From 63e6f6340bdb37ec79f8eca1092a94e38b20fd46 Mon Sep 17 00:00:00 2001 From: hongchao <3228015117@qq.com> Date: Thu, 15 May 2025 12:24:51 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/base/project/index.vue | 19 +++++++++++ src/views/base/section/index.vue | 32 +++++++++---------- .../claimAndreturn/picking/outbound/index.vue | 15 ++++++++- .../return/receive/component/addReturn1.vue | 4 ++- .../component/finishAndDetails.vue | 1 + .../csotSettlement/component/finishTable.vue | 2 ++ src/views/stquery/backRecord.vue | 2 +- src/views/stquery/deviceFixQuery.vue | 2 +- src/views/stquery/deviceInStoreQuery.vue | 2 +- src/views/stquery/deviceScrapQuery.vue | 2 +- src/views/stquery/deviceStatusRecord.vue | 2 +- src/views/stquery/leaseRecord.vue | 2 +- .../components/outbound-table.vue | 1 + src/views/stquery/projUsingRecord.vue | 16 ++++++++-- 14 files changed, 75 insertions(+), 27 deletions(-) diff --git a/src/views/base/project/index.vue b/src/views/base/project/index.vue index 6db0476..dc78b86 100644 --- a/src/views/base/project/index.vue +++ b/src/views/base/project/index.vue @@ -97,6 +97,11 @@ prop="deptName" :show-overflow-tooltip="true" /> + + + + + + { @@ -369,6 +387,7 @@ export default { dictType: undefined, status: '0', remark: undefined, + costIndicators: '', } this.resetForm('form') }, diff --git a/src/views/base/section/index.vue b/src/views/base/section/index.vue index d9ad22a..bde4519 100644 --- a/src/views/base/section/index.vue +++ b/src/views/base/section/index.vue @@ -47,11 +47,11 @@ /> - + @@ -144,9 +144,9 @@ @select="select" /> - + @@ -292,17 +292,17 @@ export default { trigger: 'blur', }, ], - costIndicators: [ - // { - // required: true, - // message: '费用指标不能为空', - // trigger: 'blur', - // }, - { - pattern: /^(?:[1-9][0-9]{0,7}|100000000)$/, - message: '请输入大于0且不能以0开头并小于一亿的正整数', - }, - ], + // costIndicators: [ + // // { + // // required: true, + // // message: '费用指标不能为空', + // // trigger: 'blur', + // // }, + // { + // pattern: /^(?:[1-9][0-9]{0,7}|100000000)$/, + // message: '请输入大于0且不能以0开头并小于一亿的正整数', + // }, + // ], // proId: [ // { required: true, message: "所属工程项目", trigger: "blur" } // ] @@ -412,7 +412,7 @@ export default { dictType: undefined, status: '0', remark: undefined, - costIndicators: '', + // costIndicators: '', longitude: '', latitude: '', address: '', diff --git a/src/views/claimAndreturn/picking/outbound/index.vue b/src/views/claimAndreturn/picking/outbound/index.vue index 4de89e4..7d8267f 100644 --- a/src/views/claimAndreturn/picking/outbound/index.vue +++ b/src/views/claimAndreturn/picking/outbound/index.vue @@ -142,7 +142,7 @@ align="center" label="序号" type="index" - :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)" + :index="indexContinuation(dialogQuery.pageNum, dialogQuery.pageSize)" /> @@ -642,6 +642,7 @@ export default { return date.getTime() > today.getTime(); // 禁止选择今天之后的日期 }, }, + timeTemp: '', // 存储时间 showSelect: true, rowTemp: {}, // 临时存储行数据 queryRules: { @@ -772,6 +773,7 @@ export default { this.dialogQuery.id = row.id this.leaseType = row.leaseType this.resetDialogQuery() + this.timeTemp = row.createTimes // this.getDialogList() }, @@ -781,6 +783,11 @@ export default { this.openCode = true this.resetForm('codeOutForm') this.resetForm('outQuery') + // 将 this.timeTemp 转换为 Date 对象 + const date = new Date(this.timeTemp); + // 提取年、月、日并格式化为 YYYY-MM-DD 格式 + const formattedDate = `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')}`; + this.codeOutForm.createTime = formattedDate; this.outNum = row.outNum this.outQuery.typeId = row.typeId this.outObj = row @@ -793,6 +800,12 @@ export default { this.openNum = true this.resetForm('codeOutForm') this.resetForm('numOutForm') + console.log("xxxxxxxxxx",this.timeTemp) + // 将 this.timeTemp 转换为 Date 对象 + const date = new Date(this.timeTemp); + // 提取年、月、日并格式化为 YYYY-MM-DD 格式 + const formattedDate = `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')}`; + this.numOutForm.createTime = formattedDate // console.log(row) let obj = {} this.$set(obj, 'taskId', row.taskId) diff --git a/src/views/claimAndreturn/return/receive/component/addReturn1.vue b/src/views/claimAndreturn/return/receive/component/addReturn1.vue index 008acab..a2891a8 100644 --- a/src/views/claimAndreturn/return/receive/component/addReturn1.vue +++ b/src/views/claimAndreturn/return/receive/component/addReturn1.vue @@ -1136,7 +1136,7 @@ export default { // preNum: 1, // num: deviceTypeList[0].data.num, // useNum: deviceTypeList[0].data.num, - typeName: deviceTypeList[0].data.typeName, + typeName: deviceTypeList[0].parent.data.typeName, } // if (val.length > 0) { // const items = val.map((e) => { @@ -1185,6 +1185,7 @@ export default { console.log("yyyyyyyyyyy",val) const res = await getFourMaTypeListTwo({ id: val, agreementId: this.queryParams.agreementId }) const selectType = res.data + console.log("vvvvvvvvvvvv",selectType,this.selectParams) this.selectParams.typeId = selectType.id this.selectParams.typeCode = selectType.name this.selectParams.unitNames = selectType.unit @@ -1196,6 +1197,7 @@ export default { this.selectParams.standardIds = [] this.selectParams.passMaCodeDtoList = [] this.selectParams.manageType = selectType.manageType + this.selectParams.maintenanceNum = 0 console.log('🚀 ~ changeType ~ this.selectParams:', this.selectParams) // 判断是否重复 const isRepeat = this.leaseApplyDetails.find((item) => item.typeId == selectType.id) diff --git a/src/views/cost/csotSettlement/component/finishAndDetails.vue b/src/views/cost/csotSettlement/component/finishAndDetails.vue index 9f1bdd5..15cc740 100644 --- a/src/views/cost/csotSettlement/component/finishAndDetails.vue +++ b/src/views/cost/csotSettlement/component/finishAndDetails.vue @@ -93,6 +93,7 @@ size="mini" type="primary" @click="submitComSett" + v-hasPermi="['cost:settlement:update']" v-if="currRowInfo[0].isSlt == 0 || currRowInfo[0].isSlt == 2" >确认完工结算 diff --git a/src/views/cost/csotSettlement/component/finishTable.vue b/src/views/cost/csotSettlement/component/finishTable.vue index d8a5b3b..01007d0 100644 --- a/src/views/cost/csotSettlement/component/finishTable.vue +++ b/src/views/cost/csotSettlement/component/finishTable.vue @@ -39,6 +39,7 @@ 确认结算 - + - + - +