From 89887c03a5e4d11a6f1da284e7829d18ac18bdf6 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 27 Mar 2024 09:27:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=8A=E6=88=90=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/reportWork/index.vue | 66 +++------------------ src/views/mes/reportWork/selectMaterial.vue | 6 +- 2 files changed, 11 insertions(+), 61 deletions(-) diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue index 9b5049d..0fbe9e5 100644 --- a/src/views/mes/reportWork/index.vue +++ b/src/views/mes/reportWork/index.vue @@ -1376,13 +1376,13 @@ export default { return false; } - // submitConsumePS(this.consumeRows).then(response => { - // this.$modal.msgSuccess("报工信息修改成功"); - // this.openConsume = false; - // this.reset(); - // this.getList(); - // this.loading = false; - // }); + submitConsumePS(this.consumeRows).then(response => { + this.$modal.msgSuccess("报工信息修改成功"); + this.openConsume = false; + this.reset(); + this.getList(); + this.loading = false; + }); }, /** 导出按钮操作 */ handleExport() { @@ -1554,12 +1554,6 @@ export default { ) ) ); - console.log( - this.pConsumeRowsall, - this.pConsumeRows, - "111111", - this.mergedArray - ); const materialCodeSet = new Set( this.pConsumeRows.map((item) => item.materialCode) ); @@ -1589,52 +1583,6 @@ export default { this.$modal.msgError("选择物料重复,自动过滤!"); } } - // this.pConsumeRows = this.mergedArray - // for (let i = 0; i < obj.length; i++) { - // if (this.pConsumeRows.length != 0) { - // this.pConsumeRows.forEach(item => { - // console.log(item.materialCode == obj[i].component) - // if (item.materialCode == obj[i].component) { - // this.$modal.msgError("选择物料重复,自动过滤!"); - // } else { - // const row = { - // workorderCode: obj[i].workorderCode, - // materialCode: obj[i].component, - // materialName: obj[i].componentName, - // quantity: obj[i].quantity, - // unit: obj[i].unit, - // recoil: "X", - // parentOrder: sr.workorderCode - // }; - // this.consumeList.push(row); - // this.$nextTick(() => { - // let dynamicRef = 'tableIndex' + tableIndx; - // console.log(this.consumeList, row, this.pConsumeRows,'22222') - // _this.$refs[dynamicRef][0].toggleRowSelection(row); - // }); - // } - // }) - // } else { - // const row = { - // workorderCode: obj[i].workorderCode, - // materialCode: obj[i].component, - // materialName: obj[i].componentName, - // quantity: obj[i].quantity, - // unit: obj[i].unit, - // recoil: "X", - // parentOrder: sr.workorderCode - // }; - // this.consumeList.push(row); - - // // 默认勾选新添加的这一行 - // this.$nextTick(() => { - // let dynamicRef = 'tableIndex' + tableIndx; - // console.log(this.consumeList, row, this.pConsumeRows,'333333') - // _this.$refs[dynamicRef][0].toggleRowSelection(row); - // }); - - // } - // } }, //添加备注 addRemarksblur(table, remark, index) { diff --git a/src/views/mes/reportWork/selectMaterial.vue b/src/views/mes/reportWork/selectMaterial.vue index 64050ae..709422f 100644 --- a/src/views/mes/reportWork/selectMaterial.vue +++ b/src/views/mes/reportWork/selectMaterial.vue @@ -112,7 +112,8 @@ export default { componentName : '', productGroupName:'', workorderCode:'', - parentOrder:'' + parentOrder:'', + productType:'' }, selectionRows:[], tableIndex:'' @@ -129,10 +130,11 @@ export default { return cellValue.slice(7,18); //返回值 } }, - init(workorderCode,parentOrder,tableIndex){ + init(workorderCode,parentOrder,tableIndex,productType){ this.workorderCode = workorderCode; this.queryParams.workorderCode = this.workorderCode; this.queryParams.parentOrder = parentOrder; + this.queryParams.productType = productType this.tableIndex = tableIndex; this.getList(); },