From 142dd97a2c3c61382737da74428db1cde829d2bb Mon Sep 17 00:00:00 2001 From: wws <18630710203@163.com> Date: Thu, 2 Nov 2023 09:06:34 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=82=B9=E6=A3=80=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E3=80=81=E4=BF=9D=E5=85=BB=E5=B7=A5=E5=8D=95init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/device/upkeepOrder/index.vue | 1856 ++++++++++++++++-------- src/views/device/upkeepPlan/index.vue | 24 +- 2 files changed, 1269 insertions(+), 611 deletions(-) diff --git a/src/views/device/upkeepOrder/index.vue b/src/views/device/upkeepOrder/index.vue index 4dc28977..127513e2 100644 --- a/src/views/device/upkeepOrder/index.vue +++ b/src/views/device/upkeepOrder/index.vue @@ -1,608 +1,1266 @@ diff --git a/src/views/device/upkeepPlan/index.vue b/src/views/device/upkeepPlan/index.vue index 271a7941..63af2387 100644 --- a/src/views/device/upkeepPlan/index.vue +++ b/src/views/device/upkeepPlan/index.vue @@ -861,7 +861,7 @@ export default { equTotal: 0, // 搜索到的设备list queryEquipment: [], - // 设备弹窗搜索条件 + // 备件弹窗搜索条件 spareQuery: { materialCode: null, materialDesc: null, @@ -932,17 +932,17 @@ export default { }, // 表单参数 form: { - selectSpareList: [], - equipmentItem: [], - shutDown: '0', - calculationRule: '0', - planLoopType: 'day', - planLoop: null, - upkeep: '1', - planName: null, - planWorkshop: null, - personList:[], - planTimeArray:[], + selectSpareList: [], + equipmentItem: [], + shutDown: '0', + calculationRule: '0', + planLoopType: 'day', + planLoop: null, + upkeep: '1', + planName: null, + planWorkshop: null, + personList:[], + planTimeArray:[], }, // 表单校验 rules: {} From 4099231d7b6b736c82c78e7a1421e4f34cc1d366 Mon Sep 17 00:00:00 2001 From: wws <18630710203@163.com> Date: Thu, 2 Nov 2023 09:56:05 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=88=90=E5=93=81?= =?UTF-8?q?=E6=8B=86=E5=88=86BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/plan/order/index.vue | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/views/plan/order/index.vue b/src/views/plan/order/index.vue index 3422b205..f43d67ff 100644 --- a/src/views/plan/order/index.vue +++ b/src/views/plan/order/index.vue @@ -932,7 +932,7 @@ export default { } } - this.productData[0].atrr1 = this.splitForm.splitNum + this.productData[0].atrr1 = this.splitForm.splitNum; setAtrr1(this.productData[0], this.splitForm.splitNum) this.refreshProTable = false // 先将refreshProTable设置为false，隐藏表格 @@ -1112,6 +1112,25 @@ export default { //整理订单传入到后端 this.splitForm.formFields = this.formFields //整理数据往后端发送 + // 递归操作处理已拆分信息 + function setQuantitySplit(data) { + if (data.children !== undefined) { + for (let i = 0; i < data.children.length; i++) { + if (data.children[i].quantitySplit == null) { + data.children[i].quantitySplit = 0; + } + data.children[i].quantitySplit = Number(data.children[i].quantitySplit) + Number(data.children[i].atrr1) + setQuantitySplit(data.children[i]); + } + } + } + + if (this.productData[0].quantitySplit == null) { + this.productData[0].quantitySplit = 0; + } + this.productData[0].quantitySplit = Number(this.splitForm.splitNum) + Number(this.productData[0].quantitySplit); + setQuantitySplit(this.productData[0]) + //下面是请求处理 const data = { formFields: this.formFields, From 3bb5790c6b5b871fbcf4b0463f48cb01c424d14f Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 2 Nov 2023 11:20:08 +0800 Subject: [PATCH 3/4] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/quality/income.js | 5 +- .../quality/qcIncome/checkProjectType.vue | 2 +- src/views/quality/qcIncome/index.vue | 1 - src/views/quality/qcProduce/index.vue | 1 - src/views/quality/qcWarehousing/index.vue | 1 - src/views/quality/unqualified/index.vue | 203 ++++++++++++++---- .../technology/proroute/routeprodproduct.vue | 2 +- 7 files changed, 161 insertions(+), 54 deletions(-) diff --git a/src/api/quality/income.js b/src/api/quality/income.js index c859d3d5..416fdcd7 100644 --- a/src/api/quality/income.js +++ b/src/api/quality/income.js @@ -119,10 +119,11 @@ export function commitActualValue(recordId, actualValues) { } //审核结果提交 -export function commitCheckResult(recordId,typeCode) { +export function commitCheckResult(recordId,typeCode,checkType) { const data = { recordId, - typeCode + typeCode, + checkType } return request({ url: '/quality/qcIncome/commitCheckResult', diff --git a/src/views/quality/qcIncome/checkProjectType.vue b/src/views/quality/qcIncome/checkProjectType.vue index b5a91eca..3a0a4379 100644 --- a/src/views/quality/qcIncome/checkProjectType.vue +++ b/src/views/quality/qcIncome/checkProjectType.vue @@ -172,7 +172,7 @@ export default { //提交整体检测结果 submitBomForm() { - commitCheckResult(this.queryParams.belongTo,this.typeCode).then(response => { + commitCheckResult(this.queryParams.belongTo,this.typeCode,this.checkType).then(response => { this.$modal.msgSuccess("检测完成"); this.$emit('saveCheck'); this.showFlag = false; diff --git a/src/views/quality/qcIncome/index.vue b/src/views/quality/qcIncome/index.vue index 3cfe9c61..8933fc61 100644 --- a/src/views/quality/qcIncome/index.vue +++ b/src/views/quality/qcIncome/index.vue @@ -569,7 +569,6 @@ export default { }); } else { addIncome(this.form).then(response => { - this.$modal.msgSuccess("新增成功"); this.open = false; this.getList(); }); diff --git a/src/views/quality/qcProduce/index.vue b/src/views/quality/qcProduce/index.vue index b4c92d0f..a9f85215 100644 --- a/src/views/quality/qcProduce/index.vue +++ b/src/views/quality/qcProduce/index.vue @@ -599,7 +599,6 @@ export default { }); } else { addQcProduce(this.form).then(response => { - this.$modal.msgSuccess("新增成功"); this.open = false; this.getList(); }); diff --git a/src/views/quality/qcWarehousing/index.vue b/src/views/quality/qcWarehousing/index.vue index ea5389fe..7a7153eb 100644 --- a/src/views/quality/qcWarehousing/index.vue +++ b/src/views/quality/qcWarehousing/index.vue @@ -592,7 +592,6 @@ export default { }); } else { addWarehousing(this.form).then(response => { - this.$modal.msgSuccess("新增成功"); this.open = false; this.getList(); }); diff --git a/src/views/quality/unqualified/index.vue b/src/views/quality/unqualified/index.vue index 77f1e65e..3e8b6696 100644 --- a/src/views/quality/unqualified/index.vue +++ b/src/views/quality/unqualified/index.vue @@ -1,14 +1,22 @@