From 0b28bfa78382f91e2b061d155246a3857ae1f9c9 Mon Sep 17 00:00:00 2001 From: qiankanghui <11284155+qian-kanghui@user.noreply.gitee.com> Date: Mon, 12 Jan 2026 12:05:00 +0800 Subject: [PATCH] =?UTF-8?q?feat(srmSupplier):=20=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在供应商地址表中新增邮箱、原产国、装货港字段配置 - 移除供应商货币信息中的站点字段显示 - 更新供应商列表搜索条件绑定数据源，使用currentSupplier替代searchData - 修正供应商分类标签文本从'供应商分组'改为'供应商分类' - 初始化供应商对话框数据结构，完善供应商信息字段定义 - 调整供应商搜索功能的数据绑定逻辑，统一使用currentSupplier对象 - 更新供应商添加功能的数据初始化，确保所有字段正确重置 --- src/views/modules/common/Chooselist_eam.vue | 4 +- .../srmSupplierCurrency.vue | 21 ---- .../srmSupplier/com_srmSupplier_Address.vue | 54 ++++++++++ .../srmSupplier/srmSupplierAddress.vue | 91 +++++++++++++++++ .../modules/srmSupplier/supplierList.vue | 98 +++++++++++++++---- 5 files changed, 226 insertions(+), 42 deletions(-) diff --git a/src/views/modules/common/Chooselist_eam.vue b/src/views/modules/common/Chooselist_eam.vue index e87ea65..f28f3e5 100644 --- a/src/views/modules/common/Chooselist_eam.vue +++ b/src/views/modules/common/Chooselist_eam.vue @@ -208,10 +208,10 @@ export default { if (bool) { sql += " and (" + this.baseListData.fieldname1 + " like '%" + this.param + "%' OR " + this.baseListData.fieldname2 + " like '%" + this.param + "%'" + " ) " } - if (this.param1) { + if (this.param1 ) { sql += " and " + this.baseListData.fieldname1 + " like '%" + this.param1 + "%'" } - if (this.param2) { + if (this.param2 ) { sql += " and " + this.baseListData.fieldname2 + " like '%" + this.param2 + "%'" } if (this.param3) { diff --git a/src/views/modules/srmBaseInformation/srmSupplierCurrency.vue b/src/views/modules/srmBaseInformation/srmSupplierCurrency.vue index 1e6f0d2..95e3520 100644 --- a/src/views/modules/srmBaseInformation/srmSupplierCurrency.vue +++ b/src/views/modules/srmBaseInformation/srmSupplierCurrency.vue @@ -94,9 +94,6 @@ - - - 保存 @@ -200,24 +197,6 @@ export default { fixed: '', columnWidth: 150, }, - { - userId: this.$store.state.user.name, - functionId: '812002', - serialNumber: '812002TableSite', - tableId: "812002Table", - tableName: "货币信息表", - columnProp: 'site', - 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: '812002', diff --git a/src/views/modules/srmSupplier/com_srmSupplier_Address.vue b/src/views/modules/srmSupplier/com_srmSupplier_Address.vue index 58e5aa2..9b6ab85 100644 --- a/src/views/modules/srmSupplier/com_srmSupplier_Address.vue +++ b/src/views/modules/srmSupplier/com_srmSupplier_Address.vue @@ -292,6 +292,24 @@ export default { fixed: '', columnWidth: 120, }, + { + userId: this.$store.state.user.name, + functionId: '9005', + serialNumber: '9005TableEmail', + tableId: "9005Table", + tableName: "供应商地址表", + columnProp: 'email', + headerAlign: "center", + align: "left", + columnLabel: '邮箱', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWith: 200, + }, { userId: this.$store.state.user.name, functionId: '9005', @@ -328,6 +346,42 @@ export default { fixed: '', columnWidth: 100, }, + { + userId: this.$store.state.user.name, + functionId: '9005', + serialNumber: '9005TableOriginCountry', + tableId: "9005Table", + tableName: "供应商地址表", + columnProp: 'originCountry', + headerAlign: "center", + align: "left", + columnLabel: '原产国', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 100, + }, + { + userId: this.$store.state.user.name, + functionId: '9005', + serialNumber: '9005TablePortOfLoading', + tableId: "9005Table", + tableName: "供应商地址表", + columnProp: 'portOfLoading', + headerAlign: "center", + align: "left", + columnLabel: '装货港', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 100, + }, { userId: this.$store.state.user.name, functionId: '9005', diff --git a/src/views/modules/srmSupplier/srmSupplierAddress.vue b/src/views/modules/srmSupplier/srmSupplierAddress.vue index 75e1659..6b6f27b 100644 --- a/src/views/modules/srmSupplier/srmSupplierAddress.vue +++ b/src/views/modules/srmSupplier/srmSupplierAddress.vue @@ -297,6 +297,60 @@ export default { fixed: '', columnWidth: 120, }, + { + userId: this.$store.state.user.name, + functionId: '9005', + serialNumber: '9005TableEmail', + tableId: "9005Table", + tableName: "供应商地址表", + columnProp: 'email', + headerAlign: "center", + align: "left", + columnLabel: '邮箱', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWith: 200, + }, + { + userId: this.$store.state.user.name, + functionId: '9005', + serialNumber: '9005TableOriginCountry', + tableId: "9005Table", + tableName: "供应商地址表", + columnProp: 'originCountry', + headerAlign: "center", + align: "left", + columnLabel: '原产国', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 100, + }, + { + userId: this.$store.state.user.name, + functionId: '9005', + serialNumber: '9005TablePortOfLoading', + tableId: "9005Table", + tableName: "供应商地址表", + columnProp: 'portOfLoading', + headerAlign: "center", + align: "left", + columnLabel: '装货港', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 100, + }, { userId: this.$store.state.user.name, functionId: '9005', @@ -333,6 +387,43 @@ export default { fixed: '', columnWidth: 100, }, + { + userId: this.$store.state.user.name, + functionId: '9005', + serialNumber: '9005TableOriginCountry', + tableId: "9005Table", + tableName: "供应商地址表", + columnProp: 'originCountry', + headerAlign: "center", + align: "left", + columnLabel: '原产国', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 100, + }, + { + userId: this.$store.state.user.name, + functionId: '9005', + serialNumber: '9005TablePortOfLoading', + tableId: "9005Table", + tableName: "供应商地址表", + columnProp: 'portOfLoading', + headerAlign: "center", + align: "left", + columnLabel: '出货港口', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 100, + }, + { userId: this.$store.state.user.name, functionId: '9005', diff --git a/src/views/modules/srmSupplier/supplierList.vue b/src/views/modules/srmSupplier/supplierList.vue index 212f9d3..12e7eb0 100644 --- a/src/views/modules/srmSupplier/supplierList.vue +++ b/src/views/modules/srmSupplier/supplierList.vue @@ -173,7 +173,7 @@ 供应商分类 - + @@ -198,25 +198,25 @@ 税率编号 - + 付款条款 - + 交货条款 - + 货币 - + @@ -379,7 +379,7 @@ export default { active: '', supplierGroup:'', currency:'', - tax:'', + taxCode:'', paymentTerm:'', deliveryTerm:'', site: this.$store.state.user.site, @@ -440,7 +440,7 @@ export default { columnProp: 'groupDesc', headerAlign: 'center', align: 'left', - columnLabel: '供应商分组', + columnLabel: '供应商分类', columnWidth: '100', columnHidden: false, columnImage: false, @@ -1068,7 +1068,38 @@ export default { // 供应商对话框相关 supplierDialogVisible: false, isAdd: true, - currentSupplier: {}, + currentSupplier: { + supplierNo: '', + supplierName: '', + supplierDocType: '', + active: '', + supplierGroup:'', + abc: '', + sourcingstaff: '', + currency:'', + taxCode:'', + paymentTerm:'', + deliveryTerm:'', + contract:'', + phoneNo: '', + phoneNo2:'', + phoneNo3:'', + email: '', + email2:'', + faxNo: '', + otherContact1:'', + otherContact2:'', + otherContact3:'', + bankName:'', + bankAccount:'', + address: '', + createDate: '', + createBy: '', + updateDate: '', + updateBy: '', + memo:'', + site: this.$store.state.user.site, + }, supplierRules: { site: [ { required: true, message: 'Site is required', trigger: 'blur' } @@ -1105,19 +1136,19 @@ export default { strVal = this.searchData.supplierNo } if (val === 521) { - strVal = this.searchData.supplierGroup + strVal = this.currentSupplier.supplierGroup } if (val === 513){ - strVal = this.searchData.currency + strVal = this.currentSupplier.currency } if (val === 522){ - strVal = this.searchData.tax + strVal = this.currentSupplier.taxCode } if (val === 523){ - strVal = this.searchData.paymentTerm + strVal = this.currentSupplier.paymentTerm } if (val === 524){ - strVal = this.searchData.deliveryTerm + strVal = this.currentSupplier.deliveryTerm } this.$refs.baseList.init(val, strVal) @@ -1130,19 +1161,19 @@ export default { this.searchData.supplierNo = val.supplier_no } if(this.tagNo == 513){ - this.searchData.currency = val.Currency + this.currentSupplier.currency = val.Currency } if (this.tagNo === 521) { - this.searchData.supplierGroup = val.supplier_group + this.currentSupplier.supplierGroup = val.supplier_group } if (this.tagNo === 522) { - this.searchData.tax = val.TaxCode + this.currentSupplier.taxCode = val.TaxCode } if (this.tagNo === 523) { - this.searchData.paymentTerm = val.PaymentTermID + this.currentSupplier.paymentTerm = val.PaymentTermID } if (this.tagNo === 524) { - this.searchData.deliveryTerm = val.DeliveryTermID + this.currentSupplier.deliveryTerm = val.DeliveryTermID } }, getMainData () { @@ -1279,8 +1310,37 @@ export default { addSupplier() { this.isAdd = true this.currentSupplier = { + supplierNo: '', + supplierName: '', + supplierDocType: '', + active: 'Y', + supplierGroup:'', + abc: '', + buyer: '', + sourcingstaff: '', + currency:'', + taxCode:'', + paymentTerm:'', + deliveryTerm:'', + contract:'', + phoneNo: '', + phoneNo2:'', + phoneNo3:'', + email: '', + email2:'', + faxNo: '', + otherContact1:'', + otherContact2:'', + otherContact3:'', + bankName:'', + bankAccount:'', + address: '', + createDate: '', + createBy: '', + updateDate: '', + updateBy: '', + memo:'', site: this.$store.state.user.site, - active: 'Y' // 默认激活 } this.supplierDialogVisible = true },