From f10620497fef151a9d183cf7e22995a015051c56 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Wed, 12 Nov 2025 10:03:33 +0800 Subject: [PATCH 1/4] =?UTF-8?q?2025-11-12=20=E6=B5=8B=E8=AF=95=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E7=BC=96=E8=BE=91=E9=87=8C=E7=9A=84clearable=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/test/requestForTest.vue | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/views/modules/test/requestForTest.vue b/src/views/modules/test/requestForTest.vue index 122c82f..78fa4c8 100644 --- a/src/views/modules/test/requestForTest.vue +++ b/src/views/modules/test/requestForTest.vue @@ -314,21 +314,17 @@ herf="#">Artwork - - TP工程师 + TP工程师 TP工程师 - - + + @@ -339,7 +335,7 @@ CQC - @@ -351,7 +347,7 @@ FAI - From 8e054463d8ee449b67aa160998acddb7b568ded0 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Wed, 12 Nov 2025 13:03:00 +0800 Subject: [PATCH 2/4] =?UTF-8?q?2025-11-12=20=E6=B5=8B=E8=AF=95=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E6=96=B0=E5=A2=9E=E7=BC=96=E8=BE=91=E5=AF=B9=E8=AF=9D?= =?UTF-8?q?=E6=A1=86=E9=87=8C=E5=A2=9E=E5=8A=A0=E6=9D=90=E6=96=99=E6=80=BB?= =?UTF-8?q?=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/test/requestForTest.vue | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/views/modules/test/requestForTest.vue b/src/views/modules/test/requestForTest.vue index 78fa4c8..4c15c60 100644 --- a/src/views/modules/test/requestForTest.vue +++ b/src/views/modules/test/requestForTest.vue @@ -354,8 +354,9 @@ - - + + 材料总金额：{{ materialTotalAmount.toFixed(2) }} + @@ -1034,6 +1035,15 @@ export default { return 'N' } }, + // 计算材料总金额 + materialTotalAmount() { + if (!this.testSoBomList || this.testSoBomList.length === 0) { + return 0 + } + return this.testSoBomList.reduce((sum, item) => { + return sum + (Number(item.totalCost) || 0) + }, 0) + } }, name: "test", components: { From 7995381485cae910b01e00055d30ca40c5dd0b02 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Wed, 12 Nov 2025 13:20:46 +0800 Subject: [PATCH 3/4] =?UTF-8?q?2025-11-12=20=E8=AF=A2=E4=BB=B7=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/quotation/requestForQuote.vue | 32 +++++++++++-------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/src/views/modules/quotation/requestForQuote.vue b/src/views/modules/quotation/requestForQuote.vue index 75483c4..a1c6e89 100644 --- a/src/views/modules/quotation/requestForQuote.vue +++ b/src/views/modules/quotation/requestForQuote.vue @@ -23,6 +23,8 @@ + + + + + + + + + + + + + + + + - + @@ -77,17 +93,6 @@ - - - - - - - - - - - 查询 新增 @@ -1008,7 +1013,8 @@ export default { menuId: this.$route.meta.menuId, quotationNo: '', nodeId: '', - approvalUsername: '' + approvalUsername: '', + createBy2: '' }, // 其它 dataListLoading: false, From aad552e89fd12a2bfc9c6a43a5c2670f1520158b Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Wed, 12 Nov 2025 14:40:10 +0800 Subject: [PATCH 4/4] =?UTF-8?q?2025-11-12=20=E6=B5=8B=E8=AF=95=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E5=A2=9E=E5=8A=A0=E5=B7=A5=E5=8D=95=E5=8F=B7=E5=92=8C?= =?UTF-8?q?=E6=9D=90=E6=96=99=E6=80=BB=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/test/requestForTest.vue | 53 ++++++++++++++++++++--- 1 file changed, 47 insertions(+), 6 deletions(-) diff --git a/src/views/modules/test/requestForTest.vue b/src/views/modules/test/requestForTest.vue index 4c15c60..cf9a911 100644 --- a/src/views/modules/test/requestForTest.vue +++ b/src/views/modules/test/requestForTest.vue @@ -1286,6 +1286,7 @@ export default { customerNoFlag: false, projectIdFlag: true, testPartNoFlag: false, + materialTotalAmount: 0, }, testDetailData: { technicalConsiderations: '', @@ -1405,8 +1406,9 @@ export default { sortLv: 0, status: true, fixed: '', - columnWidth: 80 - }, { + columnWidth: 60 + }, + { userId: this.$store.state.user.name, functionId: 103001, serialNumber: '103001Table1TestNo', @@ -1414,7 +1416,7 @@ export default { tableName: '测试信息表', columnProp: 'testNo', headerAlign: 'center', - align: 'center', + align: 'left', columnLabel: '测试单号', columnHidden: false, columnImage: false, @@ -1424,6 +1426,24 @@ export default { fixed: '', columnWidth: 120 }, + { + userId: this.$store.state.user.name, + functionId: 103001, + serialNumber: '103001Table1SoNumber', + tableId: '103001Table1', + tableName: '测试信息表', + columnProp: 'soNumber', + headerAlign: 'center', + align: 'left', + columnLabel: '工单号', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 120 + }, { userId: this.$store.state.user.name, functionId: 103001, @@ -1432,7 +1452,7 @@ export default { tableName: '测试信息表', columnProp: 'customerNo', headerAlign: 'center', - align: 'center', + align: 'left', columnLabel: '客户编码', columnHidden: false, columnImage: false, @@ -1512,7 +1532,7 @@ export default { sortLv: 0, status: true, fixed: '', - columnWidth: 140 + columnWidth: 120 }, { userId: this.$store.state.user.name, @@ -1530,7 +1550,7 @@ export default { sortLv: 0, status: true, fixed: '', - columnWidth: 140 + columnWidth: 120 }, { userId: this.$store.state.user.name, @@ -1548,6 +1568,24 @@ export default { sortLv: 0, status: true, fixed: '', + columnWidth: 200 + }, + { + userId: this.$store.state.user.name, + functionId: 103001, + serialNumber: '103001Table1MaterialTotalAmount', + tableId: '103001Table1', + tableName: '测试信息表', + columnProp: 'materialTotalAmount', + headerAlign: 'center', + align: 'right', + columnLabel: '材料总金额', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', columnWidth: 100 }, { @@ -2903,6 +2941,9 @@ export default { // return // } // this.confirmProjectPart(); + // 计算材料总金额 + this.modalData.materialTotalAmount = this.materialTotalAmount; + if (this.modalData.flag === '1') { this.testSoRoutingList = [] this.testSoBomList = []