From ec476d1f63978362d756deb705637d37391140b9 Mon Sep 17 00:00:00 2001
From: qiankanghui <11284155+qian-kanghui@user.noreply.gitee.com>
Date: Fri, 9 Jan 2026 13:59:32 +0800
Subject: [PATCH] =?UTF-8?q?feat(srm):=20=E4=BC=98=E5=8C=96SRM=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E7=95=8C=E9=9D=A2=E4=BA=A4=E4=BA=92=E5=92=8C=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将多个表单中的中文选项标签改为英文（是/否改为Yes/No）
- 重构表单禁用逻辑，使用flag字段控制输入框的可编辑状态
- 统一各模块中站点字段的数据来源，使用user.site替代currentSite
- 移除供应商地址页面中不必要的Site查询条件和表格列配置
- 更新税率页面UI布局，移除税率百分比输入框的占位提示文本
- 修复供应商列表页面中供应商分组字段的绑定问题
- 优化供应商列表页面的基础数据关联功能，支持多类型基础数据查询
- 调整表单区域的样式间距，优化页面布局美观度
- 修正供应商列表页面中的HTML标签拼写错误（herf改为href）
---
 .../srmBaseInformation/srmDeliveryTerm.vue    |  14 +--
 .../srmBaseInformation/srmPaymentTerm.vue     |  10 +-
 .../srmSupplierCurrency.vue                   |  12 +-
 .../srmBaseInformation/srmSupplierGroup.vue   |   6 +-
 .../modules/srmBaseInformation/srmTax.vue     |  52 ++-------
 .../srmSupplier/com_srmSupplier_Address.vue   |  17 ++-
 .../srmSupplier/srmSupplierAddress.vue        |  37 ++-----
 .../modules/srmSupplier/supplierList.vue      | 103 ++++++++++++------
 8 files changed, 118 insertions(+), 133 deletions(-)

diff --git a/src/views/modules/srmBaseInformation/srmDeliveryTerm.vue b/src/views/modules/srmBaseInformation/srmDeliveryTerm.vue
index 059ea24..61d29bf 100644
--- a/src/views/modules/srmBaseInformation/srmDeliveryTerm.vue
+++ b/src/views/modules/srmBaseInformation/srmDeliveryTerm.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="mod-config">
     <el-form :inline="true" label-position="top" :model="searchData">
-      <el-form-item label="交货条款代码">
+      <el-form-item label="交货条款编码">
         <el-input v-model="searchData.deliveryTermId" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item label="交货条款描述">
@@ -71,7 +71,7 @@
 
     <el-dialog title="交货条款" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="415px">
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;" ref="modalForm">
-        <el-form-item label="交货条款代码" prop="deliveryTermId">
+        <el-form-item label="交货条款编码" prop="deliveryTermId">
           <el-input v-model="modalData.deliveryTermId" :disabled="modalDisableFlag" style="width: 100px"></el-input>
         </el-form-item>
         <el-form-item label="状态" prop="active">
