feat(srmSupplier): 完善供应商管理功能模块

- 在供应商地址表中新增邮箱、原产国、装货港字段配置
- 移除供应商货币信息中的站点字段显示
- 更新供应商列表搜索条件绑定数据源，使用currentSupplier替代searchData
- 修正供应商分类标签文本从'供应商分组'改为'供应商分类'
- 初始化供应商对话框数据结构，完善供应商信息字段定义
- 调整供应商搜索功能的数据绑定逻辑，统一使用currentSupplier对象
- 更新供应商添加功能的数据初始化，确保所有字段正确重置

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) {

src/views/modules/srmBaseInformation/srmSupplierCurrency.vue

@@ -94,9 +94,6 @@
         <el-form-item label="货币描述" prop="currencyDesc" :rules="rules.currencyDesc">
           <el-input v-model="modalData.currencyDesc" style="width: 325px"></el-input>
         </el-form-item>
-        <el-form-item label="站点" prop="site" :rules="rules.site" v-if="modalData.flag === '2'">
-          <el-input v-model="modalData.site" disabled style="width: 325px"></el-input>
-        </el-form-item>
       </el-form>
       <el-footer style="height:40px;margin-top: 20px;text-align:center">
         <el-button type="primary" @click="saveData()">保存</el-button>
@@ -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',

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',

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',

src/views/modules/srmSupplier/supplierList.vue

@@ -173,7 +173,7 @@
               <el-col :span="6">
                 <el-form-item >
                   <span style="cursor: pointer" slot="label" @click="getBaseList(521)"><a href="#">供应商分类</a></span>
-                  <el-input v-model="searchData.supplierGroup" style="width: 130px"></el-input>
+                  <el-input v-model="currentSupplier.supplierGroup" style="width: 130px"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -198,25 +198,25 @@
               <el-col :span="6">
                 <el-form-item>
                   <span style="cursor: pointer" slot="label" @click="getBaseList(522)"><a href="#">税率编号</a></span>
-                  <el-input v-model="searchData.tax" style="width: 130px"></el-input>
+                  <el-input v-model="currentSupplier.taxCode" style="width: 130px"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item>
                   <span style="cursor: pointer" slot="label" @click="getBaseList(523)"><a href="#">付款条款</a></span>
-                  <el-input v-model="searchData.paymentTerm" style="width: 130px"></el-input>
+                  <el-input v-model="currentSupplier.paymentTerm" style="width: 130px"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item>
                   <span style="cursor: pointer" slot="label" @click="getBaseList(524)"><a href="#">交货条款</a></span>
-                  <el-input v-model="searchData.deliveryTerm" style="width: 130px"></el-input>
+                  <el-input v-model="currentSupplier.deliveryTerm" style="width: 130px"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item >
                   <span style="cursor: pointer" slot="label" @click="getBaseList(513)"><a herf="#">货币</a></span>
-                  <el-input v-model="searchData.currency" style="width: 130px"></el-input>
+                  <el-input v-model="currentSupplier.currency" style="width: 130px"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -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
     },