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 = []