@@ -110,7 +110,7 @@
         // 导出
         exportName: "交货条款" + this.dayjs().format('YYYYMMDDHHmmss'),
         searchData: {
-          site: '',
+          site: this.$store.state.user.site,
           deliveryTermId: '',
           deliveryTerm: '',
           active: '',
@@ -128,7 +128,7 @@
         modalData: {
           deliveryTermId: '',
           deliveryTerm: '',
-          site: '',
+          site: this.$store.state.user.site,
           active: '',
           createBy: this.$store.state.user.name,
           updateBy: this.$store.state.user.name
@@ -144,7 +144,7 @@
             columnProp: 'deliveryTermId',
             headerAlign: "center",
             align: "center",
-            columnLabel: '交货条款代码',
+            columnLabel: '交货条款编码',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -194,7 +194,7 @@
           deliveryTermId: [
             {
               required: true,
-              message: '请输入交货条款代码',
+              message: '请输入交货条款编码',
               trigger: 'blur'
             }
           ],
@@ -303,7 +303,7 @@
         this.modalData = {
           deliveryTermId: '',
           deliveryTerm: '',
-          site: this.$store.state.user.currentSite || '', // 使用当前用户默认站点
+          site: this.$store.state.user.site, // 使用当前用户默认站点
           active: 'Y',
           createBy: this.$store.state.user.name,
           updateBy: this.$store.state.user.name,
diff --git a/src/views/modules/srmBaseInformation/srmPaymentTerm.vue b/src/views/modules/srmBaseInformation/srmPaymentTerm.vue
index 5c70c9f..5776625 100644
--- a/src/views/modules/srmBaseInformation/srmPaymentTerm.vue
+++ b/src/views/modules/srmBaseInformation/srmPaymentTerm.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="mod-config">
     <el-form :inline="true" label-position="top" :model="searchData">
-      <el-form-item label="付款条款代码">
+      <el-form-item label="付款条款编码">
         <el-input v-model="searchData.paymentTermId" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item label="付款条款描述">
@@ -73,7 +73,7 @@
 
     <el-dialog title="付款条款" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="415px">
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;" ref="modalForm">
-        <el-form-item label="付款条款代码" prop="paymentTermId">
+        <el-form-item label="付款条款编码" prop="paymentTermId">
           <el-input v-model="modalData.paymentTermId" :disabled="modalDisableFlag" style="width: 90px"></el-input>
         </el-form-item>
         <el-form-item label="状态" prop="active">
@@ -156,7 +156,7 @@ export default {
           columnProp: 'paymentTermId',
           headerAlign: "center",
           align: "left",  // 修改为左对齐顶格显示
-          columnLabel: '付款条款代码',
+          columnLabel: '付款条款编码',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -346,7 +346,7 @@ export default {
       // 准备请求参数
       const params = {
         ...this.searchData,
-        site: this.$store.state.user.currentSite || '', // 确保使用当前用户的站点
+        site: this.$store.state.user.site, // 确保使用当前用户的站点
         page: this.pageIndex,
         limit: this.pageSize
       };
@@ -378,7 +378,7 @@ export default {
       this.modalData = {
         paymentTermId: '',
         paymentTerm: '',
-        site: this.$store.state.user.currentSite || '', // 使用当前用户默认站点
+        site: this.$store.state.user.site, // 使用当前用户默认站点
         active: 'Y',
         days: '',
         type: '',
diff --git a/src/views/modules/srmBaseInformation/srmSupplierCurrency.vue b/src/views/modules/srmBaseInformation/srmSupplierCurrency.vue
index f8614a2..1e6f0d2 100644
--- a/src/views/modules/srmBaseInformation/srmSupplierCurrency.vue
+++ b/src/views/modules/srmBaseInformation/srmSupplierCurrency.vue
@@ -2,8 +2,8 @@
   <div class="mod-config">
     <!-- 查询条件 -->
     <el-form :inline="true" label-position="top" :model="searchData">
-      <el-form-item label="货币代码">
-        <el-input v-model="searchData.currency" clearable style="width: 120px" placeholder="货币代码"></el-input>
+      <el-form-item label="货币编码">
+        <el-input v-model="searchData.currency" clearable style="width: 120px" placeholder="货币编码"></el-input>
       </el-form-item>
       <el-form-item label="货币描述">
         <el-input v-model="searchData.currencyDesc" clearable style="width: 160px" placeholder="货币描述"></el-input>
@@ -74,7 +74,7 @@
     <!-- 新增/修改对话框 -->
     <el-dialog :title="modalTitle" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="415px">
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" ref="modalForm" style="margin-left: 7px;">
-        <el-form-item label="货币代码" prop="currency" :rules="rules.currency">
+        <el-form-item label="货币编码" prop="currency" :rules="rules.currency">
           <el-input v-model="modalData.currency" :disabled="modalDisableFlag" style="width: 100px"></el-input>
         </el-form-item>
         <el-form-item label="状态" prop="active">
@@ -173,7 +173,7 @@ export default {
           columnProp: 'currency',
           headerAlign: "center",
           align: "center",
-          columnLabel: '货币代码',
+          columnLabel: '货币编码',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -257,7 +257,7 @@ export default {
       ],
       rules: {
         currency: [
-          { required: true, message: '请输入货币代码', trigger: 'blur' }
+          { required: true, message: '请输入货币编码', trigger: 'blur' }
         ],
         currencyDesc: [
           { required: true, message: '请输入货币描述', trigger: 'blur' }
@@ -421,7 +421,7 @@ export default {
 
     // 删除
     deleteHandle(row) {
-      this.$confirm(`确定删除此货币吗？货币代码：${row.currency}`, '提示', {
+      this.$confirm(`确定删除此货币吗？货币编码：${row.currency}`, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
diff --git a/src/views/modules/srmBaseInformation/srmSupplierGroup.vue b/src/views/modules/srmBaseInformation/srmSupplierGroup.vue
index aa10b2d..43cb465 100644
--- a/src/views/modules/srmBaseInformation/srmSupplierGroup.vue
+++ b/src/views/modules/srmBaseInformation/srmSupplierGroup.vue
@@ -129,7 +129,7 @@
         // 导出
         exportName: "供应商分组" + this.dayjs().format('YYYYMMDDHHmmss'),
         searchData: {
-          site: '',
+          site: this.$store.state.user.site,
           supplierGroup: '',
           groupDesc: '',
           active: '',
@@ -147,7 +147,7 @@
         modalData: {
           supplierGroup: '',
           groupDesc: '',
-          site: '',
+          site: this.$store.state.user.site,
           active: '',
           groupType: '',
           createBy: this.$store.state.user.name,
@@ -338,7 +338,7 @@
         this.modalData = {
           supplierGroup: '',
           groupDesc: '',
-          site: this.$store.state.user.currentSite || '', // 使用当前用户默认站点
+          site: this.$store.state.user.site, // 使用当前用户默认站点
           active: 'Y',
           groupType: 'Group1',
           createBy: this.$store.state.user.name,
diff --git a/src/views/modules/srmBaseInformation/srmTax.vue b/src/views/modules/srmBaseInformation/srmTax.vue
index 6c5ff9e..53f01cc 100644
--- a/src/views/modules/srmBaseInformation/srmTax.vue
+++ b/src/views/modules/srmBaseInformation/srmTax.vue
@@ -1,15 +1,12 @@
 <template>
   <div class="mod-config">
     <el-form :inline="true" label-position="top" :model="searchData">
-      <el-form-item label="税号代码">
+      <el-form-item label="税率编码">
         <el-input v-model="searchData.taxCode" clearable style="width: 120px"></el-input>
       </el-form-item>
-      <el-form-item label="税号描述">
+      <el-form-item label="税率描述">
         <el-input v-model="searchData.taxDesc" clearable style="width: 200px"></el-input>
       </el-form-item>
-      <el-form-item label="站点">
-        <el-input v-model="searchData.site" clearable style="width: 120px"></el-input>
-      </el-form-item>
       <el-form-item label="是否激活">
         <el-select v-model="searchData.active" clearable style="width: 120px">
           <el-option label="Yes" value="Y"></el-option>
@@ -71,16 +68,13 @@
 
     <el-dialog title="税率" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="415px">
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;" ref="modalForm">
-        <el-form-item label="税号代码" prop="taxCode">
+        <el-form-item label="税率编码" prop="taxCode">
           <el-input v-model="modalData.taxCode" :disabled="modalDisableFlag" style="width: 120px"></el-input>
         </el-form-item>
-        <el-form-item label="站点" prop="site">
-          <el-input v-model="modalData.site" :disabled="true" style="width: 120px"></el-input>
-        </el-form-item>
         <el-form-item label="是否激活" prop="active">
           <el-select v-model="modalData.active" style="width: 120px">
-            <el-option label="是" value="Y"></el-option>
-            <el-option label="否" value="N"></el-option>
+            <el-option label="Yes" value="Y"></el-option>
+            <el-option label="No" value="N"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="税率(%)" prop="taxRate">
@@ -88,15 +82,11 @@
             v-model="modalData.taxRate"
             style="width: 120px"
             @input="validateTaxRateInput"
-            placeholder="0-100，最多2位小数"
           ></el-input>
-          <div style="color: #999; font-size: 12px; margin-top: 4px;">
-            输入范围：0-100，最多2位小数
-          </div>
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;" ref="modalForm">
-        <el-form-item label="税号描述" prop="taxDesc">
+        <el-form-item label="税率描述" prop="taxDesc">
           <el-input v-model="modalData.taxDesc" style="width: 325px"></el-input>
         </el-form-item>
       </el-form>
@@ -124,7 +114,7 @@ export default {
       // 导出
       exportName: "税率" + dayjs().format('YYYYMMDDHHmmss'),
       searchData: {
-        site: '',
+        site: this.$store.state.user.site,
         taxCode: '',
         taxDesc: '',
         active: '',
@@ -143,7 +133,7 @@ export default {
       modalData: {
         taxCode: '',
         taxDesc: '',
-        site: '',
+        site: this.$store.state.user.site,
         taxRate: '',
         active: '',
         createBy: this.$store.state.user.name,
@@ -160,7 +150,7 @@ export default {
           columnProp: 'taxCode',
           headerAlign: "center",
           align: "left",
-          columnLabel: '税号代码',
+          columnLabel: '税率编码',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -178,7 +168,7 @@ export default {
           columnProp: 'taxDesc',
           headerAlign: "center",
           align: "left",
-          columnLabel: '税号描述',
+          columnLabel: '税率描述',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -187,24 +177,6 @@ export default {
           fixed: '',
           columnWidth: 200,
         },
-        {
-          userId: this.$store.state.user.name,
-          functionId: '9004',
-          serialNumber: '9004TableSite',
-          tableId: "9004Table",
-          tableName: "税率表",
-          columnProp: 'site',
-          headerAlign: "center",
-          align: "left",
-          columnLabel: 'Site',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 100,
-        },
         {
           userId: this.$store.state.user.name,
           functionId: '9004',
@@ -414,7 +386,7 @@ export default {
       // 准备请求参数
       const params = {
         ...this.searchData,
-        site: this.$store.state.user.currentSite || '', // 确保使用当前用户的站点
+        site: this.$store.state.user.site,
         page: this.pageIndex,
         limit: this.pageSize
       };
@@ -446,7 +418,7 @@ export default {
       this.modalData = {
         taxCode: '',
         taxDesc: '',
-        site: this.$store.state.user.currentSite || '',
+        site: this.$store.state.user.site,
         taxRate: '',
         active: 'Y',
         createBy: this.$store.state.user.name,
diff --git a/src/views/modules/srmSupplier/com_srmSupplier_Address.vue b/src/views/modules/srmSupplier/com_srmSupplier_Address.vue
index 5b329a8..58e5aa2 100644
--- a/src/views/modules/srmSupplier/com_srmSupplier_Address.vue
+++ b/src/views/modules/srmSupplier/com_srmSupplier_Address.vue
@@ -6,8 +6,8 @@
       </el-form-item>
       <el-form-item label="是否激活">
         <el-select v-model="searchData.active" clearable style="width: 120px">
-          <el-option label="是" value="Y"></el-option>
-          <el-option label="否" value="N"></el-option>
+          <el-option label="Yes" value="Y"></el-option>
+          <el-option label="No" value="N"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label=" ">
@@ -54,19 +54,19 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="供应商ID" prop="supplierId">
-              <el-input v-model="modalData.supplierId" :disabled="modalDisableFlag" style="width: 100%"></el-input>
+              <el-input v-model="modalData.supplierId" :disabled="modalData.flag === '1' || modalData.flag === '2'" style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="Site" prop="site">
-              <el-input v-model="modalData.site" :disabled="modalDisableFlag" style="width: 100%"></el-input>
+              <el-input v-model="modalData.site" :disabled="modalData.flag === '1' || modalData.flag === '2'" style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="地址ID" prop="addressId">
-              <el-input v-model="modalData.addressId" :disabled="modalDisableFlag" style="width: 100%"></el-input>
+              <el-input v-model="modalData.addressId" :disabled="modalData.flag === '2'" style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -96,8 +96,8 @@
           <el-col :span="12">
             <el-form-item label="是否激活" prop="active">
               <el-select v-model="modalData.active" style="width: 100%">
-                <el-option label="是" value="Y"></el-option>
-                <el-option label="否" value="N"></el-option>
+                <el-option label="Yes" value="Y"></el-option>
+                <el-option label="No" value="N"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -129,7 +129,7 @@
       </el-form>
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;" ref="modalForm">
         <el-form-item label="备注" prop="memo" style="width: 100%">
-          <el-input v-model="modalData.memo" :rows="3" type="textarea" style="width: 100%"></el-input>
+          <el-input v-model="modalData.memo" :rows="1" type="textarea" style="width: 100%"></el-input>
         </el-form-item>
       </el-form>
       <el-footer style="height:40px;margin-top: 20px;text-align:center">
@@ -464,7 +464,6 @@ export default {
         updateBy: this.$store.state.user.name,
         flag: '1'
       };
-      this.modalDisableFlag = false;
       this.modalFlag = true;
       this.$nextTick(() => {
         // 清除表单验证
diff --git a/src/views/modules/srmSupplier/srmSupplierAddress.vue b/src/views/modules/srmSupplier/srmSupplierAddress.vue
index eab7bf7..75e1659 100644
--- a/src/views/modules/srmSupplier/srmSupplierAddress.vue
+++ b/src/views/modules/srmSupplier/srmSupplierAddress.vue
@@ -4,16 +4,13 @@
       <el-form-item label="供应商ID">
         <el-input v-model="searchData.supplierId" clearable style="width: 120px"></el-input>
       </el-form-item>
-      <el-form-item label="Site">
-        <el-input v-model="searchData.site" clearable style="width: 120px"></el-input>
-      </el-form-item>
       <el-form-item label="地址类型">
         <el-input v-model="searchData.addressType" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item label="是否激活">
         <el-select v-model="searchData.active" clearable style="width: 120px">
-          <el-option label="是" value="Y"></el-option>
-          <el-option label="否" value="N"></el-option>
+          <el-option label="Yes" value="Y"></el-option>
+          <el-option label="No" value="N"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label=" ">
@@ -116,8 +113,8 @@
           <el-col :span="12">
             <el-form-item label="是否激活" prop="active">
               <el-select v-model="modalData.active" style="width: 100%">
-                <el-option label="是" value="Y"></el-option>
-                <el-option label="否" value="N"></el-option>
+                <el-option label="Yes" value="Y"></el-option>
+                <el-option label="No" value="N"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -177,7 +174,7 @@ export default {
       exportName: "供应商地址" + dayjs().format('YYYYMMDDHHmmss'),
       searchData: {
         supplierId: '',
-        site: '',
+        site: this.$store.state.user.site,
         addressType: '',
         active: '',
         page: 1,
@@ -193,7 +190,7 @@ export default {
       modalDisableFlag: false,
       modalData: {
         supplierId: '',
-        site: '',
+        site: this.$store.state.user.site,
         addressId: '',
         companyName: '',
         contact: '',
@@ -228,24 +225,6 @@ export default {
           fixed: '',
           columnWidth: 120
         },
-        {
-          userId: this.$store.state.user.name,
-          functionId: '9005',
-          serialNumber: '9005TableSite',
-          tableId: "9005Table",
-          tableName: "供应商地址表",
-          columnProp: 'site',
-          headerAlign: "center",
-          align: "left",
-          columnLabel: 'Site',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 100,
-        },
         {
           userId: this.$store.state.user.name,
           functionId: '9005',
@@ -522,7 +501,7 @@ export default {
     addModal () {
       this.modalData = {
         supplierId: '',
-        site: this.$store.state.user.currentSite || '',
+        site: this.$store.state.user.site,
         addressId: '',
         companyName: '',
         contact: '',
@@ -567,7 +546,7 @@ export default {
         updateBy: this.$store.state.user.name,
         flag: '2'
       }
-      this.modalDisableFlag = true  // 这将使整个表单中的字段（包括site）变为只读
+      this.modalDisableFlag = true
       this.modalFlag = true
       this.$nextTick(() => {
         // 清除表单验证
diff --git a/src/views/modules/srmSupplier/supplierList.vue b/src/views/modules/srmSupplier/supplierList.vue
index e1d3064..212f9d3 100644
--- a/src/views/modules/srmSupplier/supplierList.vue
+++ b/src/views/modules/srmSupplier/supplierList.vue
@@ -5,7 +5,7 @@
       <el-row>
         <el-col :span="24" style="">
           <el-form-item >
-            <span style="cursor: pointer" slot="label" @click="getBaseList(1100)"><a herf="#">供应商编码</a></span>
+            <span style="cursor: pointer" slot="label" @click="getBaseList(1100)"><a href="#">供应商编码</a></span>
             <el-input v-model="searchData.supplierNo" style="width: 130px"></el-input>
           </el-form-item>
           <el-form-item :label="'供应商名称:'">
@@ -139,11 +139,6 @@
           class="supplier-form">
           <div class="form-section">
             <el-row :gutter="24">
-              <el-col :span="6">
-                <el-form-item label="工厂Site" prop="site">
-                  <el-input v-model="currentSupplier.site" :disabled="!isAdd"></el-input>
-                </el-form-item>
-              </el-col>
               <el-col :span="6">
                 <el-form-item label="供应商编码" prop="supplierNo">
                   <el-input v-model="currentSupplier.supplierNo" :disabled="!isAdd"></el-input>
@@ -155,11 +150,18 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="供应商分组" prop="supplierGroup">
-                  <el-select v-model="currentSupplier.supplierGroup" placeholder="选择供应商分组" style="width: 100%">
-                    <el-option label="战略" value="战略"></el-option>
-                    <el-option label="重要" value="重要"></el-option>
-                    <el-option label="普通" value="普通"></el-option>
+                <el-form-item label="供应商分组" prop="supplierDocType">
+                  <el-select v-model="currentSupplier.supplierDocType" placeholder="选择供应商分组" style="width: 100%">
+                    <el-option label="Group1" value="Group1"></el-option>
+                    <el-option label="Group2" value="Group2"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="在用">
+                  <el-select v-model="currentSupplier.active" placeholder="是否在用" style="width: 100%">
+                    <el-option label="Yes" value="Y"></el-option>
+                    <el-option label="No" value="N"></el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -169,8 +171,9 @@
           <div class="form-section">
             <el-row :gutter="24">
               <el-col :span="6">
-                <el-form-item label="供应商分类">
-                  <el-input v-model="currentSupplier.supplierDocType"></el-input>
+                <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-form-item>
               </el-col>
               <el-col :span="6">
@@ -193,23 +196,27 @@
           <div class="form-section">
             <el-row :gutter="24">
               <el-col :span="6">
-                <el-form-item label="税率编号">
-                  <el-input v-model="currentSupplier.taxCode"></el-input>
+                <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-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="付款条款">
-                  <el-input v-model="currentSupplier.paymentTerm"></el-input>
+                <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-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="交货条款">
-                  <el-input v-model="currentSupplier.deliveryTerm"></el-input>
+                <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-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="货币">
-                  <el-input v-model="currentSupplier.currency"></el-input>
+                <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-form-item>
               </el-col>
             </el-row>
@@ -296,14 +303,6 @@
                   <el-input v-model="currentSupplier.address"></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
-                <el-form-item label="在用">
-                  <el-select v-model="currentSupplier.active" placeholder="是否在用" style="width: 100%">
-                    <el-option label="Yes" value="Y"></el-option>
-                    <el-option label="No" value="N"></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
             </el-row>
           </div>
 
@@ -378,6 +377,11 @@ export default {
         supplierNo: '',
         supplierName: '',
         active: '',
+        supplierGroup:'',
+        currency:'',
+        tax:'',
+        paymentTerm:'',
+        deliveryTerm:'',
         site: this.$store.state.user.site,
         page: 1,
         limit: 10
@@ -433,7 +437,7 @@ export default {
           serialNumber: '811001Table1SupplierGroup',
           tableId: '811001Table1',
           tableName: '供应商信息',
-          columnProp: 'groupDisplay',
+          columnProp: 'groupDesc',
           headerAlign: 'center',
           align: 'left',
           columnLabel: '供应商分组',
@@ -1100,6 +1104,22 @@ export default {
         if (val === 1100) {
           strVal = this.searchData.supplierNo
         }
+        if (val === 521) {
+          strVal = this.searchData.supplierGroup
+        }
+        if (val === 513){
+          strVal = this.searchData.currency
+        }
+        if (val === 522){
+          strVal = this.searchData.tax
+        }
+        if (val === 523){
+          strVal = this.searchData.paymentTerm
+        }
+        if (val === 524){
+          strVal = this.searchData.deliveryTerm
+        }
+
         this.$refs.baseList.init(val, strVal)
       })
     },
@@ -1109,6 +1129,21 @@ export default {
       if (this.tagNo === 1100) {
         this.searchData.supplierNo = val.supplier_no
       }
+      if(this.tagNo == 513){
+        this.searchData.currency = val.Currency
+      }
+      if (this.tagNo === 521) {
+        this.searchData.supplierGroup = val.supplier_group
+      }
+      if (this.tagNo === 522) {
+        this.searchData.tax = val.TaxCode
+      }
+      if (this.tagNo === 523) {
+        this.searchData.paymentTerm = val.PaymentTermID
+      }
+      if (this.tagNo === 524) {
+        this.searchData.deliveryTerm = val.DeliveryTermID
+      }
     },
     getMainData () {
       this.searchData.limit = this.pageSize
@@ -1365,11 +1400,11 @@ export default {
 
 /* 表单分组样式 */
 .form-section {
-  margin-bottom: 20px;
+  margin-bottom: 10px;
 }
 
 .form-section:last-child {
-  margin-bottom: 15px;
+  margin-bottom: 10px;
 }
 
 /* 输入框样式 */
@@ -1389,9 +1424,9 @@ export default {
 /* 对话框底部按钮居中 */
 .dialog-footer-center {
   text-align: center;
-  padding: 20px 0 10px 0;
+  padding: 15px 0 5px 0;
   border-top: 1px solid #E4E7ED;
-  margin-top: 25px;
+  margin-top: 15px;
 }
 
 .dialog-footer-center .el-button {