From 9a807ff798a3ef2aaa5613aa7193aab97fb7aae0 Mon Sep 17 00:00:00 2001 From: juzi <819872918@qq.com> Date: Mon, 26 Feb 2024 10:15:56 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=83=BD=E6=BA=90bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/energyQuantityRealtime/index.vue | 2 +- .../energyType/components/energyTypeAdd.vue | 24 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/views/energy/base/energyQuantityRealtime/index.vue b/src/views/energy/base/energyQuantityRealtime/index.vue index 3c96905d..956c4077 100644 --- a/src/views/energy/base/energyQuantityRealtime/index.vue +++ b/src/views/energy/base/energyQuantityRealtime/index.vue @@ -193,7 +193,7 @@ export default { if (this.exportList.length > 0) { let body = this.exportList.map((x) => [ x.objName, - x.objRemark, + x.objCode, x.energyTypeName, x.startValue, x.endValue, diff --git a/src/views/energy/base/energyType/components/energyTypeAdd.vue b/src/views/energy/base/energyType/components/energyTypeAdd.vue index 434f06f3..e9f085c0 100644 --- a/src/views/energy/base/energyType/components/energyTypeAdd.vue +++ b/src/views/energy/base/energyType/components/energyTypeAdd.vue @@ -152,7 +152,7 @@ export default { id: '', name: '', code: '', - nuit: '', + unit: '', pricingMethod: 2, leaderName: '', push: false @@ -186,16 +186,16 @@ export default { if (res.code === 0) { this.form.name = res.data.name this.form.code = res.data.code - this.form.nuit = res.data.nuit + this.form.unit = res.data.unit this.form.pricingMethod = res.data.pricingMethod this.form.leaderName = res.data.leaderName this.form.push = res.data.push ? true : false switch(this.form.pricingMethod) { case 0: - this.tableData1 = this.form.segPriceList || [] + this.tableData1 = res.data.segPriceList || [] break; case 1: - this.tableData2 = this.form.usedPriceList || [] + this.tableData2 = res.data.usedPriceList || [] break; default: } @@ -233,10 +233,10 @@ export default { // 增加 emitButtonClick1() { let n = this.tableData1.length - // if (n >=3) { - // this.$modal.msgWarning('最多可添加3档计价') - // return false - // } + if (n >=3) { + this.$modal.msgWarning('最多可添加3档计价') + return false + } let obj = {} obj.startTime = n === 0 ? '' : this.tableData1[n-1].endTime obj.endTime = '' @@ -245,10 +245,10 @@ export default { }, emitButtonClick2() { let n = this.tableData2.length - if (n >=3) { - this.$modal.msgWarning('最多可添加3档计价') - return false - } + // if (n >=3) { + // this.$modal.msgWarning('最多可添加3档计价') + // return false + // } let obj = {} obj.startUsed = n === 0 ? 0 : this.tableData2[n-1].endUsed obj.endUsed = 0 From 512986faf629b0dbb6b4f678c8731e6669718d07 Mon Sep 17 00:00:00 2001 From: lb Date: Mon, 26 Feb 2024 10:28:16 +0800 Subject: [PATCH 2/4] fix navbar right --- src/layout/components/NavbarRight.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layout/components/NavbarRight.vue b/src/layout/components/NavbarRight.vue index 98f97a3b..2bf5d3ee 100644 --- a/src/layout/components/NavbarRight.vue +++ b/src/layout/components/NavbarRight.vue @@ -68,7 +68,7 @@ export default { getUserMsg() { let id = this.$store.getters.userId getUserSimple(id).then(res => { - this.dept = res.data.deptName ? res.data.dept.deptName : '---' + this.dept = res.data.deptName ? res.data.deptName : '---' }) }, async logout() { From 3e89f4066fc9e8990e113bb0783817f49b4a3e37 Mon Sep 17 00:00:00 2001 From: juzi <819872918@qq.com> Date: Mon, 26 Feb 2024 13:18:21 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=AE=A2=E5=8D=95bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/orderGroup/orderGroupDetailData.vue | 9 +++------ .../base/orderManage/components/addWorkOrder.vue | 16 ++++++++-------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/views/order/base/orderGroup/orderGroupDetailData.vue b/src/views/order/base/orderGroup/orderGroupDetailData.vue index ca0e3132..ae2dae38 100644 --- a/src/views/order/base/orderGroup/orderGroupDetailData.vue +++ b/src/views/order/base/orderGroup/orderGroupDetailData.vue @@ -44,7 +44,7 @@
加工平方数(平方米)
-
{{orderGroupMsg.actualArea}}
+
{{orderGroupMsg.planArea}}
状态
@@ -114,7 +114,7 @@
加工平方数(平方米)
-
{{item.actualArea}}
+
{{item.planArea}}
预计用时(时)
@@ -247,7 +247,7 @@ export default { orderGroupId: '', tableProps, orderMsg: [], - tableH: this.tableHeight(510) / 2, + tableH: 150, // 查询参数 queryParams: { pageNo: 1, @@ -257,9 +257,6 @@ export default { } }, mounted() { - window.addEventListener('resize', () => { - this.tableH = this.tableHeight(510) / 2 - }) this.orderGroupId = location.href.split('?')[1].split('=')[1] this.getMsg() }, diff --git a/src/views/order/base/orderManage/components/addWorkOrder.vue b/src/views/order/base/orderManage/components/addWorkOrder.vue index 27420779..ea46e766 100644 --- a/src/views/order/base/orderManage/components/addWorkOrder.vue +++ b/src/views/order/base/orderManage/components/addWorkOrder.vue @@ -202,8 +202,8 @@ export default { processFlowList: [], productLineList: [], workOrderTypeList: [ - {id: 1,name:'标准工单'}, - {id: 2, name:'特殊工单'} + {id: 1,name:'普通'}, + {id: 2, name:'特殊'} ], planStartTime: '', planFinishTime: '', @@ -291,12 +291,12 @@ export default { _this.$modal.msgSuccess("操作成功") let name = this.form.name _this.$emit('addWorkOrderSubmit') - // 询问是否添加预使用主原料 - _this.$modal.confirm('是否添加预使用主原料信息?').then(function() { - _this.$router.push({ - path: '/core/core-work-order?workOrderName='+encodeURI(name) - }) - }) + // // 询问是否添加预使用主原料 + // _this.$modal.confirm('是否添加预使用主原料信息?').then(function() { + // _this.$router.push({ + // path: '/core/core-work-order?workOrderName='+encodeURI(name) + // }) + // }) } }) } else { From 65e2f9ed6a5a96796cded1fe07de4be2568ee251 Mon Sep 17 00:00:00 2001 From: juzi <819872918@qq.com> Date: Tue, 27 Feb 2024 09:12:17 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=AE=A2=E5=8D=95bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/orderGroup/orderGroupDetailData.vue | 4 ++-- src/views/order/base/orderManage/index.vue | 18 +++++++++--------- .../order/base/orderManage/orderDetailData.vue | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/views/order/base/orderGroup/orderGroupDetailData.vue b/src/views/order/base/orderGroup/orderGroupDetailData.vue index ae2dae38..33b9b60b 100644 --- a/src/views/order/base/orderGroup/orderGroupDetailData.vue +++ b/src/views/order/base/orderGroup/orderGroupDetailData.vue @@ -70,7 +70,7 @@
废片数量
-
该字段未绑定
+
{{orderGroupMsg.nokQuantity}}
 @@ -144,7 +144,7 @@
废片数量
-
该字段未绑定
+
{{item.nokQuantity}}
 diff --git a/src/views/order/base/orderManage/index.vue b/src/views/order/base/orderManage/index.vue index 4b46ebd9..b3c722ed 100644 --- a/src/views/order/base/orderManage/index.vue +++ b/src/views/order/base/orderManage/index.vue @@ -401,9 +401,9 @@ export default { }, // 完成,终止，作废 handleEditStatus(val, tip, status) { - console.log(val) + let _this = this if (val.workOrderNum > 0) {//有下级工单 - this.$confirm('是否将"'+tip+'"操作同步至下级工单?','确认信息', { + _this.$confirm('是否将"'+tip+'"操作同步至下级工单?','确认信息', { type: 'warning', distinguishCancelAndClose: true, confirmButtonText: '同步', @@ -411,26 +411,26 @@ export default { }).then(function() { console.log('同步') orderStatusSet({ id: val.id, status: status, isSync: true}).then(() => { - this.getList(); - this.$modal.msgSuccess("操作成功"); + _this.getList(); + _this.$modal.msgSuccess("操作成功"); }) }).catch(action => { if (action === 'cancel') { console.log('不同步') orderStatusSet({ id: val.id, status: status, isSync: false}).then(() => { - this.getList(); - this.$modal.msgSuccess("操作成功"); + _this.getList(); + _this.$modal.msgSuccess("操作成功"); }) }else { return console.log('关闭') } }) }else{// 无下级工单 - this.$modal.confirm('是否确认"'+tip+'"厂务订单名称为"' + val.name + '"的数据项?').then(function() { + _this.$modal.confirm('是否确认"'+tip+'"厂务订单名称为"' + val.name + '"的数据项?').then(function() { return orderStatusSet({ id: val.id, status: status}) }).then(() => { - this.getList(); - this.$modal.msgSuccess("操作成功"); + _this.getList(); + _this.$modal.msgSuccess("操作成功"); }).catch(() => {}); } }, diff --git a/src/views/order/base/orderManage/orderDetailData.vue b/src/views/order/base/orderManage/orderDetailData.vue index 93ec49cd..13616609 100644 --- a/src/views/order/base/orderManage/orderDetailData.vue +++ b/src/views/order/base/orderManage/orderDetailData.vue @@ -74,7 +74,7 @@
废片数量
-
该字段未绑定
+
{{orderMsg.nokQuantity}}