From 0c00ea27790c44d445ef1989794ebf94da4f8eb8 Mon Sep 17 00:00:00 2001 From: qiezi <15576055375@163.com> Date: Thu, 7 Nov 2024 17:47:15 +0800 Subject: [PATCH] 2024-11-07 --- .../customerInformationManagement.vue | 36 +++------ .../modules/proofing/requestForProofing.vue | 80 ++++++++----------- src/views/modules/test/requestForTest.vue | 16 ---- .../modules/test/testSoBom/testTable.vue | 4 - 4 files changed, 45 insertions(+), 91 deletions(-) diff --git a/src/views/modules/customer/customerInformationManagement.vue b/src/views/modules/customer/customerInformationManagement.vue index 1e701d3..ec5ed71 100644 --- a/src/views/modules/customer/customerInformationManagement.vue +++ b/src/views/modules/customer/customerInformationManagement.vue @@ -45,7 +45,6 @@ :row-style="rowStyle" @row-click="customerClickRow" @selection-change="selectionCustomer" - @current-change="changeCurrentRow" style="width: 100%;"> - - - @@ -779,6 +775,11 @@ export default { this.modalData.customerGroupName2 = '' } } + }, + customerCurrentRow(newVal,oldVal){ + if (newVal){ + this.refreshCurrentTabTable(); + } } }, data() { @@ -1989,13 +1990,9 @@ export default { * 刷新页签的table数据 */ refreshCurrentTabTable() { - if (this.activeTable === 'customer_contact') { - this.getCustomerContactList() - } else if (this.activeTable === 'customer_address') { - this.getCustomerAddressList() - } else if (this.activeTable === 'project_information') { - this.getProjectInformationList() - } + this.getCustomerContactList() + this.getCustomerAddressList() + this.getProjectInformationList() }, // ======== 列表数据刷新方法 ======== @@ -2012,11 +2009,8 @@ export default { this.pageSize = data.page.pageSize this.totalPage = data.page.totalCount // 判断是否全部存在数据 - if (this.totalPage > 0) { - // 设置选中行 - this.$refs.customerTable.setCurrentRow(this.dataList[0]) - // 加载当前的页签的table - this.refreshCurrentTabTable() + if (this.dataList.length > 0) { + this.customerCurrentRow = {...this.dataList[0]} } } }) @@ -2663,10 +2657,6 @@ export default { * 客户信息新增/编辑 */ saveData() { - if (this.modalData.customerNo === '' || this.modalData.customerNo == null) { - this.$message.warning('请输入客户代码！') - return - } if (this.modalData.customerDesc === '' || this.modalData.customerDesc == null) { this.$message.warning('请输入客户名称！') return @@ -2908,7 +2898,7 @@ export default { * @param row */ customerClickRow(row) { - this.customerCurrentRow = JSON.parse(JSON.stringify(row)) + this.customerCurrentRow = {...row} }, /** * 单机选中客户联系人 @@ -3264,8 +3254,8 @@ export default { } }, rowStyle({row}) { - if (this.customerCurrentRow.customerNo === row.customerNo) { - return {'background-color': '#E8F7F6', cursor: 'pointer'}; + if (this.customerCurrentRow.customerNo === row.customerNo && this.customerCurrentRow.site === row.site) { + return {'background-color': '#E8F7F6'}; } }, } diff --git a/src/views/modules/proofing/requestForProofing.vue b/src/views/modules/proofing/requestForProofing.vue index fcc8b42..7477ea9 100644 --- a/src/views/modules/proofing/requestForProofing.vue +++ b/src/views/modules/proofing/requestForProofing.vue @@ -1547,8 +1547,8 @@ export default { { userId: this.$store.state.user.name, functionId: 102001, - serialNumber: '102001Table3TestPartNo', - tableId: '102001Table3', + serialNumber: '103001Table4TestPartNo', + tableId: '103001Table4', tableName: '项目物料表', columnProp: 'testPartNo', headerAlign: 'center', @@ -1565,8 +1565,8 @@ export default { { userId: this.$store.state.user.name, functionId: 102001, - serialNumber: '102001Table3PartDesc', - tableId: '102001Table3', + serialNumber: '103001Table4PartDesc', + tableId: '103001Table4', tableName: '项目物料表', columnProp: 'partDesc', headerAlign: 'center', @@ -1579,33 +1579,17 @@ export default { status: true, fixed: '', columnWidth: 120 - }, { - userId: this.$store.state.user.name, - functionId: 102001, - serialNumber: '102001Table3PartSpec', - tableId: '102001Table3', - tableName: '项目物料表', - columnProp: 'partSpec', - headerAlign: 'center', - align: 'center', - columnLabel: '产品规格', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 120 - }, { + }, + { userId: this.$store.state.user.name, functionId: 102001, - serialNumber: '102001Table3PartTypeDesc', - tableId: '102001Table3', + serialNumber: '103001Table4CustomerPartNo', + tableId: '103001Table4', tableName: '项目物料表', - columnProp: 'partTypeDesc', + columnProp: 'customerPartNo', headerAlign: 'center', align: 'center', - columnLabel: '产品类型', + columnLabel: '客户料号', columnHidden: false, columnImage: false, columnSortable: false, @@ -1617,13 +1601,13 @@ export default { { userId: this.$store.state.user.name, functionId: 102001, - serialNumber: '102001Table3Type', - tableId: '102001Table3', + serialNumber: '103001Table4PartSpec', + tableId: '103001Table4', tableName: '项目物料表', - columnProp: 'type', + columnProp: 'partSpec', headerAlign: 'center', align: 'center', - columnLabel: '制造类型', + columnLabel: '产品规格', columnHidden: false, columnImage: false, columnSortable: false, @@ -1631,35 +1615,34 @@ export default { status: true, fixed: '', columnWidth: 120 - }, - { + }, { userId: this.$store.state.user.name, functionId: 102001, - serialNumber: '102001Table3UmId', - tableId: '102001Table3', + serialNumber: '103001Table4PartTypeDesc', + tableId: '103001Table4', tableName: '项目物料表', - columnProp: 'umId', + columnProp: 'partTypeDesc', headerAlign: 'center', align: 'center', - columnLabel: '单位', + columnLabel: '产品类型', columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '', - columnWidth: 100 + columnWidth: 120 }, { userId: this.$store.state.user.name, functionId: 102001, - serialNumber: '102001Table3CodeNo', - tableId: '102001Table3', + serialNumber: '103001Table4Type', + tableId: '103001Table4', tableName: '项目物料表', - columnProp: 'codeNo', + columnProp: 'type', headerAlign: 'center', align: 'center', - columnLabel: '模板编码', + columnLabel: '制造类型', columnHidden: false, columnImage: false, columnSortable: false, @@ -1667,24 +1650,25 @@ export default { status: true, fixed: '', columnWidth: 120 - }, { + }, + { userId: this.$store.state.user.name, functionId: 102001, - serialNumber: '102001Table3CodeDesc', - tableId: '102001Table3', + serialNumber: '103001Table4UmId', + tableId: '103001Table4', tableName: '项目物料表', - columnProp: 'codeDesc', + columnProp: 'umId', headerAlign: 'center', align: 'center', - columnLabel: '模板名称', + columnLabel: '单位', columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '', - columnWidth: 120 - } + columnWidth: 100 + }, ], columnAddressList: [ { diff --git a/src/views/modules/test/requestForTest.vue b/src/views/modules/test/requestForTest.vue index 93862ac..cae16ba 100644 --- a/src/views/modules/test/requestForTest.vue +++ b/src/views/modules/test/requestForTest.vue @@ -1999,22 +1999,6 @@ fixed: '', columnWidth: 100, }, - // { - // userId: this.$store.state.user.name, - // functionId: 103001, - // serialNumber: '103001Table2ValueChooseFlag', - // tableId: "103001Table2", - // tableName: "物料属性表", - // columnProp: 'numValue', - // headerAlign: "center", - // align: "center", - // columnLabel: '数字值', - // columnHidden: false, - // columnImage: false, - // status: true, - // fixed: '', - // columnWidth: 70, - // }, ], rejectVisible:false, rejectOpinion:"", diff --git a/src/views/modules/test/testSoBom/testTable.vue b/src/views/modules/test/testSoBom/testTable.vue index ae80fc1..45a1e8e 100644 --- a/src/views/modules/test/testSoBom/testTable.vue +++ b/src/views/modules/test/testSoBom/testTable.vue @@ -674,10 +674,6 @@ export default { - - - -