diff --git a/anrui-riskcenter-ui/src/views/homevisitpreparation/homevisitpreparationAdd.vue b/anrui-riskcenter-ui/src/views/homevisitpreparation/homevisitpreparationAdd.vue
index 0ddc130657..90db567c36 100644
--- a/anrui-riskcenter-ui/src/views/homevisitpreparation/homevisitpreparationAdd.vue
+++ b/anrui-riskcenter-ui/src/views/homevisitpreparation/homevisitpreparationAdd.vue
@@ -206,7 +206,7 @@
             <el-col :span="24">
               <div class="span-sty">选择挂靠运输公司</div>
               <el-form-item>
-                <el-select v-model="formobj.accCompName" class="addinputInfo" filterable clearable placeholder="" @change="changeBusiness">
+                <el-select v-model="formobj.accCompName" class="addinputInfo" style="width: 40%" filterable clearable placeholder="" @change="changeBusiness">
                   <el-option v-for="item in business_list" :key="item.taxpayerNo" :label="item.businessName" :value="item.businessName"/>
                 </el-select>
               </el-form-item>
@@ -215,14 +215,12 @@
           <el-row>
             <el-col :span="12">
               <div class="span-sty"><span class="icon">*</span>挂靠公司名称</div>
-              <el-form-item>
-                <el-input class="addinputInfo addinputw" v-model="formobj.accCompName" clearable placeholder=""/>
-              </el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.accCompName }}</span></el-form-item>
             </el-col>
             <el-col :span="12">
               <div class="span-sty"><span class="icon">*</span>统一社会信用代码</div>
               <el-form-item>
-                <el-input class="addinputInfo" style="width: 30%" v-model="formobj.accCompRegistNum" clearable placeholder=""/>
+                <el-input class="addinputInfo" style="width: 50%" v-model="formobj.accCompRegistNum" clearable placeholder=""/>
               </el-form-item>
             </el-col>
           </el-row>
diff --git a/anrui-riskcenter-ui/src/views/managementcreditaudit/managementcreditaudit.vue b/anrui-riskcenter-ui/src/views/managementcreditaudit/managementcreditaudit.vue
index 3b9f6673ee..2426d1c145 100644
--- a/anrui-riskcenter-ui/src/views/managementcreditaudit/managementcreditaudit.vue
+++ b/anrui-riskcenter-ui/src/views/managementcreditaudit/managementcreditaudit.vue
@@ -70,7 +70,7 @@
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column label="资方合同号" align="center" width="180">
+            <el-table-column label="资方合同号" align="center" min-width="180">
               <template slot-scope="scope">
                 <el-input v-model.trim="scope.row.bankContractNo" clearable placeholder=""/>
               </template>
@@ -101,7 +101,7 @@
                 <span>{{ scope.row.customerName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="消贷合同编号" align="center" min-width="120">
+            <el-table-column label="消贷合同编号" align="center" width="180">
               <template slot-scope="scope">
                 <span>{{ scope.row.loanContractNo }}</span>
               </template>
diff --git a/anrui-riskcenter-ui/src/views/repaymentschedule/repaymentschedule.vue b/anrui-riskcenter-ui/src/views/repaymentschedule/repaymentschedule.vue
index 2c66f66b1f..178ecca8c8 100644
--- a/anrui-riskcenter-ui/src/views/repaymentschedule/repaymentschedule.vue
+++ b/anrui-riskcenter-ui/src/views/repaymentschedule/repaymentschedule.vue
@@ -266,25 +266,27 @@ export default {
     },
     toEdit() {
       if (this.sids.length === 1) {
-        if (this.multipleSelection[0].handleBtn) {
-          this.viewState = 2
-          this.$refs['divAdd'].showEdit(this.sids[0])
-        } else {
-          this.$message({ showClose: true, type: 'error', message: '该记录资方合同号为空或已生成还款计划表且已存在还款记录' })
+        // if (this.multipleSelection[0].handleBtn) {
+        //   this.viewState = 2
+        //   this.$refs['divAdd'].showEdit(this.sids[0])
+        // } else {
+        //   this.$message({ showClose: true, type: 'error', message: '该记录资方合同号为空或已生成还款计划表且已存在还款记录' })
+        // }
+        if (this.state_list.length > 0) {
+          for (var i = 0; i < this.state_list.length; i++) {
+            if (this.state_list[i] === '是') {
+              this.$message({ showClose: true, type: 'error', message: '请选择是否已生成还款计划表状态为否的记录进行操作' })
+              return
+            }
+          }
         }
+        this.viewState = 2
+        this.$refs['divAdd'].showEdit(this.sids[0])
       } else {
         this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行操作' })
       }
     },
     downloadRepaymentPlan() {
-      if (this.state_list.length > 0) {
-        for (var i = 0; i < this.state_list.length; i++) {
-          if (this.state_list[i] === '是') {
-            this.$message({ showClose: true, type: 'error', message: '请选择是否已生成还款计划表状态为否的记录进行操作' })
-            return
-          }
-        }
-      }
       if (this.sids.length > 0) {
         req.createRepaymentVoucher(this.sids).then((res) => {
           if (res.success) {
diff --git a/yxt-as-ui/src/api/Common/Upload.js b/yxt-as-ui/src/api/Common/Upload.js
index 6f5f0c578a..2a3a89c243 100644
--- a/yxt-as-ui/src/api/Common/Upload.js
+++ b/yxt-as-ui/src/api/Common/Upload.js
@@ -1,4 +1,4 @@
 import request from '@/utils/request'
 // 上传图片
 
-export const uploadFile = '/api/riskcenter/file/upload'
+export const uploadFile = '/api/portal/file/upload'
diff --git a/yxt-as-ui/src/api/goods/unit.js b/yxt-as-ui/src/api/goods/unit.js
index 8795c0b363..732f5d9f27 100644
--- a/yxt-as-ui/src/api/goods/unit.js
+++ b/yxt-as-ui/src/api/goods/unit.js
@@ -46,7 +46,7 @@ export default {
   // 初始化
   initUnits: function(data) {
     return request({
-      url: '/base/basegoodsunit/initialization/' + data,
+      url: '/yxtbase/apiadmin/base/basegoodsunit/initialization/' + data,
       method: 'get'
     });
   },
diff --git a/yxt-as-ui/src/views/basicinformation/supplier/relation/openingbank.vue b/yxt-as-ui/src/views/basicinformation/supplier/relation/openingbank.vue
index 27c130bf0f..d439332060 100644
--- a/yxt-as-ui/src/views/basicinformation/supplier/relation/openingbank.vue
+++ b/yxt-as-ui/src/views/basicinformation/supplier/relation/openingbank.vue
@@ -12,22 +12,22 @@
         <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
           <el-row style="border-top: 1px solid #e0e3eb">
             <el-col :span="12">
-              <div class="span-sty">开户银行</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.bankName" clearable placeholder="" /></el-form-item>
+              <div class="span-sty"><span class="icon">*</span>开户银行</div>
+              <el-form-item prop="bankName"><el-input class="addinputInfo addinputw" v-model="formobj.bankName" clearable placeholder="" /></el-form-item>
             </el-col>
             <el-col :span="12">
-              <div class="span-sty">银行账号</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.bankAccount" clearable placeholder="" /></el-form-item>
+              <div class="span-sty"><span class="icon">*</span>银行账号</div>
+              <el-form-item prop="bankAccount"><el-input class="addinputInfo addinputw" v-model="formobj.bankAccount" clearable placeholder="" /></el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
-              <div class="span-sty">账号名称</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.accountName" clearable placeholder="" /></el-form-item>
+              <div class="span-sty"><span class="icon">*</span>账号名称</div>
+              <el-form-item prop="accountName"><el-input class="addinputInfo addinputw" v-model="formobj.accountName" clearable placeholder="" /></el-form-item>
             </el-col>
             <el-col :span="12">
-              <div class="span-sty">账号类型</div>
-              <el-form-item>
+              <div class="span-sty"><span class="icon">*</span>账号类型</div>
+              <el-form-item prop="dueBankKey">
                 <el-select v-model="formobj.dueBankKey" class="addinputInfo" placeholder="" @change="dueBankChange">
                   <el-option v-for="item in dueBank_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
                 </el-select>
@@ -91,7 +91,12 @@ export default {
         currency: ''
       },
       index: '',
-      rules: {}
+      rules: {
+        bankName: [{ required: true, message: '开户银行不能为空', trigger: 'blur' }],
+        bankAccount: [{ required: true, message: '银行账号不能为空', trigger: 'blur' }],
+        accountName: [{ required: true, message: '账号名称不能为空', trigger: 'blur' }],
+        dueBankKey: [{ required: true, message: '账号类型不能为空', trigger: 'change' }]
+      }
     }
   },
   methods: {
@@ -163,4 +168,7 @@ export default {
 .addinputInfo {
   margin-left: 130px !important;
 }
+/deep/ .el-form-item__error {
+  margin-left: 120px !important;
+}
 </style>
diff --git a/yxt-as-ui/src/views/basicinformation/supplier/supplier.vue b/yxt-as-ui/src/views/basicinformation/supplier/supplier.vue
index 720eb446ca..ade9f0e62d 100644
--- a/yxt-as-ui/src/views/basicinformation/supplier/supplier.vue
+++ b/yxt-as-ui/src/views/basicinformation/supplier/supplier.vue
@@ -30,7 +30,7 @@
         </div>
         <!--End查询列表部分-->
         <div class="listtop">
-          <div class="tit">销售开单列表</div>
+          <div class="tit">供应商列表</div>
           <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
         </div>
         <!--Start 主页面主要部分 -->
@@ -212,7 +212,7 @@ export default {
           contactName: ''
         }
       }
-      this.init()
+      this.getList()
     },
     toAdd() {
       this.viewState = 2
diff --git a/yxt-as-ui/src/views/basicinformation/supplier/supplierAdd.vue b/yxt-as-ui/src/views/basicinformation/supplier/supplierAdd.vue
index 4959f3998e..da10635314 100644
--- a/yxt-as-ui/src/views/basicinformation/supplier/supplierAdd.vue
+++ b/yxt-as-ui/src/views/basicinformation/supplier/supplierAdd.vue
@@ -13,30 +13,30 @@
           <div class="title">基本信息</div>
           <el-row style="border-top: 1px solid #e0e3eb">
             <el-col :span="8">
-              <div class="span-sty">供应商名称</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.supplierName" clearable placeholder=""/></el-form-item>
+              <div class="span-sty"><span class="icon">*</span>供应商名称</div>
+              <el-form-item prop="supplierName"><el-input class="addinputInfo addinputw" v-model="formobj.supplierName" clearable placeholder=""/></el-form-item>
             </el-col>
             <el-col :span="8">
-              <div class="span-sty">供应商简称</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.supplierPY" clearable placeholder=""/></el-form-item>
+              <div class="span-sty"><span class="icon">*</span>供应商简称</div>
+              <el-form-item prop="supplierPY"><el-input class="addinputInfo addinputw" v-model="formobj.supplierPY" clearable placeholder=""/></el-form-item>
             </el-col>
             <el-col :span="8">
-              <div class="span-sty">供应商编码</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.supplierCode" clearable placeholder=""/></el-form-item>
+              <div class="span-sty"><span class="icon">*</span>供应商编码</div>
+              <el-form-item prop="supplierCode"><el-input class="addinputInfo addinputw" v-model="formobj.supplierCode" clearable placeholder=""/></el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="8">
-              <div class="span-sty">供应商类型</div>
-              <el-form-item>
+              <div class="span-sty"><span class="icon">*</span>供应商类型</div>
+              <el-form-item prop="supplierTypeSid">
                 <el-select class="addinputInfo" v-model="formobj.supplierTypeSid" filterable placeholder="" @change="supplierTypeChange">
                   <el-option v-for="item in supplierType_list" :key="item.sid" :label="item.supplierTypeName" :value="item.sid"/>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <div class="span-sty">供应商电话</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.contactTelePhone" clearable placeholder=""/></el-form-item>
+              <div class="span-sty"><span class="icon">*</span>供应商电话</div>
+              <el-form-item prop="contactTelePhone"><el-input class="addinputInfo addinputw" v-model="formobj.contactTelePhone" clearable placeholder=""/></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">传真</div>
@@ -48,14 +48,14 @@
               <div class="span-sty">详细地址</div>
               <el-form-item>
                 <div class="addinputInfo" style="display: flex;flex-direction: row;justify-content: flex-start;align-items: center">
-                  <el-select v-model="formobj.provinceSid" filterable placeholder="请选择省" style="width:160px" @change="provinceChange">
-                    <el-option v-for="item in province_list" :key="item.sid" :label="item.name" :value="item.sid"/>
+                  <el-select v-model="formobj.province" filterable clearable placeholder="请选择省" style="width:160px" @change="provinceChange">
+                    <el-option v-for="item in province_list" :key="item.sid" :label="item.name" :value="item.name"/>
                   </el-select>
-                  <el-select v-model="formobj.citySid" filterable placeholder="请选择市" style="width:160px" @change="cityChange">
-                    <el-option v-for="item in city_list" :key="item.sid" :label="item.name" :value="item.sid"/>
+                  <el-select v-model="formobj.city" filterable placeholder="请选择市" style="width:160px" @change="cityChange">
+                    <el-option v-for="item in city_list" :key="item.sid" :label="item.name" :value="item.name"/>
                   </el-select>
-                  <el-select v-model="formobj.countySid" filterable placeholder="请选择县" style="width:160px" @change="countyChange">
-                    <el-option v-for="item in county_list" :key="item.sid" :label="item.name" :value="item.sid"/>
+                  <el-select v-model="formobj.county" filterable placeholder="请选择县" style="width:160px" @change="countyChange">
+                    <el-option v-for="item in county_list" :key="item.sid" :label="item.name" :value="item.name"/>
                   </el-select>
                   <el-input style="width: 30%" v-model="formobj.address" clearable placeholder=""/>
                 </div>
@@ -90,8 +90,8 @@
           </el-row>
           <el-row>
             <el-col :span="8">
-              <div class="span-sty">开票公司名称</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.billingCompanyName" clearable placeholder=""/></el-form-item>
+              <div class="span-sty"><span class="icon">*</span>开票公司名称</div>
+              <el-form-item prop="billingCompanyName"><el-input class="addinputInfo addinputw" v-model="formobj.billingCompanyName" clearable placeholder=""/></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty">税号</div>
@@ -108,16 +108,16 @@
               <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.purchaser" clearable placeholder=""/></el-form-item>
             </el-col>
             <el-col :span="8">
-              <div class="span-sty">开票类型</div>
-              <el-form-item>
+              <div class="span-sty"><span class="icon">*</span>开票类型</div>
+              <el-form-item prop="billingTypeValue">
                 <el-select class="addinputInfo" v-model="formobj.billingTypeValue" filterable placeholder="" @change="billingTypeChange">
                   <el-option v-for="item in billingType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <div class="span-sty">税率</div>
-              <el-form-item><el-input class="addinputInfo addinputw" @keyup.native="formobj.taxRate = getNumber(formobj.taxRate, 2)" v-model="formobj.taxRate" clearable placeholder=""/></el-form-item>
+              <div class="span-sty"><span class="icon">*</span>税率</div>
+              <el-form-item prop="taxRate"><el-input class="addinputInfo addinputw" @keyup.native="formobj.taxRate = getNumber(formobj.taxRate, 2)" v-model="formobj.taxRate" clearable placeholder=""/></el-form-item>
             </el-col>
           </el-row>
           <el-row>
@@ -212,12 +212,21 @@ export default {
         remarks: '',
         pmsSupplierBankList: []
       },
-      rules: {}
+      rules: {
+        supplierName: [{ required: true, message: '供应商名称不能为空', trigger: 'blur' }],
+        supplierPY: [{ required: true, message: '供应商简称不能为空', trigger: 'blur' }],
+        supplierCode: [{ required: true, message: '供应商编码不能为空', trigger: 'blur' }],
+        supplierTypeSid: [{ required: true, message: '供应商类型不能为空', trigger: 'change' }],
+        contactTelePhone: [{ required: true, message: '供应商电话不能为空', trigger: 'blur' }],
+        billingCompanyName: [{ required: true, message: '开票公司名称不能为空', trigger: 'blur' }],
+        billingTypeValue: [{ required: true, message: '开票类型不能为空', trigger: 'change' }],
+        taxRate: [{ required: true, message: '税率不能为空', trigger: 'blur' }]
+      }
     }
   },
   methods: {
     init() {
-      typeValues({ type: 'billingType' }).then((res) => {
+      typeValues({ type: 'accountType' }).then((res) => {
         if (res.success) {
           this.billingType_list = res.data
         }
@@ -258,10 +267,18 @@ export default {
       }
     },
     provinceChange(value) {
-      const choose = this.province_list.filter((item) => item.sid === value)
+      const choose = this.province_list.filter((item) => item.name === value)
       if (choose !== null && choose.length > 0) {
-        this.formobj.province = choose[0].name
-        this.getCity(value)
+        this.formobj.provinceSid = choose[0].sid
+        this.getCity(this.formobj.provinceSid)
+      } else {
+        this.formobj.provinceSid = ''
+        this.formobj.citySid = ''
+        this.formobj.city = ''
+        this.city_list = []
+        this.formobj.county = ''
+        this.formobj.countySid = ''
+        this.county_list = []
       }
     },
     getCity(val) {
@@ -272,10 +289,10 @@ export default {
       })
     },
     cityChange(value) {
-      const choose = this.city_list.filter((item) => item.sid === value)
+      const choose = this.city_list.filter((item) => item.name === value)
       if (choose !== null && choose.length > 0) {
-        this.formobj.city = choose[0].name
-        this.getCounty(value)
+        this.formobj.citySid = choose[0].sid
+        this.getCounty(this.formobj.citySid)
       }
     },
     getCounty(val) {
@@ -286,9 +303,9 @@ export default {
       })
     },
     countyChange(value) {
-      const choose = this.county_list.filter((item) => item.sid === value)
+      const choose = this.county_list.filter((item) => item.name === value)
       if (choose !== null && choose.length > 0) {
-        this.formobj.county = choose[0].name
+        this.formobj.countySid = choose[0].sid
       }
     },
     showAdd() {
@@ -437,6 +454,9 @@ export default {
   margin-left: 120px !important;
   width: calc(100% - 115px);
 }
+/deep/ .el-form-item__error {
+  margin-left: 120px !important;
+}
 .titleOne {
   padding: 7px;
   display: flex;
diff --git a/yxt-as-ui/src/views/basicinformation/supplier/supplierInfo.vue b/yxt-as-ui/src/views/basicinformation/supplier/supplierInfo.vue
index 033aebf466..621b9bc765 100644
--- a/yxt-as-ui/src/views/basicinformation/supplier/supplierInfo.vue
+++ b/yxt-as-ui/src/views/basicinformation/supplier/supplierInfo.vue
@@ -41,7 +41,7 @@
           <el-row>
             <el-col :span="24">
               <div class="span-sty">详细地址</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.address }}</span></el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.province }}{{ formobj.city }}{{ formobj.county }}{{ formobj.address }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-row>
diff --git a/yxt-as-ui/src/views/basicinformation/suppliertype/suppliertype.vue b/yxt-as-ui/src/views/basicinformation/suppliertype/suppliertype.vue
index b2b6905fbb..c280b25058 100644
--- a/yxt-as-ui/src/views/basicinformation/suppliertype/suppliertype.vue
+++ b/yxt-as-ui/src/views/basicinformation/suppliertype/suppliertype.vue
@@ -54,11 +54,11 @@
       <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
         <el-row style="border-top: 1px solid #E0E3EB">
           <el-col :span="12">
-            <div class="span-sty">供应商类型</div>
+            <div class="span-sty"><span class="icon">*</span>供应商类型</div>
             <el-form-item><el-input class="addinputInfo" style="width: 60%" v-model.trim="formobj.supplierTypeName" clearable placeholder="" /></el-form-item>
           </el-col>
           <el-col :span="12">
-            <div class="span-sty">供应商编码</div>
+            <div class="span-sty"><span class="icon">*</span>供应商编码</div>
             <el-form-item><el-input class="addinputInfo" style="width: 60%" v-model.trim="formobj.supplierTypeCode" clearable placeholder="" /></el-form-item>
           </el-col>
         </el-row>
diff --git a/yxt-as-ui/src/views/goods/brands/brandsAdd.vue b/yxt-as-ui/src/views/goods/brands/brandsAdd.vue
index 75c4756677..526e4c6beb 100644
--- a/yxt-as-ui/src/views/goods/brands/brandsAdd.vue
+++ b/yxt-as-ui/src/views/goods/brands/brandsAdd.vue
@@ -3,7 +3,7 @@
 
     <div class="tab-header webtop">
       <!-- 标题 -->
-      <div>商品信息</div>
+      <div>品牌信息</div>
       <!-- start 添加修改按钮 -->
       <div>
         <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
@@ -54,11 +54,11 @@
         </div> -->
         <div class="item" style="margin-bottom: 100px;margin-top: 100px;">
           <span class="item_text">品牌Logo：</span>
-      <!--    <upload ref="uploadImg" v-model="imgList" style="" class="item_input" :limit="1"
+          <!--    <upload ref="uploadImg" v-model="imgList" style="" class="item_input" :limit="1"
             bucket="map" :class="{ hide: hideUploadBtn }" :upload-data="{ type: '0001' }" @change="backData" />
             -->
-            <upload-img ref="uploadImg" class="item_input" v-model="formobj.image" :limit="50" bucket="map"
-              :upload-data="{ type: '0001' }" />
+          <upload-img ref="uploadImg" class="item_input" v-model="imgList" :limit="1" bucket="map"
+            :upload-data="{ type: '0001' }" :class="{ hide: hideUploadBtn }"  @change="backData" />
 
         </div>
 
@@ -98,8 +98,8 @@
       // this.initData()
     },
     methods: {
-      backData(value) {
-        console.log('backData》》》》', value)
+
+      backData(value){
         console.log('imgList', this.imgList)
 
         if (this.imgList.length > 0) {
@@ -107,25 +107,13 @@
         } else {
           this.formobj.image = ''
         }
-
         this.hideUploadBtn = this.imgList.length != 0
         console.log('this.hideUploadBtn', this.hideUploadBtn)
       },
-      backData2(value) {
-        console.log('backData2》》》》', value)
-        console.log('imgList2', this.imgList2)
-
-        if (this.imgList2.length > 0) {
-          this.formobj.bigPic = this.imgList2[0].url
-        } else {
-          this.formobj.bigPic = ''
-        }
 
-        this.hideUploadBtn2 = this.imgList2.length != 0
-        console.log('this.hideUploadBtn2', this.hideUploadBtn2)
-      },
       saveOrUpdate() {
         console.log('>>>>>>>>>saveOrUpdate', this.formobj)
+
         req.saveBrands(this.formobj)
           .then(resp => {
             if (resp.success) {
@@ -144,9 +132,7 @@
       handleReturn(isreload) {
         if (isreload === 'true') this.$emit('reloadlist')
         this.imgList = []
-        this.imgList2 = []
         this.hideUploadBtn = true
-        this.hideUploadBtn2 = true
         this.formobj = {
           sid: '',
           brandName: '',
@@ -159,9 +145,7 @@
       },
       showAdd() {
         console.log("this.imgList", this.imgList)
-        console.log("this.imgList2", this.imgList2)
         this.hideUploadBtn = this.imgList.length != 0
-        this.hideUploadBtn2 = this.imgList2.length != 0
       },
       showEdit(row) {
         req.initBrands(row.sid)
@@ -169,26 +153,18 @@
             if (resp.success) {
               this.formobj = resp.data
               this.imgList = []
-              this.imgList2 = []
               if (resp.data.image != '') {
                 this.imgList.push({
                   url: resp.data.image
                 })
               }
-              if (resp.data.bigPic != '') {
-                this.imgList2.push({
-                  url: resp.data.bigPic
-                })
-              }
 
               this.hideUploadBtn = this.imgList.length != 0
-              this.hideUploadBtn2 = this.imgList2.length != 0
             }
           })
           .catch(e => {
             this.formobj = row
             this.imgList = []
-            this.imgList2 = []
           })
       },
 
diff --git a/yxt-as-ui/src/views/goods/goods/goodsAdd.vue b/yxt-as-ui/src/views/goods/goods/goodsAdd.vue
index d2bb507b42..70f7dceb86 100644
--- a/yxt-as-ui/src/views/goods/goods/goodsAdd.vue
+++ b/yxt-as-ui/src/views/goods/goods/goodsAdd.vue
@@ -15,241 +15,329 @@
 
     <div class="listconadd">
 
-      <el-form ref="dataForm" :model="formobj" label-position="top" label-width="190px" class="formadd">
-        <div class="title" style="display: flex;align-items: center;justify-content: space-between;height:40px">
+      <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
+        <div class="title">
           <div>基础信息</div>
         </div>
         <el-row class="first_row">
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">商品名称</span>
+
+          <el-col :span="12">
+            <div class="span-sty">商品名称</div>
+            <el-form-item>
+              <el-input v-model="formobj.goodsName" placeholder="商品名称" class="addinputw addinputInfo" clearable />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <el-input v-model="formobj.goodsName" placeholder="商品名称" class="addinputw" style="width:100%" clearable />
+
+          <el-col :span="12">
+            <div class="span-sty">商品简称</div>
+            <el-form-item>
+              <el-input v-model="formobj.goodsShortName" placeholder="商品简称" class="addinputw addinputInfo" clearable />
             </el-form-item>
           </el-col>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">商品编码</span>
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="12">
+            <div class="span-sty">商品副标题</div>
+            <el-form-item>
+              <el-input v-model="formobj.subTitle" placeholder="商品副标题" class="addinputw addinputInfo" clearable />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <el-input v-model="formobj.barCode" placeholder="商品编码" style="width: 100%;" class="addinputw" clearable />
+
+          <el-col :span="12">
+            <div class="span-sty">商品拼音缩写</div>
+            <el-form-item>
+              <el-input v-model="formobj.goodsPY" placeholder="由系统生成" :readonly="true" class="addinputw addinputInfo"
+                clearable />
             </el-form-item>
           </el-col>
+
         </el-row>
 
         <el-row>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">商品品牌</span>
+
+          <el-col :span="12">
+            <div class="span-sty">商品编码</div>
+            <el-form-item>
+              <el-input v-model="formobj.goodsCode" placeholder="商品编码" class="addinputw addinputInfo" clearable />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <div class="span-sty">商品条形码</div>
+            <el-form-item>
+              <el-input v-model="formobj.barCode" placeholder="由系统生成" :readonly="true" class="addinputw addinputInfo"
+                clearable />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <el-select v-model="formobj.brandName" placeholder="请选择商品品牌" class="addinputw" style="width: 100%;"
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="12">
+            <div class="span-sty">商品品牌</div>
+            <el-form-item>
+              <el-select v-model="formobj.brandName" placeholder="请选择商品品牌" class="addinputw"
                 @change="selectBrandChange">
                 <el-option v-for="item in brandList" :key="item.sid" :label="item.brandName" :value="item.sid" />
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">商品类别</span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <el-select v-model="formobj.typeName" placeholder="请选择商品类别" class="addinputw" style="width: 100%;"
-                @change="selectCateChange">
+
+          <el-col :span="12">
+            <div class="span-sty">商品类别</div>
+            <el-form-item>
+              <el-select v-model="formobj.typeName" placeholder="请选择商品类别" class="addinputw" @change="selectCateChange">
                 <el-option v-for="item in cateList" :key="item.sid" :label="item.goodsTypeName" :value="item.sid" />
               </el-select>
             </el-form-item>
           </el-col>
+
         </el-row>
 
         <el-row>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">商品厂家</span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <el-select v-model="formobj.manufacturerName" placeholder="请选择商品厂家" class="addinputw" style="width: 100%;"
+
+          <el-col :span="12">
+            <div class="span-sty">商品厂家</div>
+            <el-form-item>
+              <el-select v-model="formobj.manufacturerName" placeholder="请选择商品厂家" class="addinputw"
                 @change="selectfacturerChange">
                 <el-option v-for="item in facturerList" :key="item.sid" :label="item.manufacturerName"
                   :value="item.sid" />
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">厂家货号</span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <el-input v-model="formobj.factoryCode" placeholder="商品名称" style="width: 100%;" class="addinputw"
-                clearable />
+
+          <el-col :span="12">
+            <div class="span-sty">厂家货号</div>
+            <el-form-item>
+              <el-input v-model="formobj.factoryCode" placeholder="厂家货号" class="addinputw addinputInfo" clearable />
             </el-form-item>
           </el-col>
+
         </el-row>
 
         <el-row>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">外部编码</span>
+
+          <el-col :span="12">
+            <div class="span-sty">商品单位</div>
+            <el-form-item>
+              <el-select v-model="formobj.goodsUnitName" placeholder="请选择商品单位" class="addinputw"
+                @change="selectunitNameChange">
+                <el-option v-for="item in unitNameList" :key="item.sid" :label="item.unitName" :value="item.sid" />
+              </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <el-input v-model="formobj.externalCode" placeholder="外部编码" style="width: 100%;" class="addinputw"
-                clearable />
+
+          <el-col :span="12">
+            <div class="span-sty">是否上架</div>
+            <el-form-item>
+              <el-radio-group v-model="formobj.isListed" size="small" class="addinputw">
+                <el-radio :label="'1'">上架</el-radio>
+                <el-radio :label="'2'">下架</el-radio>
+              </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">国标码</span>
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="12">
+            <div class="span-sty">外部编码</div>
+            <el-form-item>
+              <el-input v-model="formobj.externalCode" placeholder="外部编码" class="addinputw addinputInfo" clearable />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <el-input v-model="formobj.nationalStandardCode" placeholder="国标码" style="width: 100%;" class="addinputw"
+
+          <el-col :span="12">
+            <div class="span-sty">国标码</div>
+            <el-form-item>
+              <el-input v-model="formobj.nationalStandardCode" placeholder="国标码" class="addinputw addinputInfo"
                 clearable />
             </el-form-item>
           </el-col>
+
         </el-row>
 
         <el-row>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">税率</span>
+
+          <el-col :span="12">
+            <div class="span-sty">税率</div>
+            <el-form-item>
+              <el-input v-model="formobj.taxRate" placeholder="税率" class="addinputw addinputInfo" clearable
+                oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <el-input v-model="formobj.taxRate" placeholder="税率" style="width: 100%;" class="addinputw" clearable />
+
+          <el-col :span="12">
+            <div class="span-sty">保质期天</div>
+            <el-form-item>
+              <el-input v-model="formobj.shelfLife" placeholder="保质期天" class="addinputw addinputInfo" clearable
+                oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
             </el-form-item>
           </el-col>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">保质期天</span>
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="12">
+            <div class="span-sty">商品排序</div>
+            <el-form-item>
+              <el-input v-model="formobj.sortNo" placeholder="商品排序" class="addinputw addinputInfo" clearable
+                oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <el-input v-model="formobj.shelfLife" placeholder="保质期天" style="width: 100%;" class="addinputw"
-                clearable />
+
+          <el-col :span="12">
+            <div class="span-sty">商品备注</div>
+            <el-form-item>
+              <el-input v-model="formobj.remarks" placeholder="商品备注" class="addinputw addinputInfo" clearable />
             </el-form-item>
           </el-col>
+
         </el-row>
 
         <el-row>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">商品详细说明</span>
+
+          <el-col :span="24">
+            <div class="span-sty">商品详细说明</div>
+            <el-form-item>
+              <el-input v-model="formobj.baseGoodsSpuDetail.goodsExplain" placeholder="商品详细说明" type="textarea" :rows="4"
+                class="addinputw addinputInfo" clearable />
             </el-form-item>
           </el-col>
-          <el-col :span="20">
-            <el-form-item class="trightb_item">
-              <el-input v-model="formobj.baseGoodsSpuDetail.goodsExplain" type="textarea" :rows="4"
-                style="width: 100%;margin-bottom: 5px;;" placeholder="商品详细说明" class="addinputw" clearable />
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="24">
+            <div class="span-sty">商品描述</div>
+            <el-form-item>
+              <el-input v-model="formobj.baseGoodsSpuDetail.goodsDescription" placeholder="商品描述" type="textarea"
+                :rows="4" class="addinputw addinputInfo" clearable />
             </el-form-item>
           </el-col>
+
         </el-row>
 
         <el-row>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">商品描述</span>
+
+          <el-col :span="24">
+            <div class="span-sty">商品通用规格参数</div>
+            <el-form-item>
+              <el-input v-model="formobj.baseGoodsSpuDetail.genericSpec" placeholder="商品通用规格参数" type="textarea"
+                :rows="4" class="addinputw addinputInfo" clearable />
             </el-form-item>
           </el-col>
-          <el-col :span="20">
-            <el-form-item class="trightb_item">
-              <el-input v-model="formobj.baseGoodsSpuDetail.goodsDescription" type="textarea" :rows="4"
-                style="width: 100%;margin-bottom: 5px;;" placeholder="商品描述" class="addinputw" clearable />
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="24">
+            <div class="span-sty">商品特有规格参数</div>
+            <el-form-item>
+              <el-input v-model="formobj.baseGoodsSpuDetail.specialSpec" placeholder="商品特有规格参数" type="textarea"
+                :rows="4" class="addinputw addinputInfo" clearable />
             </el-form-item>
           </el-col>
+
         </el-row>
 
-        <el-collapse v-model="activeNames" style="margin-top: 20px;">
-          <el-collapse-item name="1">
-            <template slot="title">
-              规格列表<span class="span" @click.stop="addGoodsSku()">添加</span>
+        <div class="title titleOne">
+          <div>规格列表</div>
+          <el-button type="primary" size="mini" class="btntopblueline" @click="addGoodsSku()">添加</el-button>
+        </div>
+        <el-table v-loading="listLoading" :data="formobj.baseGoodsSkus" border>
+          <!-- <el-table-column type="selection" align="center" width="50"/> -->
+          <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
+          <el-table-column label="操作" wid align="center" width="120">
+            <template slot-scope="scope">
+              <el-button type="primary" size="mini" @click="editGoodsSku(scope.row)">编辑</el-button>
             </template>
-            <el-table v-loading="listLoading" :data="formobj.baseGoodsSkus" border style="width: 100%;"
-              :row-style="{height: '40px'}">
-              <!-- <el-table-column type="selection" align="center" width="50"/> -->
-              <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
-              <el-table-column label="操作" wid align="center" width="120">
-                <template slot-scope="scope">
-                  <el-button type="primary" size="mini" @click="editGoodsSku(scope.row)">编辑</el-button>
-                </template>
-              </el-table-column>
-              <el-table-column label="是否可用" align="center" width="200">
-                <template slot-scope="scope">
-                  <el-switch v-model="scope.row.isEnable" active-text="是" inactive-text="否" active-value="1"
-                    inactive-value="2" @change="enableChange(scope.row.sid,scope.row.isEnable)" />
-                </template>
-              </el-table-column>
-              <el-table-column label="规格代码" prop="goodsSkuCode" align="center" />
-              <el-table-column label="标题" prop="title" align="center" />
-              <el-table-column label="外部编码" prop="externalCode" align="center" />
-              <el-table-column label="规格明细" wid align="center" width="250">
-                <template slot-scope="scope">
-                  <el-button type="primary" size="mini"
-                    @click="showGoodsSkuDttail(scope.row.baseGoodsSkuExtend)">查看</el-button>
-                  <el-button type="primary" size="mini"
-                    @click="editGoodsSkuDttail(scope.row.baseGoodsSkuExtend)">编辑</el-button>
-                </template>
-              </el-table-column>
-            </el-table>
-
-          </el-collapse-item>
-        </el-collapse>
+          </el-table-column>
+          <el-table-column label="是否可用" align="center" width="200">
+            <template slot-scope="scope">
+              <el-switch v-model="scope.row.isEnable" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="2" @change="enableChange(scope.row.sid,scope.row.isEnable)" />
+            </template>
+          </el-table-column>
+          <el-table-column label="规格代码" prop="goodsSkuCode" align="center" />
+          <el-table-column label="商品标题" prop="title" align="center" />
+          <el-table-column label="外部编码" prop="externalCode" align="center" />
+          <el-table-column label="特有规格属性" prop="indexes" align="center" />
+          <el-table-column label="特有规格参数" prop="ownSpec" align="center" />
+          <el-table-column label="规格明细" wid align="center" width="250">
+            <template slot-scope="scope">
+              <el-button type="primary" size="mini"
+                @click="showGoodsSkuDttail(scope.row.baseGoodsSkuExtend)">查看</el-button>
+              <el-button type="primary" size="mini"
+                @click="editGoodsSkuDttail(scope.row.baseGoodsSkuExtend)">编辑</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
 
       </el-form>
 
       <el-dialog title="编辑规格" :visible.sync="dialogVisible3" :before-close="handleClose3">
-        <el-form ref="dataForm2" class="formadd" style="margin-top: -40px;" :model="orderInfo">
+
+        <el-form ref="dataForm2" class="formaddcopy02" style="margin-top: -40px;" :model="orderInfo">
+
           <el-row class="first_row">
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">规格代码</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <!-- <span slot="label">{{itemInfo.finalPurchasePrice}}</span> -->
-                <el-input v-model="orderInfo.goodsSkuCode" placeholder="规格代码" clearable />
+
+            <el-col :span="8">
+              <div class="span-sty">规格代码</div>
+              <el-form-item>
+                <el-input v-model="orderInfo.goodsSkuCode" placeholder="规格代码" class="addinputw addinputInfo"
+                  clearable />
               </el-form-item>
             </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">规格标题</span>
+
+            <el-col :span="8">
+              <div class="span-sty">商品标题</div>
+              <el-form-item>
+                <el-input v-model="orderInfo.title" placeholder="商品标题" class="addinputw addinputInfo" clearable />
               </el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <!-- <span slot="label">{{itemInfo.safetyStockDays}}</span> -->
-                <el-input v-model="orderInfo.title" placeholder="规格标题" clearable />
+
+            <el-col :span="8">
+              <div class="span-sty">外部编码</div>
+              <el-form-item>
+                <el-input v-model="orderInfo.externalCode" placeholder="外部编码" class="addinputw addinputInfo"
+                  clearable />
               </el-form-item>
             </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">外部编码</span>
+
+          </el-row>
+
+          <el-row>
+
+            <el-col :span="24">
+              <div class="span-sty">特有规格属性</div>
+              <el-form-item>
+                <el-input v-model="orderInfo.indexes" placeholder="特有规格属性" type="textarea" :rows="4"
+                  class="addinputw addinputInfo" clearable />
               </el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <!-- <span slot="label">{{itemInfo.isOriginalFactory}}</span> -->
-                <el-input v-model="orderInfo.externalCode" placeholder="外部编码" clearable />
+
+          </el-row>
+
+          <el-row>
+
+            <el-col :span="24">
+              <div class="span-sty">特有规格参数</div>
+              <el-form-item>
+                <el-input v-model="orderInfo.ownSpec" placeholder="特有规格参数" type="textarea" :rows="4"
+                  class="addinputw addinputInfo" clearable />
               </el-form-item>
             </el-col>
+
           </el-row>
 
         </el-form>
@@ -262,184 +350,179 @@
       </el-dialog>
 
 
-
       <el-dialog title="查看规格明细" :visible.sync="dialogVisible" :before-close="handleClose">
-        <el-form ref="dataForm1" class="formadd" style="margin-top: -40px;" :model="itemInfo">
+
+        <el-form ref="dataForm1" class="formaddcopy02" style="margin-top: -40px;" :model="itemInfo">
 
           <el-row class="first_row">
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">最后采购价</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.finalPurchasePrice}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">安全库存天数</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.safetyStockDays}}</span>
+
+            <el-col :span="8">
+              <div class="span-sty">最后采购价</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.finalPurchasePrice}}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">是否原厂</span>
+
+            <el-col :span="8">
+              <div class="span-sty">安全库存天数</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.safetyStockDays}}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.isOriginalFactory}}</span>
+
+            <el-col :span="8">
+              <div class="span-sty">是否原厂</div>
+              <el-form-item>
+                <el-radio-group v-model="itemInfo.isOriginalFactory" :disabled="true" size="small" class="addinputw">
+                  <el-radio :label="'1'">是</el-radio>
+                  <el-radio :label="'2'">否</el-radio>
+                </el-radio-group>
               </el-form-item>
             </el-col>
+
           </el-row>
 
           <el-row>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">是否库存警戒</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.isInventoryAlert}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">库存警戒上线</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.inventoryAlertUpperLimit}}</span>
+
+            <el-col :span="8">
+              <div class="span-sty">是否库存警戒</div>
+              <el-form-item>
+                <el-radio-group v-model="itemInfo.isInventoryAlert" :disabled="true" size="small" class="addinputw">
+                  <el-radio :label="'1'">是</el-radio>
+                  <el-radio :label="'2'">否</el-radio>
+                </el-radio-group>
               </el-form-item>
             </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">库存警戒下线</span>
+
+            <el-col :span="8">
+              <div class="span-sty">库存警戒上线</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.inventoryAlertUpperLimit}}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.inventoryAlertLowerLimit}}</span>
+
+            <el-col :span="8">
+              <div class="span-sty">库存警戒下线</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.inventoryAlertLowerLimit}}</span>
               </el-form-item>
             </el-col>
+
           </el-row>
 
           <el-row>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">成本价</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.costPrice}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">吊牌价</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.tagPrice}}</span>
+
+            <el-col :span="8">
+              <div class="span-sty">成本价</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.costPrice}}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">销售单价</span>
+
+            <el-col :span="8">
+              <div class="span-sty">吊牌价</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.tagPrice}}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.salesPrice}}</span>
+
+            <el-col :span="8">
+              <div class="span-sty">销售单价</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.salesPrice}}</span>
               </el-form-item>
             </el-col>
+
+
           </el-row>
 
           <el-row>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">标准进价</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.standardPurchasePrice}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">代理价</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.agencyPrice}}</span>
+
+            <el-col :span="8">
+              <div class="span-sty">标准进价</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.standardPurchasePrice}}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">折扣</span>
+
+            <el-col :span="8">
+              <div class="span-sty">代理价</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.agencyPrice}}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.discount}}</span>
+
+            <el-col :span="8">
+              <div class="span-sty">折扣</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.discount}}</span>
               </el-form-item>
             </el-col>
+
           </el-row>
+
           <el-row>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">最低零售价</span>
+
+            <el-col :span="8">
+              <div class="span-sty">最低零售价</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.minimumSalesPrice}}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.minimumSalesPrice}}</span>
+
+            <el-col :span="8">
+              <div class="span-sty">是否积分兑换</div>
+              <el-form-item>
+                <el-radio-group v-model="itemInfo.isIntegralExchange" :disabled="true" size="small" class="addinputw">
+                  <el-radio :label="'1'">是</el-radio>
+                  <el-radio :label="'2'">否</el-radio>
+                </el-radio-group>
               </el-form-item>
             </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">是否积分兑换</span>
+
+            <el-col :span="8">
+              <div class="span-sty">积分数量</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.integralAmount}}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.isIntegralExchange}}</span>
+
+          </el-row>
+
+          <el-row>
+
+            <el-col :span="8">
+              <div class="span-sty">锁定销售价格</div>
+              <el-form-item>
+                <el-radio-group v-model="itemInfo.isLockingSalesPrice" :disabled="true" size="small" class="addinputw">
+                  <el-radio :label="'1'">是</el-radio>
+                  <el-radio :label="'2'">否</el-radio>
+                </el-radio-group>
               </el-form-item>
             </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">积分数量</span>
+
+            <el-col :span="8">
+              <div class="span-sty">排序</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.sortNo}}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.integralAmount}}</span>
+
+            <el-col :span="8">
+              <div class="span-sty">备注</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.remarks}}</span>
               </el-form-item>
             </el-col>
+
           </el-row>
 
           <el-row>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">规格图片</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="20">
-              <el-form-item class="trightb_item">
+            <el-col :span="24">
+              <div class="span-sty">规格图片</div>
+              <el-form-item>
                 <template slot-scope="scope">
-                  <span v-for="(item,index) in itemInfo.urls" :key="index">
+                  <span v-for="(item,index) in itemInfo.urls" :key="index" class="addinputInfo">
                     <el-popover placement="left" trigger="click" width="300">
                       <img :src="item.url" width="100%" />
                       <img slot="reference" :src="item.url" :alt="item.url"
@@ -459,274 +542,205 @@
       </el-dialog>
 
 
-
       <el-dialog title="编辑规格明细" :visible.sync="dialogVisible2" :before-close="handleClose2">
-        <el-form ref="dataForm2" class="formadd" style="margin-top: -40px;" :model="itemInfo">
+        <el-form ref="dataForm2" class="formaddcopy02" style="margin-top: -40px;" :model="itemInfo">
+
           <el-row class="first_row">
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">最后采购价</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <!-- <span slot="label">{{itemInfo.finalPurchasePrice}}</span> -->
-                <el-input v-model="itemInfo.finalPurchasePrice" placeholder="最后采购价" clearable />
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">安全库存天数</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <!-- <span slot="label">{{itemInfo.safetyStockDays}}</span> -->
-                <el-input v-model="itemInfo.safetyStockDays" placeholder="安全库存天数" clearable />
+
+            <el-col :span="8">
+              <div class="span-sty">最后采购价</div>
+              <el-form-item>
+                <el-input v-model="itemInfo.finalPurchasePrice" placeholder="最后采购价" clearable
+                  class="addinputw addinputInfo"
+                  oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
               </el-form-item>
             </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">是否原厂</span>
+
+            <el-col :span="8">
+              <div class="span-sty">安全库存天数</div>
+              <el-form-item>
+                <el-input v-model="itemInfo.safetyStockDays" placeholder="安全库存天数" clearable
+                  class="addinputw addinputInfo" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
               </el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <!-- <span slot="label">{{itemInfo.isOriginalFactory}}</span> -->
-                <el-input v-model="itemInfo.isOriginalFactory" placeholder="是否原厂" clearable />
+
+            <el-col :span="8">
+              <div class="span-sty">是否原厂</div>
+              <el-form-item>
+                <el-radio-group v-model="itemInfo.isOriginalFactory" size="small" class="addinputw">
+                  <el-radio :label="'1'">是</el-radio>
+                  <el-radio :label="'2'">否</el-radio>
+                </el-radio-group>
               </el-form-item>
             </el-col>
+
           </el-row>
 
           <el-row>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">是否库存警戒</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <!-- <span slot="label">{{itemInfo.isInventoryAlert}}</span> -->
-                <el-input v-model="itemInfo.isInventoryAlert" placeholder="是否库存警戒" clearable />
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">库存警戒上线</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <!-- <span slot="label">{{itemInfo.inventoryAlertUpperLimit}}</span> -->
-                <el-input v-model="itemInfo.inventoryAlertUpperLimit" placeholder="库存警戒上线" clearable />
+
+            <el-col :span="8">
+              <div class="span-sty">是否库存警戒</div>
+              <el-form-item>
+                <el-radio-group v-model="itemInfo.isInventoryAlert" size="small" class="addinputw">
+                  <el-radio :label="'1'">是</el-radio>
+                  <el-radio :label="'2'">否</el-radio>
+                </el-radio-group>
               </el-form-item>
             </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">库存警戒下线</span>
+
+            <el-col :span="8">
+              <div class="span-sty">库存警戒上线</div>
+              <el-form-item>
+                <el-input v-model="itemInfo.inventoryAlertUpperLimit" placeholder="库存警戒上线" clearable
+                  class="addinputw addinputInfo" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
               </el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <!-- <span slot="label">{{itemInfo.inventoryAlertLowerLimit}}</span> -->
-                <el-input v-model="itemInfo.inventoryAlertLowerLimit" placeholder="库存警戒下线" clearable />
+
+            <el-col :span="8">
+              <div class="span-sty">库存警戒下线</div>
+              <el-form-item>
+                <el-input v-model="itemInfo.inventoryAlertLowerLimit" placeholder="库存警戒下线" clearable
+                  class="addinputw addinputInfo" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
               </el-form-item>
             </el-col>
+
           </el-row>
 
           <el-row>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">成本价</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <!-- <span slot="label">{{itemInfo.costPrice}}</span> -->
-                <el-input v-model="itemInfo.costPrice" placeholder="成本价" clearable />
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">吊牌价</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <!-- <span slot="label">{{itemInfo.tagPrice}}</span> -->
-                <el-input v-model="itemInfo.tagPrice" placeholder="吊牌价" clearable />
+
+            <el-col :span="8">
+              <div class="span-sty">成本价</div>
+              <el-form-item>
+                <el-input v-model="itemInfo.costPrice" placeholder="成本价" clearable class="addinputw addinputInfo"
+                  oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
               </el-form-item>
             </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">销售单价</span>
+
+            <el-col :span="8">
+              <div class="span-sty">吊牌价</div>
+              <el-form-item>
+                <el-input v-model="itemInfo.tagPrice" placeholder="吊牌价" clearable class="addinputw addinputInfo"
+                  oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
               </el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <!-- <span slot="label">{{itemInfo.salesPrice}}</span> -->
-                <el-input v-model="itemInfo.salesPrice" placeholder="销售单价" clearable />
+
+            <el-col :span="8">
+              <div class="span-sty">销售单价</div>
+              <el-form-item>
+                <el-input v-model="itemInfo.salesPrice" placeholder="销售单价" clearable class="addinputw addinputInfo"
+                  oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
               </el-form-item>
             </el-col>
+
           </el-row>
 
           <el-row>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">标准进价</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <!-- <span slot="label">{{itemInfo.standardPurchasePrice}}</span> -->
-                <el-input v-model="itemInfo.standardPurchasePrice" placeholder="标准进价" clearable />
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">代理价</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <!-- <span slot="label">{{itemInfo.agencyPrice}}</span> -->
-                <el-input v-model="itemInfo.agencyPrice" placeholder="代理价" clearable />
+
+            <el-col :span="8">
+              <div class="span-sty">标准进价</div>
+              <el-form-item>
+                <el-input v-model="itemInfo.standardPurchasePrice" placeholder="标准进价" clearable
+                  class="addinputw addinputInfo"
+                  oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
               </el-form-item>
             </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">折扣</span>
+
+            <el-col :span="8">
+              <div class="span-sty">代理价</div>
+              <el-form-item>
+                <el-input v-model="itemInfo.agencyPrice" placeholder="代理价" clearable class="addinputw addinputInfo"
+                  oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
               </el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <!-- <span slot="label">{{itemInfo.discount}}</span> -->
-                <el-input v-model="itemInfo.discount" placeholder="折扣" clearable />
+
+            <el-col :span="8">
+              <div class="span-sty">折扣</div>
+              <el-form-item>
+                <el-input v-model="itemInfo.discount" placeholder="折扣" clearable class="addinputw addinputInfo"
+                  oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
               </el-form-item>
             </el-col>
+
           </el-row>
           <el-row>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">最低零售价</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <!-- <span slot="label">{{itemInfo.minimumSalesPrice}}</span> -->
-                <el-input v-model="itemInfo.minimumSalesPrice" placeholder="最低零售价" clearable />
+
+            <el-col :span="8">
+              <div class="span-sty">最低零售价</div>
+              <el-form-item>
+                <el-input v-model="itemInfo.minimumSalesPrice" placeholder="最低零售价" clearable
+                  class="addinputw addinputInfo"
+                  oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
               </el-form-item>
             </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">是否积分兑换</span>
+
+            <el-col :span="8">
+              <div class="span-sty">是否积分兑换</div>
+              <el-form-item>
+                <el-radio-group v-model="itemInfo.isIntegralExchange" size="small" class="addinputw">
+                  <el-radio :label="'1'">是</el-radio>
+                  <el-radio :label="'2'">否</el-radio>
+                </el-radio-group>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <!-- <span slot="label">{{itemInfo.isIntegralExchange}}</span> -->
-                <el-input v-model="itemInfo.isIntegralExchange" placeholder="是否积分兑换" clearable />
+
+            <el-col :span="8">
+              <div class="span-sty">积分数量</div>
+              <el-form-item>
+                <el-input v-model="itemInfo.integralAmount" placeholder="积分数量" clearable class="addinputw addinputInfo"
+                  oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
               </el-form-item>
             </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">积分数量</span>
+
+          </el-row>
+
+          <el-row>
+
+            <el-col :span="8">
+              <div class="span-sty">锁定销售价格</div>
+              <el-form-item>
+                <el-radio-group v-model="itemInfo.isLockingSalesPrice" size="small" class="addinputw">
+                  <el-radio :label="'1'">是</el-radio>
+                  <el-radio :label="'2'">否</el-radio>
+                </el-radio-group>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <!-- <span slot="label">{{itemInfo.integralAmount}}</span> -->
-                <el-input v-model="itemInfo.integralAmount" placeholder="积分数量" clearable />
+
+
+            <el-col :span="8">
+              <div class="span-sty">排序</div>
+              <el-form-item>
+                <el-input v-model="itemInfo.sortNo" placeholder="排序" clearable class="addinputw addinputInfo"
+                  oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
               </el-form-item>
             </el-col>
-          </el-row>
 
-          <el-row>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">规格图片</span>
+            <el-col :span="8">
+              <div class="span-sty">备注</div>
+              <el-form-item>
+                <el-input v-model="itemInfo.remarks" placeholder="备注" clearable class="addinputw addinputInfo" />
               </el-form-item>
             </el-col>
-            <el-col :span="20">
-              <el-form-item class="trightb_item">
-               <!-- <upload ref="uploadImg2" v-model="imgList" style="margin-top: 20px; z-index: 1000;" class="item_input"
-                  :limit="9" bucket="map" :class="{ hide: false }" :upload-data="{ type: '0001' }" @change="backData" /> -->
 
-                  <upload-img ref="uploadImg" class="item_input" v-model="itemInfo.urls" :limit="50" bucket="map"
-                    :upload-data="{ type: '0001' }" />
+          </el-row>
 
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">规格图片</div>
+              <el-form-item>
+                <upload-img ref="uploadImg" class="addinputw addinputInfo" v-model="imgList" :limit="50" bucket="map"
+                  :upload-data="{ type: '0001' }" @change="backData" />
               </el-form-item>
             </el-col>
           </el-row>
 
         </el-form>
 
-
         <div style="display: flex;flex-direction: row;width: 100%;justify-content: center;align-items: center;">
           <el-button type="primary" style="margin-top: 20px;" @click="saveGoodsSkuDttail">确 定</el-button>
         </div>
 
       </el-dialog>
 
-      <!--  <el-card class="box-card">
-        <div class="item">
-          <span class="item_text">选择商品品牌：</span>
-          <el-select v-model="formobj.brand" placeholder="请选择商品品牌" class="item_input" @change="selectBrandChange">
-            <el-option v-for="item in brandList" :key="item.sid" :label="item.brandName" :value="item.sid" />
-          </el-select>
-        </div>
-        <div class="item">
-          <span class="item_text">选择商品类别：</span>
-          <el-select v-model="formobj.typeName" placeholder="请选择商品类别" class="item_input" @change="selectCateChange">
-            <el-option v-for="item in cateList" :key="item.sid" :label="item.goodsTypeName" :value="item.sid" />
-          </el-select>
-        </div>
-        <div class="item">
-          <span class="item_text">选择商品厂家：</span>
-          <el-select v-model="formobj.manufacturer" placeholder="请选择商品厂家" class="item_input"
-            @change="selectfacturerChange">
-            <el-option v-for="item in facturerList" :key="item.sid" :label="item.manufacturerName" :value="item.sid" />
-          </el-select>
-        </div>
-        <div class="item">
-          <span class="item_text">商品名称：</span>
-          <el-input v-model="formobj.goodsName" placeholder="商品名称" class="item_input" clearable />
-        </div>
-        <div class="item">
-          <span class="item_text">商品编码：</span>
-          <el-input v-model="formobj.goodsCode" placeholder="商品编码" class="item_input" clearable
-            oninput="value=value.replace(/[^A-Za-z0-9]/g, '')" />
-        </div>
-        <div class="item">
-          <span class="item_text">商品条码：</span>
-          <el-input v-model="formobj.barCode" placeholder="商品条码" class="item_input" clearable
-            oninput="value=value.replace(/[^0-9]/g,'')" />
-        </div>
-        <div class="item">
-          <span class="item_text">商品产地：</span>
-          <el-input v-model="formobj.producer" placeholder="商品产地" class="item_input" clearable />
-        </div>
-        <div class="item">
-          <span class="item_text">商品单位：</span>
-          <el-input v-model="formobj.unit" placeholder="商品单位" class="item_input" clearable />
-        </div>
-        <div class="item">
-          <span class="item_text">商品规格：</span>
-          <el-input v-model="formobj.specification" placeholder="商品规格" class="item_input" clearable />
-        </div>
-        <div class="item">
-          <span class="item_text">商品简介：</span>
-          <el-input v-model="formobj.remarks" placeholder="商品简介" class="item_input" clearable />
-        </div>
-
-        <div class="item" style="margin-bottom: 100px;margin-top: 100px;">
-          <span class="item_text">商品图片：</span>
-          <upload ref="uploadImg2" v-model="imgList" style="margin-top: 20px;" class="item_input" :limit="1"
-            bucket="map" :class="{ hide: hideUploadBtn }" :upload-data="{ type: '0001' }" @change="backData" />
-        </div>
-
-      </el-card> -->
-
     </div>
 
   </div>
@@ -737,6 +751,7 @@
   import req2 from '@/api/goods/brand.js'
   import req3 from '@/api/goods/category.js'
   import req4 from '@/api/goods/factory.js'
+  import req5 from '@/api/goods/unit.js'
   import uploadImg from '@/components/uploadFile/uploadImg'
   export default {
     components: {
@@ -771,6 +786,7 @@
         brandList: [],
         cateList: [],
         facturerList: [],
+        unitNameList: [],
         hideUploadBtn: false,
         dialogVisible: false,
         dialogVisible2: false,
@@ -793,16 +809,15 @@
         req4.getAllFacturer().then(resp => {
           this.facturerList = resp.data
         })
+        req5.getAllUnit().then(resp => {
+          this.unitNameList = resp.data
+        })
       },
       backData(value) {
         console.log('backData》》》》', value)
         console.log('imgList', this.imgList)
 
-        if (this.imgList.length > 0) {
-          this.formobj.picUrl = this.imgList[0].url
-        } else {
-          this.formobj.picUrl = ''
-        }
+        this.itemInfo.urls = this.imgList
 
         this.hideUploadBtn = this.imgList.length != 0
         console.log('this.hideUploadBtn', this.hideUploadBtn)
@@ -890,6 +905,12 @@
         this.formobj.manufacturerSid = choose[0].sid
         this.formobj.manufacturerName = choose[0].manufacturerName
       },
+      selectunitNameChange(val) {
+        const choose = this.unitNameList.filter((item) => item.sid == val)
+        console.log('>>>>>>>>>selectunitNameChange', choose)
+        this.formobj.goodsUnitSid = choose[0].sid
+        this.formobj.goodsUnitName = choose[0].unitName
+      },
       editGoodsSku(goodsSku) {
         console.log('>>>>>>>>>editGoodsSku', goodsSku)
         this.orderInfo = goodsSku
@@ -922,7 +943,7 @@
       },
       saveGoodsSku() {
 
-            console.log('>>>>>>>>>saveGoodsSkuDttail', this.orderInfo)
+        console.log('>>>>>>>>>saveGoodsSkuDttail', this.orderInfo)
 
         if (this.orderInfo.sid == '') {
           this.orderInfo.sid = require('uuid').v1()
@@ -991,7 +1012,7 @@
       addGoodsSku() {
         this.dialogVisible3 = true
         this.orderInfo = {
-          sid:''
+          sid: ''
         }
       }
 
@@ -999,103 +1020,29 @@
     }
   }
 </script>
-<style lang="scss" scoped>
-  // 隐藏上传组件
-
-  ::v-deep .hide {
-    .el-upload--picture-card {
-      display: none !important;
-    }
-  }
-
-  .box-card {
-    margin-left: 60px;
-    margin-right: 60px;
-    min-width: 70%;
-    margin-top: 20px;
-
-    .item {
-      display: flex;
-      flex-direction: row;
-      align-items: center;
-      margin-top: 15px;
-      height: 40px;
-      line-height: 40px;
-
-      .item_text {
-        flex: 0.8;
-        font-size: 18px;
-        text-align: right;
-      }
-
-      .item_input {
-        flex: 4;
-        font-size: 16px;
-        margin-left: 10px;
-        margin-right: 80px;
-      }
-
-      .item_left_input {
-        width: 20%;
-      }
-
-      .item_left_text {
-        height: 30px;
-        margin-left: 20px;
-        line-height: 30px;
-        color: #018AD2;
-        padding: 0px 15px;
-        border: 1.5px solid #018AD2;
-        border-radius: 5px;
-
-      }
-
-      .item_right {
-        flex: 1;
-        justify-items: center;
-
-        .item_right_list_text {
-          font-size: 16px;
-        }
-
-        .item_right_list_delect {
-          color: #5E94FF;
-          margin-left: 20px;
-          font-size: 16px;
-          text-decoration: underline;
-        }
-      }
-
-    }
-
+<style scoped>
+  .span-sty {
+    width: 130px !important;
   }
 
-  .trightb {
-    display: flex;
-    align-items: center;
-    text-align: center;
-    justify-content: center;
+  .addinputInfo {
+    margin-left: 120px !important;
   }
 
-  .trightb_item {}
-
-  .span {
-    margin-left: 50px;
-    font-size: 15px;
-    font-weight: 400;
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+    margin-left: 120px !important;
+    width: calc(100% - 115px);
   }
 
-  ::v-deep .el-collapse-item__header {
-    height: 40px;
-    padding: 10px;
-    font-weight: bold;
-    font-size: 20px;
-    text-align: left;
-    color: #ffffff;
-    background-color: #0294d7;
+  .first_row {
+    border-top: 1px solid #E0E3EB;
   }
 
-  ::v-deep .el-collapse-item__content {
-    padding-bottom: 0;
+  .titleOne {
+    padding: 7px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
   }
 </style>
diff --git a/yxt-as-ui/src/views/goods/goods/goodsInfo.vue b/yxt-as-ui/src/views/goods/goods/goodsInfo.vue
index cb54f3debc..15ec78ebf9 100644
--- a/yxt-as-ui/src/views/goods/goods/goodsInfo.vue
+++ b/yxt-as-ui/src/views/goods/goods/goodsInfo.vue
@@ -6,7 +6,6 @@
       <div>商品信息</div>
       <!-- start 添加修改按钮 -->
       <div>
-        <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
         <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
       </div>
       <!-- end 添加修改按钮 -->
@@ -15,648 +14,432 @@
 
     <div class="listconadd">
 
-      <el-form ref="dataForm" :model="formobj" label-position="top" label-width="190px" class="formadd">
-        <div class="title" style="display: flex;align-items: center;justify-content: space-between;height:40px">
+      <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
+        <div class="title">
           <div>基础信息</div>
         </div>
         <el-row class="first_row">
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">商品名称</span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <el-input v-model="formobj.goodsName" placeholder="商品名称" class="addinputw" style="width:100%" clearable />
-            </el-form-item>
-          </el-col>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">商品编码</span>
+
+          <el-col :span="12">
+            <div class="span-sty">商品名称</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.goodsName}}</span>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <el-input v-model="formobj.barCode" placeholder="商品编码" style="width: 100%;" class="addinputw" clearable />
+
+          <el-col :span="12">
+            <div class="span-sty">商品简称</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.goodsShortName}}</span>
             </el-form-item>
           </el-col>
+
         </el-row>
 
         <el-row>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">商品品牌</span>
+
+          <el-col :span="12">
+            <div class="span-sty">商品副标题</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.subTitle}}</span>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <el-select v-model="formobj.brandName" placeholder="请选择商品品牌" class="addinputw" style="width: 100%;"
-                @change="selectBrandChange">
-                <el-option v-for="item in brandList" :key="item.sid" :label="item.brandName" :value="item.sid" />
-              </el-select>
+
+          <el-col :span="12">
+            <div class="span-sty">商品拼音缩写</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.goodsPY}}</span>
             </el-form-item>
           </el-col>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">商品类别</span>
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="12">
+            <div class="span-sty">商品编码</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.goodsCode}}</span>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <el-select v-model="formobj.typeName" placeholder="请选择商品类别" class="addinputw" style="width: 100%;"
-                @change="selectCateChange">
-                <el-option v-for="item in cateList" :key="item.sid" :label="item.goodsTypeName" :value="item.sid" />
-              </el-select>
+
+          <el-col :span="12">
+            <div class="span-sty">商品条形码</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.barCode}}</span>
             </el-form-item>
           </el-col>
+
         </el-row>
 
         <el-row>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">商品厂家</span>
+
+          <el-col :span="12">
+            <div class="span-sty">商品品牌</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.brandName}}</span>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <el-select v-model="formobj.manufacturerName" placeholder="请选择商品厂家" class="addinputw" style="width: 100%;"
-                @change="selectfacturerChange">
-                <el-option v-for="item in facturerList" :key="item.sid" :label="item.manufacturerName"
-                  :value="item.sid" />
-              </el-select>
+
+          <el-col :span="12">
+            <div class="span-sty">商品类别</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.typeName}}</span>
             </el-form-item>
           </el-col>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">厂家货号</span>
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="12">
+            <div class="span-sty">商品厂家</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.manufacturerName}}</span>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <el-input v-model="formobj.factoryCode" placeholder="商品名称" style="width: 100%;" class="addinputw"
-                clearable />
+
+          <el-col :span="12">
+            <div class="span-sty">厂家货号</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.factoryCode}}</span>
             </el-form-item>
           </el-col>
+
         </el-row>
 
         <el-row>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">外部编码</span>
+
+          <el-col :span="12">
+            <div class="span-sty">商品单位</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.goodsUnitName}}</span>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <el-input v-model="formobj.externalCode" placeholder="外部编码" style="width: 100%;" class="addinputw"
-                clearable />
+
+          <el-col :span="12">
+            <div class="span-sty">是否上架</div>
+            <el-form-item>
+              <el-radio-group v-model="formobj.isListed" :disabled="true" size="small" class="addinputw">
+                <el-radio :label="'1'">上架</el-radio>
+                <el-radio :label="'2'">下架</el-radio>
+              </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">国标码</span>
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="12">
+            <div class="span-sty">外部编码</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.externalCode}}</span>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <el-input v-model="formobj.nationalStandardCode" placeholder="国标码" style="width: 100%;" class="addinputw"
-                clearable />
+
+          <el-col :span="12">
+            <div class="span-sty">国标码</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.nationalStandardCode}}</span>
             </el-form-item>
           </el-col>
+
         </el-row>
 
         <el-row>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">税率</span>
+
+          <el-col :span="12">
+            <div class="span-sty">税率</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.taxRate}}</span>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <el-input v-model="formobj.taxRate" placeholder="税率" style="width: 100%;" class="addinputw" clearable />
+
+          <el-col :span="12">
+            <div class="span-sty">保质期天</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.shelfLife}}</span>
             </el-form-item>
           </el-col>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">保质期天</span>
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="12">
+            <div class="span-sty">商品排序</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.sortNo}}</span>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <el-input v-model="formobj.shelfLife" placeholder="保质期天" style="width: 100%;" class="addinputw"
-                clearable />
+
+          <el-col :span="12">
+            <div class="span-sty">商品备注</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.remarks}}</span>
             </el-form-item>
           </el-col>
+
         </el-row>
 
         <el-row>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">商品详细说明</span>
+
+          <el-col :span="24">
+            <div class="span-sty">商品详细说明</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.baseGoodsSpuDetail.goodsExplain}}</span>
             </el-form-item>
           </el-col>
-          <el-col :span="20">
-            <el-form-item class="trightb_item">
-              <el-input v-model="formobj.baseGoodsSpuDetail.goodsExplain" type="textarea" :rows="4"
-                style="width: 100%;margin-bottom: 5px;;" placeholder="商品详细说明" class="addinputw" clearable />
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="24">
+            <div class="span-sty">商品描述</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.baseGoodsSpuDetail.goodsDescription}}</span>
             </el-form-item>
           </el-col>
+
         </el-row>
 
         <el-row>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">商品描述</span>
+
+          <el-col :span="24">
+            <div class="span-sty">商品通用规格参数</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.baseGoodsSpuDetail.genericSpec}}</span>
             </el-form-item>
           </el-col>
-          <el-col :span="20">
-            <el-form-item class="trightb_item">
-              <el-input v-model="formobj.baseGoodsSpuDetail.goodsDescription" type="textarea" :rows="4"
-                style="width: 100%;margin-bottom: 5px;;" placeholder="商品描述" class="addinputw" clearable />
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="24">
+            <div class="span-sty">商品特有规格参数</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.baseGoodsSpuDetail.specialSpec}}</span>
             </el-form-item>
           </el-col>
+
         </el-row>
 
-        <el-collapse v-model="activeNames" style="margin-top: 20px;">
-          <el-collapse-item name="1">
-            <template slot="title">
-              规格列表<span class="span" @click.stop="add()">添加</span>
-            </template>
-            <el-table v-loading="listLoading" :data="formobj.baseGoodsSkus" border style="width: 100%;"
-              :row-style="{height: '40px'}">
-              <!-- <el-table-column type="selection" align="center" width="50"/> -->
-              <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
-              <el-table-column label="是否可用" align="center" width="200">
-                <template slot-scope="scope">
-                  <el-switch v-model="scope.row.isEnable" active-text="是" inactive-text="否" active-value="1"
-                    inactive-value="2" @change="enableChange(scope.row.sid,scope.row.isEnable)" />
-                </template>
-              </el-table-column>
-              <el-table-column label="规格代码" prop="goodsSkuCode" align="center" />
-              <el-table-column label="标题" prop="title" align="center" />
-              <el-table-column label="外部编码" prop="externalCode" align="center" />
-              <el-table-column label="规格明细" wid align="center" width="250">
-                <template slot-scope="scope">
-                  <el-button type="primary" size="mini"
-                    @click="showGoodsSkuDttail(scope.row.baseGoodsSkuExtend)">查看</el-button>
-                  <el-button type="primary" size="mini"
-                    @click="editGoodsSkuDttail(scope.row.baseGoodsSkuExtend)">编辑</el-button>
-                </template>
-              </el-table-column>
-            </el-table>
 
-          </el-collapse-item>
-        </el-collapse>
+        <div class="title titleOne">
+          <div>规格列表</div>
+        </div>
+        <el-table v-loading="listLoading" :data="formobj.baseGoodsSkus" border>
+          <!-- <el-table-column type="selection" align="center" width="50"/> -->
+          <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
+          <el-table-column label="规格代码" prop="goodsSkuCode" align="center" />
+          <el-table-column label="商品标题" prop="title" align="center" />
+          <el-table-column label="外部编码" prop="externalCode" align="center" />
+          <el-table-column label="特有规格属性" prop="indexes" align="center" />
+          <el-table-column label="特有规格参数" prop="ownSpec" align="center" />
+          <el-table-column label="规格明细" wid align="center" width="250">
+            <template slot-scope="scope">
+              <el-button type="primary" size="mini"
+                @click="showGoodsSkuDttail(scope.row.baseGoodsSkuExtend)">查看</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
 
       </el-form>
 
-
       <el-dialog title="查看规格明细" :visible.sync="dialogVisible" :before-close="handleClose">
-        <el-form ref="dataForm1" class="formadd" style="margin-top: -40px;" :model="itemInfo">
+
+        <el-form ref="dataForm1" class="formaddcopy02" style="margin-top: -40px;" :model="itemInfo">
 
           <el-row class="first_row">
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">最后采购价</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.finalPurchasePrice}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">安全库存天数</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.safetyStockDays}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">是否原厂</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.isOriginalFactory}}</span>
-              </el-form-item>
-            </el-col>
-          </el-row>
 
-          <el-row>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">是否库存警戒</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.isInventoryAlert}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">库存警戒上线</span>
+            <el-col :span="8">
+              <div class="span-sty">最后采购价</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.finalPurchasePrice}}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.inventoryAlertUpperLimit}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">库存警戒下线</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.inventoryAlertLowerLimit}}</span>
-              </el-form-item>
-            </el-col>
-          </el-row>
 
-          <el-row>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">成本价</span>
+            <el-col :span="8">
+              <div class="span-sty">安全库存天数</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.safetyStockDays}}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.costPrice}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">吊牌价</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.tagPrice}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">销售单价</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.salesPrice}}</span>
+
+            <el-col :span="8">
+              <div class="span-sty">是否原厂</div>
+              <el-form-item>
+                <el-radio-group v-model="itemInfo.isOriginalFactory" :disabled="true" size="small" class="addinputw">
+                  <el-radio :label="'1'">是</el-radio>
+                  <el-radio :label="'2'">否</el-radio>
+                </el-radio-group>
               </el-form-item>
             </el-col>
+
           </el-row>
 
           <el-row>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">标准进价</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.standardPurchasePrice}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">代理价</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.agencyPrice}}</span>
+
+            <el-col :span="8">
+              <div class="span-sty">是否库存警戒</div>
+              <el-form-item>
+                <el-radio-group v-model="itemInfo.isInventoryAlert" :disabled="true" size="small" class="addinputw">
+                  <el-radio :label="'1'">是</el-radio>
+                  <el-radio :label="'2'">否</el-radio>
+                </el-radio-group>
               </el-form-item>
             </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">折扣</span>
+
+            <el-col :span="8">
+              <div class="span-sty">库存警戒上线</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.inventoryAlertUpperLimit}}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.discount}}</span>
+
+            <el-col :span="8">
+              <div class="span-sty">库存警戒下线</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.inventoryAlertLowerLimit}}</span>
               </el-form-item>
             </el-col>
+
           </el-row>
+
           <el-row>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">最低零售价</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.minimumSalesPrice}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">是否积分兑换</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.isIntegralExchange}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">积分数量</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.integralAmount}}</span>
+
+            <el-col :span="8">
+              <div class="span-sty">成本价</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.costPrice}}</span>
               </el-form-item>
             </el-col>
-          </el-row>
 
-          <el-row>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">规格图片</span>
+            <el-col :span="8">
+              <div class="span-sty">吊牌价</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.tagPrice}}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="20">
-              <el-form-item class="trightb_item">
-                <template slot-scope="scope">
-                  <span v-for="(item,index) in itemInfo.urls" :key="index">
-                    <el-popover placement="left" trigger="click" width="300">
-                      <img :src="item" width="100%" />
-                      <img slot="reference" :src="item" :alt="item"
-                        style="max-height: 70px;max-width: 70px; padding: 5px" />
-                    </el-popover>
-                  </span>
-                </template>
+
+            <el-col :span="8">
+              <div class="span-sty">销售单价</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.salesPrice}}</span>
               </el-form-item>
             </el-col>
-          </el-row>
-        </el-form>
 
-        <div style="display: flex;flex-direction: row;width: 100%;justify-content: center;align-items: center;">
-          <el-button type="primary" style="margin-top: 20px;" @click="handleClose">关 闭</el-button>
-        </div>
 
-      </el-dialog>
-
-
-
-      <el-dialog title="编辑规格明细" :visible.sync="dialogVisible2" :before-close="handleClose2">
-        <el-form ref="dataForm2" class="formadd" style="margin-top: -40px;" :model="orderInfo">
-          <el-row class="first_row">
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">最后采购价</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.finalPurchasePrice}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">安全库存天数</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.safetyStockDays}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">是否原厂</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.isOriginalFactory}}</span>
-              </el-form-item>
-            </el-col>
           </el-row>
 
           <el-row>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">是否库存警戒</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.isInventoryAlert}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">库存警戒上线</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.inventoryAlertUpperLimit}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">库存警戒下线</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.inventoryAlertLowerLimit}}</span>
-              </el-form-item>
-            </el-col>
-          </el-row>
 
-          <el-row>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">成本价</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.costPrice}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">吊牌价</span>
+            <el-col :span="8">
+              <div class="span-sty">标准进价</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.standardPurchasePrice}}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.tagPrice}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">销售单价</span>
+
+            <el-col :span="8">
+              <div class="span-sty">代理价</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.agencyPrice}}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.salesPrice}}</span>
+
+            <el-col :span="8">
+              <div class="span-sty">折扣</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.discount}}</span>
               </el-form-item>
             </el-col>
+
           </el-row>
 
           <el-row>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">标准进价</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.standardPurchasePrice}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">代理价</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.agencyPrice}}</span>
+
+            <el-col :span="8">
+              <div class="span-sty">最低零售价</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.minimumSalesPrice}}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">折扣</span>
+
+            <el-col :span="8">
+              <div class="span-sty">是否积分兑换</div>
+              <el-form-item>
+                <el-radio-group v-model="itemInfo.isIntegralExchange" :disabled="true" size="small" class="addinputw">
+                  <el-radio :label="'1'">是</el-radio>
+                  <el-radio :label="'2'">否</el-radio>
+                </el-radio-group>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.discount}}</span>
+
+            <el-col :span="8">
+              <div class="span-sty">积分数量</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.integralAmount}}</span>
               </el-form-item>
             </el-col>
+
           </el-row>
+
           <el-row>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">最低零售价</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.minimumSalesPrice}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">是否积分兑换</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.isIntegralExchange}}</span>
+
+            <el-col :span="8">
+              <div class="span-sty">锁定销售价格</div>
+              <el-form-item>
+                <el-radio-group v-model="itemInfo.isLockingSalesPrice" :disabled="true" size="small" class="addinputw">
+                  <el-radio :label="'1'">是</el-radio>
+                  <el-radio :label="'2'">否</el-radio>
+                </el-radio-group>
               </el-form-item>
             </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">积分数量</span>
+
+            <el-col :span="8">
+              <div class="span-sty">排序</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.sortNo}}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.integralAmount}}</span>
+
+            <el-col :span="8">
+              <div class="span-sty">备注</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.remarks}}</span>
               </el-form-item>
             </el-col>
+
           </el-row>
 
           <el-row>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">规格图片</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="20">
-              <el-form-item class="trightb_item">
-               <!-- <upload ref="uploadImg2" v-model="imgList" style="margin-top: 20px; z-index: 1000;" class="item_input" :limit="9"
-                  bucket="map" :class="{ hide: false }" :upload-data="{ type: '0001' }" @change="backData" /> -->
-                  <upload-img ref="uploadImg" class="item_input" v-model="itemInfo.urls" :limit="50" bucket="map"
-                    :upload-data="{ type: '0001' }" />
+            <el-col :span="24">
+              <div class="span-sty">规格图片</div>
+              <el-form-item>
+                <template slot-scope="scope">
+                  <span v-for="(item,index) in itemInfo.urls" :key="index" class="addinputInfo">
+                    <el-popover placement="left" trigger="click" width="300">
+                      <img :src="item.url" width="100%" />
+                      <img slot="reference" :src="item.url" :alt="item.url"
+                        style="max-height: 70px;max-width: 70px; padding: 5px" />
+                    </el-popover>
+                  </span>
+                </template>
               </el-form-item>
             </el-col>
           </el-row>
-
         </el-form>
 
-
         <div style="display: flex;flex-direction: row;width: 100%;justify-content: center;align-items: center;">
-          <el-button type="primary" style="margin-top: 20px;" @click="handleClose2">确 定</el-button>
+          <el-button type="primary" style="margin-top: 20px;" @click="handleClose">关 闭</el-button>
         </div>
 
       </el-dialog>
 
-      <!--  <el-card class="box-card">
-        <div class="item">
-          <span class="item_text">选择商品品牌：</span>
-          <el-select v-model="formobj.brand" placeholder="请选择商品品牌" class="item_input" @change="selectBrandChange">
-            <el-option v-for="item in brandList" :key="item.sid" :label="item.brandName" :value="item.sid" />
-          </el-select>
-        </div>
-        <div class="item">
-          <span class="item_text">选择商品类别：</span>
-          <el-select v-model="formobj.typeName" placeholder="请选择商品类别" class="item_input" @change="selectCateChange">
-            <el-option v-for="item in cateList" :key="item.sid" :label="item.goodsTypeName" :value="item.sid" />
-          </el-select>
-        </div>
-        <div class="item">
-          <span class="item_text">选择商品厂家：</span>
-          <el-select v-model="formobj.manufacturer" placeholder="请选择商品厂家" class="item_input"
-            @change="selectfacturerChange">
-            <el-option v-for="item in facturerList" :key="item.sid" :label="item.manufacturerName" :value="item.sid" />
-          </el-select>
-        </div>
-        <div class="item">
-          <span class="item_text">商品名称：</span>
-          <el-input v-model="formobj.goodsName" placeholder="商品名称" class="item_input" clearable />
-        </div>
-        <div class="item">
-          <span class="item_text">商品编码：</span>
-          <el-input v-model="formobj.goodsCode" placeholder="商品编码" class="item_input" clearable
-            oninput="value=value.replace(/[^A-Za-z0-9]/g, '')" />
-        </div>
-        <div class="item">
-          <span class="item_text">商品条码：</span>
-          <el-input v-model="formobj.barCode" placeholder="商品条码" class="item_input" clearable
-            oninput="value=value.replace(/[^0-9]/g,'')" />
-        </div>
-        <div class="item">
-          <span class="item_text">商品产地：</span>
-          <el-input v-model="formobj.producer" placeholder="商品产地" class="item_input" clearable />
-        </div>
-        <div class="item">
-          <span class="item_text">商品单位：</span>
-          <el-input v-model="formobj.unit" placeholder="商品单位" class="item_input" clearable />
-        </div>
-        <div class="item">
-          <span class="item_text">商品规格：</span>
-          <el-input v-model="formobj.specification" placeholder="商品规格" class="item_input" clearable />
-        </div>
-        <div class="item">
-          <span class="item_text">商品简介：</span>
-          <el-input v-model="formobj.remarks" placeholder="商品简介" class="item_input" clearable />
-        </div>
-
-        <div class="item" style="margin-bottom: 100px;margin-top: 100px;">
-          <span class="item_text">商品图片：</span>
-          <upload ref="uploadImg2" v-model="imgList" style="margin-top: 20px;" class="item_input" :limit="1"
-            bucket="map" :class="{ hide: hideUploadBtn }" :upload-data="{ type: '0001' }" @change="backData" />
-        </div>
-
-      </el-card> -->
-
     </div>
 
   </div>
@@ -664,14 +447,7 @@
 
 <script>
   import req from '@/api/goods/goods.js'
-  import req2 from '@/api/goods/brand.js'
-  import req3 from '@/api/goods/category.js'
-  import req4 from '@/api/goods/factory.js'
- import uploadImg from '@/components/uploadFile/uploadImg'
- export default {
-   components: {
-     uploadImg
-   },
+  export default {
     data() {
       return {
         listLoading: false,
@@ -698,9 +474,6 @@
           },
           baseGoodsSkuDtos: []
         },
-        brandList: [],
-        cateList: [],
-        facturerList: [],
         hideUploadBtn: false,
         dialogVisible: false,
         dialogVisible2: false,
@@ -708,52 +481,9 @@
         orderInfo: {}
       }
     },
-    created() {
-      this.initData()
-    },
+    created() {},
     methods: {
-      initData() {
-        req2.getAllBrand().then(resp => {
-          this.brandList = resp.data
-        })
-        req3.getAllType().then(resp => {
-          this.cateList = resp.data
-        })
-        req4.getAllFacturer().then(resp => {
-          this.facturerList = resp.data
-        })
-      },
-      backData(value) {
-        console.log('backData》》》》', value)
-        console.log('imgList', this.imgList)
-
-        if (this.imgList.length > 0) {
-          this.formobj.picUrl = this.imgList[0].url
-        } else {
-          this.formobj.picUrl = ''
-        }
 
-        this.hideUploadBtn = this.imgList.length != 0
-        console.log('this.hideUploadBtn', this.hideUploadBtn)
-      },
-
-      saveOrUpdate() {
-        console.log('>>>>>>>>>saveOrUpdate', this.formobj)
-        req.saveGoods(this.formobj)
-          .then(resp => {
-            if (resp.success) {
-              this.$message({
-                showClose: true,
-                type: 'success',
-                message: resp.msg
-              })
-              this.handleReturn('true')
-            } else {
-              // 根据resp.code进行异常情况处理
-            }
-          })
-          .catch(() => {})
-      },
       handleReturn(isreload) {
         if (isreload === 'true') this.$emit('reloadlist')
         this.imgList = []
@@ -796,40 +526,12 @@
             this.formobj = row
           })
       },
-      selectBrandChange(val) {
-        const choose = this.brandList.filter((item) => item.sid == val)
-        console.log('>>>>>>>>>selectBrandChange', choose)
-        this.formobj.brandSid = choose[0].sid
-        this.formobj.brandName = choose[0].brandName
-      },
-      selectCateChange(val) {
-        const choose = this.cateList.filter((item) => item.sid == val)
-        console.log('>>>>>>>>>selectCateChange', choose)
-        this.formobj.goodsTypeSid = choose[0].sid
-        this.formobj.typeName = choose[0].goodsTypeName
-      },
-      selectfacturerChange(val) {
-        const choose = this.facturerList.filter((item) => item.sid == val)
-        console.log('>>>>>>>>>selectfacturerChange', choose)
-        this.formobj.manufacturerSid = choose[0].sid
-        this.formobj.manufacturerName = choose[0].manufacturerName
-      },
-
 
       showGoodsSkuDttail(goodsSkuDto) {
         console.log('>>>>>>>>>showGoodsSkuDttail', goodsSkuDto)
 
         this.dialogVisible = true
         this.itemInfo = goodsSkuDto
-        this.imgList = goodsSkuDto.urls
-      },
-
-      editGoodsSkuDttail(goodsSkuDto) {
-        console.log('>>>>>>>>>editGoodsSkuDttail', goodsSkuDto)
-
-        this.dialogVisible2 = true
-        this.itemInfo = goodsSkuDto
-        this.imgList = goodsSkuDto.urls
       },
 
       handleClose() {
@@ -843,103 +545,29 @@
     }
   }
 </script>
-<style lang="scss" scoped>
-  // 隐藏上传组件
-
-  ::v-deep .hide {
-    .el-upload--picture-card {
-      display: none !important;
-    }
+<style scoped>
+  .span-sty {
+    width: 130px !important;
   }
 
-  .box-card {
-    margin-left: 60px;
-    margin-right: 60px;
-    min-width: 70%;
-    margin-top: 20px;
-
-    .item {
-      display: flex;
-      flex-direction: row;
-      align-items: center;
-      margin-top: 15px;
-      height: 40px;
-      line-height: 40px;
-
-      .item_text {
-        flex: 0.8;
-        font-size: 18px;
-        text-align: right;
-      }
-
-      .item_input {
-        flex: 4;
-        font-size: 16px;
-        margin-left: 10px;
-        margin-right: 80px;
-      }
-
-      .item_left_input {
-        width: 20%;
-      }
-
-      .item_left_text {
-        height: 30px;
-        margin-left: 20px;
-        line-height: 30px;
-        color: #018AD2;
-        padding: 0px 15px;
-        border: 1.5px solid #018AD2;
-        border-radius: 5px;
-
-      }
-
-      .item_right {
-        flex: 1;
-        justify-items: center;
-
-        .item_right_list_text {
-          font-size: 16px;
-        }
-
-        .item_right_list_delect {
-          color: #5E94FF;
-          margin-left: 20px;
-          font-size: 16px;
-          text-decoration: underline;
-        }
-      }
-
-    }
-
-  }
-
-  .trightb {
-    display: flex;
-    align-items: center;
-    text-align: center;
-    justify-content: center;
+  .addinputInfo {
+    margin-left: 120px !important;
   }
 
-  .trightb_item {}
-
-  .span {
-    margin-left: 50px;
-    font-size: 15px;
-    font-weight: 400;
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+    margin-left: 120px !important;
+    width: calc(100% - 115px);
   }
 
-  ::v-deep .el-collapse-item__header {
-    height: 40px;
-    padding: 10px;
-    font-weight: bold;
-    font-size: 20px;
-    text-align: left;
-    color: #ffffff;
-    background-color: #0294d7;
+  .first_row {
+    border-top: 1px solid #E0E3EB;
   }
 
-  ::v-deep .el-collapse-item__content {
-    padding-bottom: 0;
+  .titleOne {
+    padding: 7px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
   }
 </style>
diff --git a/yxt-as-ui/src/views/goods/goods/index.vue b/yxt-as-ui/src/views/goods/goods/index.vue
index ffd2d1adcb..a1d9415088 100644
--- a/yxt-as-ui/src/views/goods/goods/index.vue
+++ b/yxt-as-ui/src/views/goods/goods/index.vue
@@ -67,7 +67,7 @@
     <!-- 新增修改部分组件 -->
     <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
     <!-- 详情部分组件 -->
-    <divInfo v-show="viewState == 4" ref="divinfo" />
+    <divInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="loadList"/>
 
   </div>
 </template>
@@ -230,8 +230,8 @@
         this.$router.go(-1)
       },
       toRelevancy(row) {
-        this.viewState = 3
-        this.$refs['divadd'].showEdit(row)
+        this.viewState = 4
+        this.$refs['divinfo'].showEdit(row)
       },
       toRelevancyInfo(row) {
         const tip = '请确认是否删除所选品牌?'
diff --git a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseSupplierTypeRest.java b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseSupplierTypeRest.java
index 95eb003876..5edde730a2 100644
--- a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseSupplierTypeRest.java
+++ b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseSupplierTypeRest.java
@@ -66,9 +66,7 @@ public class BaseSupplierTypeRest {
 	@ApiOperation("新增或修改")
 	@PostMapping("/save")
 	public ResultBean save(@RequestBody BaseSupplierTypeDto dto){
-		ResultBean rb = ResultBean.fireFail();
-		baseSupplierTypeService.saveOrUpdateDto(dto);
-		return rb.success();
+		return baseSupplierTypeService.saveOrUpdateDto(dto);
 	}
 
 	@ApiOperation("根据sid批量删除")
diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierBank/BaseSupplierBankService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierBank/BaseSupplierBankService.java
index 2096b36525..bb1735d3dc 100644
--- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierBank/BaseSupplierBankService.java
+++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierBank/BaseSupplierBankService.java
@@ -54,52 +54,38 @@ import java.util.List;
 @Service
 public class BaseSupplierBankService extends MybatisBaseService<BaseSupplierBankMapper, BaseSupplierBank> {
 
-	public PagerVo<BaseSupplierBankVo> listPageVo(PagerQuery<BaseSupplierBankQuery> pq) {
-		BaseSupplierBankQuery query = pq.getParams();
-		QueryWrapper<BaseSupplierBank> qw = new QueryWrapper<>();
-		IPage<BaseSupplierBank> page = PagerUtil.queryToPage(pq);
-		IPage<BaseSupplierBankVo> pagging = baseMapper.selectPageVo(page, qw);
-		PagerVo<BaseSupplierBankVo> p = PagerUtil.pageToVo(pagging, null);
-		return p;
-	}
-	
-	public void saveOrUpdateDto(BaseSupplierBankDto dto){
-        String dtoSid = dto.getSid();
-        if (StringUtils.isBlank(dtoSid)) {
-            this.insertByDto(dto);
-            return; 
-        } 
-		this.updateByDto(dto);
-	}
-	
-	public void insertByDto(BaseSupplierBankDto dto){
-		BaseSupplierBank entity = new BaseSupplierBank();
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.insert(entity);
-	}
-	
-	public void updateByDto(BaseSupplierBankDto dto){
-          String dtoSid = dto.getSid();
-        if (StringUtils.isBlank(dtoSid)) {
-            return;
-        } 
-		BaseSupplierBank entity = fetchBySid(dtoSid);
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.updateById(entity);
-	}
-	
-	public BaseSupplierBankDetailsVo fetchDetailsVoBySid(String sid){
-		BaseSupplierBank entity = fetchBySid(sid);
-		BaseSupplierBankDetailsVo vo = new BaseSupplierBankDetailsVo();
-		BeanUtil.copyProperties(entity, vo);
-		return vo;
-	}
+    public PagerVo<BaseSupplierBankVo> listPageVo(PagerQuery<BaseSupplierBankQuery> pq) {
+        BaseSupplierBankQuery query = pq.getParams();
+        QueryWrapper<BaseSupplierBank> qw = new QueryWrapper<>();
+        IPage<BaseSupplierBank> page = PagerUtil.queryToPage(pq);
+        IPage<BaseSupplierBankVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<BaseSupplierBankVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
 
-	public int deleteBySupplierSid(String supplierSid) {
-		return baseMapper.deleteBySupplierSid(supplierSid);
-	}
+    public void saveOrUpdateDto(BaseSupplierBankDto dto) {
+        this.insertByDto(dto);
+        return;
+    }
 
-	public List<BaseSupplierBankDetailsVo> selectBySupplierSid(String supplierSid) {
-		return baseMapper.selectBySupplierSid(supplierSid);
-	}
+    public void insertByDto(BaseSupplierBankDto dto) {
+        BaseSupplierBank entity = new BaseSupplierBank();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+    }
+
+    public BaseSupplierBankDetailsVo fetchDetailsVoBySid(String sid) {
+        BaseSupplierBank entity = fetchBySid(sid);
+        BaseSupplierBankDetailsVo vo = new BaseSupplierBankDetailsVo();
+        BeanUtil.copyProperties(entity, vo);
+        return vo;
+    }
+
+    public int deleteBySupplierSid(String supplierSid) {
+        return baseMapper.deleteBySupplierSid(supplierSid);
+    }
+
+    public List<BaseSupplierBankDetailsVo> selectBySupplierSid(String supplierSid) {
+        return baseMapper.selectBySupplierSid(supplierSid);
+    }
 }
\ No newline at end of file
diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoDto.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoDto.java
index 534d65fa78..6d7e01404f 100644
--- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoDto.java
+++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoDto.java
@@ -56,6 +56,8 @@ public class BaseSupplierInfoDto implements Dto {
 
     private String sid; // sid
 
+    @ApiModelProperty("备注")
+    private String remarks;
 	@ApiModelProperty("编码")
     private String supplierCode; // 编码
 	@ApiModelProperty("供应商名称")
diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoService.java
index 20dcce80a1..f2acd0a841 100644
--- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoService.java
+++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoService.java
@@ -97,9 +97,6 @@ public class BaseSupplierInfoService extends MybatisBaseService<BaseSupplierInfo
 		ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
 		List<BaseSupplierBankDto> baseSupplierBankDtoList = dto.getBaseSupplierBankList();
-		if (baseSupplierBankDtoList == null || baseSupplierBankDtoList.size() == 0){
-			return rb.setMsg("开户行信息不能为空");
-		}
 		if (StringUtils.isBlank(dtoSid)) {
 			String sid = this.insertByDto(dto);
 			for (BaseSupplierBankDto baseSupplierBankDto : baseSupplierBankDtoList) {
@@ -109,19 +106,10 @@ public class BaseSupplierInfoService extends MybatisBaseService<BaseSupplierInfo
 			return rb.success();
         } 
 		this.updateByDto(dto);
+		baseSupplierBankService.deleteBySupplierSid(dtoSid);
 		for (BaseSupplierBankDto baseSupplierBankDto : baseSupplierBankDtoList) {
-			String bankSid = baseSupplierBankDto.getSid();
-			if(StringUtils.isNotBlank(bankSid)){
-				BaseSupplierBank baseSupplierBank = baseSupplierBankService.fetchBySid(bankSid);
-				BeanUtil.copyProperties(baseSupplierBankDto,baseSupplierBank,"sid");
-				baseSupplierBank.setSupplierSid(dtoSid);
-				baseSupplierBankService.updateById(baseSupplierBank);
-			}else{
-				BaseSupplierBank baseSupplierBank = new BaseSupplierBank();
-				BeanUtil.copyProperties(baseSupplierBankDto,baseSupplierBank,"sid");
-				baseSupplierBank.setSupplierSid(dtoSid);
-				baseSupplierBankService.insert(baseSupplierBank);
-			}
+			baseSupplierBankDto.setSupplierSid(dtoSid);
+			baseSupplierBankService.saveOrUpdateDto(baseSupplierBankDto);
 		}
 		return rb.success();
 	}
diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeMapper.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeMapper.java
index 5365445fed..4aab553793 100644
--- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeMapper.java
+++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeMapper.java
@@ -57,4 +57,10 @@ public interface BaseSupplierTypeMapper extends BaseMapper<BaseSupplierType> {
 	
 	@Select("select * from base_supplier_type")
 	List<BaseSupplierTypeVo> selectListVo();
+
+	@Select("SELECT COUNT(*) FROM base_supplier_type WHERE supplierTypeCode = #{supplierTypeCode} AND createOrgSid = #{createOrgSid}")
+    int checkSaveCode(@Param("supplierTypeCode") String supplierTypeCode,@Param("createOrgSid") String createOrgSid);
+
+	@Select("SELECT COUNT(*) FROM base_supplier_type WHERE supplierTypeCode = #{supplierTypeCode} AND createOrgSid = #{createOrgSid} AND sid != #{dtoSid}")
+	int checkUpdateCode(@Param("supplierTypeCode") String supplierTypeCode,@Param("createOrgSid") String createOrgSid,@Param("dtoSid") String dtoSid);
 }
\ No newline at end of file
diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeService.java
index 8c5a38e400..04edda83de 100644
--- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeService.java
+++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesuppliertype/BaseSupplierTypeService.java
@@ -31,6 +31,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -60,13 +61,25 @@ public class BaseSupplierTypeService extends MybatisBaseService<BaseSupplierType
 		return p;
 	}
 	
-	public void saveOrUpdateDto(BaseSupplierTypeDto dto){
+	public ResultBean saveOrUpdateDto(BaseSupplierTypeDto dto){
+		ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
-        if (StringUtils.isBlank(dtoSid)) {
-            this.insertByDto(dto);
-            return; 
-        } 
+		String supplierTypeCode = dto.getSupplierTypeCode();
+		String createOrgSid = dto.getCreateOrgSid();
+		if (StringUtils.isBlank(dtoSid)) {
+			int i = baseMapper.checkSaveCode(supplierTypeCode,createOrgSid);
+			if (i > 0){
+				return rb.setMsg("新增编码已存在，请重新输入");
+			}
+			this.insertByDto(dto);
+            return rb.success();
+        }
+		int i = baseMapper.checkUpdateCode(supplierTypeCode,createOrgSid,dtoSid);
+		if (i > 0){
+			return rb.setMsg("修改编码已存在，请重新输入");
+		}
 		this.updateByDto(dto);
+		return rb.success();
 	}
 	
 	public void insertByDto(BaseSupplierTypeDto dto){
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchaseBillInvoiceRest.java b/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchaseBillInvoiceRest.java
new file mode 100644
index 0000000000..88fab3fcfd
--- /dev/null
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchaseBillInvoiceRest.java
@@ -0,0 +1,89 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.pms.apiadmin.pms;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.pms.biz.pms.pmspurchasebillinvoice.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Project: yxt-pms(采购发票) <br/>
+ * File: PmsPurchaseBillInvoiceFeignFallback.java <br/>
+ * Class: com.yxt.pms.biz.pmspurchasebillinvoice.PmsPurchaseBillInvoiceRest <br/>
+ * Description: 采购单-发票. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-05-08 09:51:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "采购单-发票")
+@RestController
+@RequestMapping("v1/pmspurchasebillinvoice")
+public class PmsPurchaseBillInvoiceRest {
+
+	@Autowired
+	private PmsPurchaseBillInvoiceService pmsPurchaseBillInvoiceService;
+
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<PmsPurchaseBillInvoiceVo>> listPage(@RequestBody PagerQuery<PmsPurchaseBillInvoiceQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<PmsPurchaseBillInvoiceVo> pv = pmsPurchaseBillInvoiceService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody PmsPurchaseBillInvoiceDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		pmsPurchaseBillInvoiceService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@ApiOperation("根据sid批量删除")
+    @DeleteMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		pmsPurchaseBillInvoiceService.delBySids(sids);
+		return rb.success();
+	}
+
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<PmsPurchaseBillInvoiceDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		PmsPurchaseBillInvoiceDetailsVo vo = pmsPurchaseBillInvoiceService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchasePayRest.java b/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchasePayRest.java
new file mode 100644
index 0000000000..ae021104d3
--- /dev/null
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchasePayRest.java
@@ -0,0 +1,89 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.pms.apiadmin.pms;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.pms.biz.pms.pmspurchasepay.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Project: yxt-pms(采购) <br/>
+ * File: PmsPurchasePayFeignFallback.java <br/>
+ * Class: com.yxt.pms.biz.pmspurchasepay.PmsPurchasePayRest <br/>
+ * Description: 付款说明. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-05-06 15:43:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "付款说明")
+@RestController
+@RequestMapping("v1/pmspurchasepay")
+public class PmsPurchasePayRest {
+
+	@Autowired
+	private PmsPurchasePayService pmsPurchasePayService;
+
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<PmsPurchasePayVo>> listPage(@RequestBody PagerQuery<PmsPurchasePayQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<PmsPurchasePayVo> pv = pmsPurchasePayService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody PmsPurchasePayDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		pmsPurchasePayService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@ApiOperation("根据sid批量删除")
+    @DeleteMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		pmsPurchasePayService.delBySids(sids);
+		return rb.success();
+	}
+
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<PmsPurchasePayDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		PmsPurchasePayDetailsVo vo = pmsPurchasePayService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsSupplierTypeRest.java b/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsSupplierTypeRest.java
index aea17241d2..b14f7649a5 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsSupplierTypeRest.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsSupplierTypeRest.java
@@ -68,9 +68,7 @@ public class PmsSupplierTypeRest {
 	@ApiOperation("新增或修改")
 	@PostMapping("/save")
 	public ResultBean save(@RequestBody PmsSupplierTypeDto dto){
-		ResultBean rb = ResultBean.fireFail();
-		baseSupplierTypeService.saveOrUpdateDto(dto);
-		return rb.success();
+		return baseSupplierTypeService.saveOrUpdateDto(dto);
 	}
 
 	@ApiOperation("根据sid批量删除")
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBill.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBill.java
index c746e0e1f3..5ecc2ffba7 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBill.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBill.java
@@ -26,12 +26,14 @@
 package com.yxt.pms.biz.pms.pmspurchasebackbill;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * Project: yxt-pms(采购) <br/>
@@ -74,9 +76,32 @@ public class PmsPurchasebackBill extends BaseEntity {
     private String arrearsState;
     @ApiModelProperty("单据状态")
     private String documentState;
-	@ApiModelProperty("使用组织sid")
-    private String useOrgSid; // 使用组织sid
-	@ApiModelProperty("创建组织sid")
-    private String createOrgSid; // 创建组织sid
+
+    @ApiModelProperty("申请部门sid")
+    private String deptSid;
+    @ApiModelProperty("申请部门名称")
+    private String deptName;
+    @ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+    @ApiModelProperty("环节定义的sid")
+    private String nodeId; // 环节定义的sid
+    @ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+    @ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+    @ApiModelProperty("任务id")
+    private String taskId; // 任务id
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("办结时间")
+    private Date finishTime; // 办结时间
+
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid;
+    @ApiModelProperty("使用组织名称")
+    private String useOrgName;
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid;
+    @ApiModelProperty("创建组织名称")
+    private String createOrgName;
 
 }
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDetailsVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDetailsVo.java
index c29bc9f642..8ebc1aa5d0 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDetailsVo.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDetailsVo.java
@@ -26,6 +26,7 @@
 package com.yxt.pms.biz.pms.pmspurchasebackbill;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;
 
 import com.yxt.pms.biz.pms.pmspurchasebackdetail.PmsPurchasebackDetailDetailsVo;
@@ -35,6 +36,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -78,10 +80,34 @@ public class PmsPurchasebackBillDetailsVo implements Vo {
     private String deductBillNo; // 抵扣单号
 	@ApiModelProperty("转入预付款")
     private BigDecimal toPrepayment; // 转入预付款
-	@ApiModelProperty("使用组织sid")
-    private String useOrgSid; // 使用组织sid
-	@ApiModelProperty("创建组织sid")
-    private String createOrgSid; // 创建组织sid
+
+    @ApiModelProperty("申请部门sid")
+    private String deptSid;
+    @ApiModelProperty("申请部门名称")
+    private String deptName;
+    @ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+    @ApiModelProperty("环节定义的sid")
+    private String nodeId; // 环节定义的sid
+    @ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+    @ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+    @ApiModelProperty("任务id")
+    private String taskId; // 任务id
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("办结时间")
+    private Date finishTime; // 办结时间
+
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid;
+    @ApiModelProperty("使用组织名称")
+    private String useOrgName;
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid;
+    @ApiModelProperty("创建组织名称")
+    private String createOrgName;
+
     @ApiModelProperty("采购退货单明细")
     private List<PmsPurchasebackDetailDetailsVo> pmsPurchasebackDetailList;
 }
\ No newline at end of file
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDto.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDto.java
index c8c6752bf4..c682afcda0 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDto.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillDto.java
@@ -26,6 +26,7 @@
 package com.yxt.pms.biz.pms.pmspurchasebackbill;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.dto.Dto;
 
 import com.yxt.pms.biz.pms.pmspurchasebackdetail.PmsPurchasebackDetailDto;
@@ -34,6 +35,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -77,10 +79,34 @@ public class PmsPurchasebackBillDto implements Dto {
     private String deductBillNo; // 抵扣单号
 	@ApiModelProperty("转入预付款")
     private BigDecimal toPrepayment; // 转入预付款
-	@ApiModelProperty("使用组织sid")
-    private String useOrgSid; // 使用组织sid
-	@ApiModelProperty("创建组织sid")
-    private String createOrgSid; // 创建组织sid
+
+    @ApiModelProperty("申请部门sid")
+    private String deptSid;
+    @ApiModelProperty("申请部门名称")
+    private String deptName;
+    @ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+    @ApiModelProperty("环节定义的sid")
+    private String nodeId; // 环节定义的sid
+    @ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+    @ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+    @ApiModelProperty("任务id")
+    private String taskId; // 任务id
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("办结时间")
+    private Date finishTime; // 办结时间
+
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid;
+    @ApiModelProperty("使用组织名称")
+    private String useOrgName;
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid;
+    @ApiModelProperty("创建组织名称")
+    private String createOrgName;
+
     @ApiModelProperty("采购退货单明细")
     private List<PmsPurchasebackDetailDto> pmsPurchasebackDetailList;
 
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBill.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBill.java
index 7c4a845f47..2a16e69552 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBill.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBill.java
@@ -66,6 +66,18 @@ public class PmsPurchaseBill extends BaseEntity {
     private String purchaseTypeKey;
 	@ApiModelProperty("采购类型Value（厂家采购、外采、其他）")
     private String purchaseTypeValue;
+
+    @ApiModelProperty("采购原因key")
+    private String purchaseReasonKey;
+    @ApiModelProperty("采购原因（储备/客户订单/在修车辆）")
+    private String purchaseReasonValue;
+    @ApiModelProperty("付款方式key")
+    private String payTypeKey;
+    @ApiModelProperty("付款方式value（预付款/月结/单笔付款）")
+    private String payTypeValue;
+    @ApiModelProperty("误差调整金额")
+    private BigDecimal errorAmount;
+
 	@ApiModelProperty("供应商sid")
     private String supplierSid;
 	@ApiModelProperty("供应商名称")
@@ -88,9 +100,32 @@ public class PmsPurchaseBill extends BaseEntity {
     private BigDecimal discountAmount;
 	@ApiModelProperty("应付金额（=采购金额+运费-优惠金额）")
     private BigDecimal payableAmount;
+
+    @ApiModelProperty("申请部门sid")
+    private String deptSid;
+    @ApiModelProperty("申请部门名称")
+    private String deptName;
+    @ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+    @ApiModelProperty("环节定义的sid")
+    private String nodeId; // 环节定义的sid
+    @ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+    @ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+    @ApiModelProperty("任务id")
+    private String taskId; // 任务id
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("办结时间")
+    private Date finishTime; // 办结时间
+
 	@ApiModelProperty("使用组织sid")
     private String useOrgSid;
+    @ApiModelProperty("使用组织名称")
+    private String useOrgName;
 	@ApiModelProperty("创建组织sid")
     private String createOrgSid;
+    @ApiModelProperty("创建组织名称")
+    private String createOrgName;
 
 }
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDetailsVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDetailsVo.java
index 94654c19df..5e711f11e6 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDetailsVo.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDetailsVo.java
@@ -33,6 +33,9 @@ import com.yxt.pms.biz.pms.pmspurchasebilldetail.PmsPurchaseBillDetailDetailsVo;
 import com.yxt.pms.biz.pms.pmspurchasebilldetail.PmsPurchaseBillDetailDto;
 import com.yxt.pms.biz.pms.pmspurchasebillextend.PmsPurchaseBillExtendDetailsVo;
 import com.yxt.pms.biz.pms.pmspurchasebillextend.PmsPurchaseBillExtendDto;
+import com.yxt.pms.biz.pms.pmspurchasebillinvoice.PmsPurchaseBillInvoiceDto;
+import com.yxt.pms.biz.pms.pmspurchasepay.PmsPurchasePayDetailsVo;
+import com.yxt.pms.biz.pms.pmspurchasepay.PmsPurchasePayDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -76,6 +79,18 @@ public class PmsPurchaseBillDetailsVo implements Vo {
     private String purchaseTypeKey;
 	@ApiModelProperty("采购类型Value（厂家采购、外采、其他）")
     private String purchaseTypeValue;
+
+    @ApiModelProperty("采购原因key")
+    private String purchaseReasonKey;
+    @ApiModelProperty("采购原因（储备/客户订单/在修车辆）")
+    private String purchaseReasonValue;
+    @ApiModelProperty("付款方式key")
+    private String payTypeKey;
+    @ApiModelProperty("付款方式value（预付款/月结/单笔付款）")
+    private String payTypeValue;
+    @ApiModelProperty("误差调整金额")
+    private BigDecimal errorAmount;
+
 	@ApiModelProperty("供应商sid")
     private String supplierSid;
 	@ApiModelProperty("供应商名称")
@@ -98,12 +113,38 @@ public class PmsPurchaseBillDetailsVo implements Vo {
     private BigDecimal discountAmount;
 	@ApiModelProperty("应付金额（=采购金额+运费-优惠金额）")
     private BigDecimal payableAmount;
-	@ApiModelProperty("使用组织sid")
+
+    @ApiModelProperty("申请部门sid")
+    private String deptSid;
+    @ApiModelProperty("申请部门名称")
+    private String deptName;
+    @ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+    @ApiModelProperty("环节定义的sid")
+    private String nodeId; // 环节定义的sid
+    @ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+    @ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+    @ApiModelProperty("任务id")
+    private String taskId; // 任务id
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("办结时间")
+    private Date finishTime; // 办结时间
+
+    @ApiModelProperty("使用组织sid")
     private String useOrgSid;
-	@ApiModelProperty("创建组织sid")
+    @ApiModelProperty("使用组织名称")
+    private String useOrgName;
+    @ApiModelProperty("创建组织sid")
     private String createOrgSid;
+    @ApiModelProperty("创建组织名称")
+    private String createOrgName;
+
+    @ApiModelProperty("付款信息")
+    private PmsPurchasePayDetailsVo purchasePay;
+    @ApiModelProperty("发票信息")
+    private PmsPurchaseBillInvoiceDto purchaseBillInvoice;
     @ApiModelProperty("采购单商品明细")
     private List<PmsPurchaseBillDetailDetailsVo> pmsPurchaseBillDetailList;
-    @ApiModelProperty("采购单扩展")
-    private PmsPurchaseBillExtendDetailsVo pmsPurchaseBillExtend;
 }
\ No newline at end of file
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDto.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDto.java
index d2cf2e575f..1ed10a4295 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDto.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDto.java
@@ -31,6 +31,8 @@ import com.yxt.common.core.dto.Dto;
 
 import com.yxt.pms.biz.pms.pmspurchasebilldetail.PmsPurchaseBillDetailDto;
 import com.yxt.pms.biz.pms.pmspurchasebillextend.PmsPurchaseBillExtendDto;
+import com.yxt.pms.biz.pms.pmspurchasebillinvoice.PmsPurchaseBillInvoiceDto;
+import com.yxt.pms.biz.pms.pmspurchasepay.PmsPurchasePayDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -74,7 +76,19 @@ public class PmsPurchaseBillDto implements Dto {
     private String purchaseTypeKey;
 	@ApiModelProperty("采购类型Value（厂家采购、外采、其他）")
     private String purchaseTypeValue;
-	@ApiModelProperty("供应商sid")
+
+    @ApiModelProperty("采购原因key")
+    private String purchaseReasonKey;
+    @ApiModelProperty("采购原因（储备/客户订单/在修车辆）")
+    private String purchaseReasonValue;
+    @ApiModelProperty("付款方式key")
+    private String payTypeKey;
+    @ApiModelProperty("付款方式value（预付款/月结/单笔付款）")
+    private String payTypeValue;
+    @ApiModelProperty("误差调整金额")
+    private BigDecimal errorAmount;
+
+    @ApiModelProperty("供应商sid")
     private String supplierSid;
 	@ApiModelProperty("供应商名称")
     private String supplierName;
@@ -96,12 +110,38 @@ public class PmsPurchaseBillDto implements Dto {
     private BigDecimal discountAmount;
 	@ApiModelProperty("应付金额（=采购金额+运费-优惠金额）")
     private BigDecimal payableAmount;
-	@ApiModelProperty("使用组织sid")
+
+    @ApiModelProperty("申请部门sid")
+    private String deptSid;
+    @ApiModelProperty("申请部门名称")
+    private String deptName;
+    @ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+    @ApiModelProperty("环节定义的sid")
+    private String nodeId; // 环节定义的sid
+    @ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+    @ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+    @ApiModelProperty("任务id")
+    private String taskId; // 任务id
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("办结时间")
+    private Date finishTime; // 办结时间
+
+    @ApiModelProperty("使用组织sid")
     private String useOrgSid;
-	@ApiModelProperty("创建组织sid")
+    @ApiModelProperty("使用组织名称")
+    private String useOrgName;
+    @ApiModelProperty("创建组织sid")
     private String createOrgSid;
+    @ApiModelProperty("创建组织名称")
+    private String createOrgName;
+
+    @ApiModelProperty("付款信息")
+    private PmsPurchasePayDto purchasePay;
+    @ApiModelProperty("发票信息")
+    private PmsPurchaseBillInvoiceDto purchaseBillInvoice;
     @ApiModelProperty("采购单商品明细")
     private List<PmsPurchaseBillDetailDto> pmsPurchaseBillDetailList;
-    @ApiModelProperty("采购单扩展")
-    private PmsPurchaseBillExtendDto pmsPurchaseBillExtend;
 }
\ No newline at end of file
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.xml b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.xml
index 3ec9ee5bf2..49881c9999 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.xml
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.xml
@@ -5,19 +5,25 @@
 <!--    ${ew.customSqlSegment} -->
 	<select id="selectPageVo" resultType="com.yxt.pms.biz.pms.pmspurchasebill.PmsPurchaseBillVo">
 		SELECT
-		pb.sid,
-		pb.billNo,
-		pb.createTime,
-		pb.createByName,
-		pb.supplierName,
-		pb.supplierPhone,
-		pb.storekeeperName,
-		IF(pb.settleState = 0, '未结算', '已结算') AS settleState,
-		pbs.settleTime
+		ppb.`sid`,
+		ppb.`nodeState`,
+		ppb.`createOrgName`,
+		ppb.`deptName`,
+		ppb.`createTime`,
+		ppb.`finishTime`,
+		ppb.`purchaseTypeValue`,
+		ppb.`purchaseReasonValue`,
+		ppb.`payTypeValue`,
+		ppb.`supplierName`,
+		IF(ppbi.`isInvoicing` = 1, '是','否') AS isInvoicing,
+		COUNT(ppbd.`amount`) AS amount,
+		ppb.`payableAmount`
 		FROM
-		pms_purchase_bill pb
-		LEFT JOIN pms_purchase_bill_settle pbs
-		ON pbs.`billSid` = pb.`sid`
+		pms_purchase_bill ppb
+		LEFT JOIN pms_purchase_bill_invoice ppbi
+		ON ppbi.`billSid` = ppb.`sid`
+		LEFT JOIN pms_purchase_bill_detail ppbd
+		ON ppbd.`billSid` = ppb.`sid`
 		<where> ${ew.sqlSegment} </where>
 	</select>
 	
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillQuery.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillQuery.java
index 3552ec1cad..64b3dec237 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillQuery.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillQuery.java
@@ -26,6 +26,7 @@
 package com.yxt.pms.biz.pms.pmspurchasebill;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.query.Query;
 
 import io.swagger.annotations.ApiModel;
@@ -33,6 +34,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * Project: yxt-pms(采购) <br/>
@@ -51,22 +53,30 @@ import java.math.BigDecimal;
 @ApiModel(value = "采购单 查询条件", description = "采购单 查询条件")
 public class PmsPurchaseBillQuery implements Query {
 
+    @ApiModelProperty("创建组织名称")
+    private String createOrgName;
+    @ApiModelProperty("申请部门名称")
+    private String deptName;
+    @ApiModelProperty("申请人")
+    private String createByName;
+    @ApiModelProperty("单据编号")
+    private String billNo;
     @ApiModelProperty("创建开始日期")
     private String createStartTime;
     @ApiModelProperty("创建结束日期")
     private String createEndTime;
-    @ApiModelProperty("门店sid")
-    private String createOrgSid;
-    @ApiModelProperty("票据类型key")
-    private String billTypeKey;
-    @ApiModelProperty("供应商sid")
-    private String supplierSid;
-    @ApiModelProperty("结算状态(0未结算,1已结算)")
-    private String settleState;
-    @ApiModelProperty("欠款状态(0欠款,1未欠款)")
-    private String arrearsState;
-    @ApiModelProperty("单据状态(0未作废,1已作废)")
-    private String documentState;
-    @ApiModelProperty("其他查询条件")
-    private String otherQuery;
+    @ApiModelProperty("办结开始日期")
+    private String finishStartTime;
+    @ApiModelProperty("办结结束日期")
+    private String finishEndTime;
+    @ApiModelProperty("采购类型Value（厂家采购、外采、其他）")
+    private String purchaseTypeValue;
+    @ApiModelProperty("采购原因（储备/客户订单/在修车辆）")
+    private String purchaseReasonValue;
+    @ApiModelProperty("付款方式value（预付款/月结/单笔付款）")
+    private String payTypeValue;
+    @ApiModelProperty("供应商名称")
+    private String supplierName;
+    @ApiModelProperty("是否需要开发票（是1，否0）")
+    private String isInvoicing;
 }
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java
index 160152bc9d..56d3452564 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java
@@ -35,6 +35,10 @@ import com.yxt.pms.biz.pms.pmspurchasebilldetail.PmsPurchaseBillDetailService;
 import com.yxt.pms.biz.pms.pmspurchasebillextend.PmsPurchaseBillExtendDetailsVo;
 import com.yxt.pms.biz.pms.pmspurchasebillextend.PmsPurchaseBillExtendDto;
 import com.yxt.pms.biz.pms.pmspurchasebillextend.PmsPurchaseBillExtendService;
+import com.yxt.pms.biz.pms.pmspurchasebillinvoice.PmsPurchaseBillInvoiceDto;
+import com.yxt.pms.biz.pms.pmspurchasebillinvoice.PmsPurchaseBillInvoiceService;
+import com.yxt.pms.biz.pms.pmspurchasepay.PmsPurchasePayDto;
+import com.yxt.pms.biz.pms.pmspurchasepay.PmsPurchasePayService;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -67,36 +71,49 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
 	@Autowired
 	private PmsPurchaseBillDetailService pmsPurchaseBillDetailService;
 	@Autowired
-	private PmsPurchaseBillExtendService pmsPurchaseBillExtendService;
+	private PmsPurchaseBillInvoiceService pmsPurchaseBillInvoiceService;
+	@Autowired
+	private PmsPurchasePayService pmsPurchasePayService;
 
 	public PagerVo<PmsPurchaseBillVo> listPageVo(PagerQuery<PmsPurchaseBillQuery> pq) {
 		PmsPurchaseBillQuery query = pq.getParams();
 		QueryWrapper<PmsPurchaseBill> qw = new QueryWrapper<>();
-		if (StringUtils.isNotBlank(query.getCreateOrgSid())){
-			qw.eq("pb.createOrgSid",query.getCreateOrgSid());
+		if (StringUtils.isNotBlank(query.getCreateOrgName())){
+			qw.like("ppb.createOrgSid",query.getCreateOrgName());
+		}
+		if (StringUtils.isNotBlank(query.getDeptName())){
+			qw.like("ppb.deptName",query.getDeptName());
 		}
-		if (StringUtils.isNotBlank(query.getBillTypeKey())){
-			qw.eq("pb.billTypeKey",query.getBillTypeKey());
+		if (StringUtils.isNotBlank(query.getCreateByName())){
+			qw.like("ppb.createByName",query.getCreateByName());
 		}
-		if (StringUtils.isNotBlank(query.getSupplierSid())){
-			qw.eq("pb.supplierSid",query.getSupplierSid());
+		if (StringUtils.isNotBlank(query.getBillNo())){
+			qw.like("ppb.billNo",query.getBillNo());
 		}
-		if (StringUtils.isNotBlank(query.getSettleState())){
-			qw.eq("pb.settleState",query.getSettleState());
+		if (StringUtils.isNotBlank(query.getPurchaseTypeValue())){
+			qw.like("ppb.purchaseTypeValue",query.getPurchaseTypeValue());
 		}
-		if (StringUtils.isNotBlank(query.getArrearsState())){
-			qw.eq("pb.arrearsState",query.getArrearsState());
+		if (StringUtils.isNotBlank(query.getPurchaseReasonValue())){
+			qw.like("ppb.purchaseReasonValue",query.getPurchaseReasonValue());
 		}
-		if (StringUtils.isNotBlank(query.getDocumentState())){
-			qw.eq("pb.documentState",query.getDocumentState());
+		if (StringUtils.isNotBlank(query.getPayTypeValue())){
+			qw.like("ppb.payTypeValue",query.getPayTypeValue());
 		}
-		if (StringUtils.isNotBlank(query.getOtherQuery())){
-			qw.and(wrapper -> wrapper.like("pb.billNo", query.getOtherQuery()).or().like("pb.supplierPhone", query.getOtherQuery()).or().like("pb.remarks",query.getOtherQuery()));
+		if (StringUtils.isNotBlank(query.getSupplierName())){
+			qw.like("ppb.supplierName",query.getSupplierName());
+		}
+		if (StringUtils.isNotBlank(query.getIsInvoicing())){
+			qw.eq("ppbi.isInvoicing",query.getIsInvoicing());
 		}
 		String createStartTime = query.getCreateStartTime();
 		String createEndTime = query.getCreateEndTime();
-		qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (pb.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
-				apply(StringUtils.isNotEmpty(createEndTime), "date_format (pb.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
+		qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (ppb.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
+				apply(StringUtils.isNotEmpty(createEndTime), "date_format (ppb.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
+				);
+		String finishStartTime = query.getFinishStartTime();
+		String finishEndTime = query.getFinishEndTime();
+		qw.apply(StringUtils.isNotEmpty(finishStartTime), "date_format (ppb.finishTime,'%Y-%m-%d') >= date_format('" + finishStartTime + "','%Y-%m-%d')").
+				apply(StringUtils.isNotEmpty(finishEndTime), "date_format (ppb.finishTime,'%Y-%m-%d') <= date_format('" + finishEndTime + "','%Y-%m-%d')"
 				);
 		IPage<PmsPurchaseBill> page = PagerUtil.queryToPage(pq);
 		IPage<PmsPurchaseBillVo> pagging = baseMapper.selectPageVo(page, qw);
@@ -106,27 +123,33 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
 
 	public String saveOrUpdateDto(PmsPurchaseBillDto dto){
         String dtoSid = dto.getSid();
+		PmsPurchasePayDto purchasePay = dto.getPurchasePay();
+		PmsPurchaseBillInvoiceDto purchaseBillInvoice = dto.getPurchaseBillInvoice();
 		List<PmsPurchaseBillDetailDto> pmsPurchaseBillDetailList = dto.getPmsPurchaseBillDetailList();
-		PmsPurchaseBillExtendDto pmsPurchaseBillExtend = dto.getPmsPurchaseBillExtend();
 		if (StringUtils.isBlank(dtoSid)) {
 			String sid = this.insertByDto(dto);
+			purchasePay.setBillSid(sid);
+			pmsPurchasePayService.saveOrUpdateDto(purchasePay);
+			purchaseBillInvoice.setBillSid(sid);
+			pmsPurchaseBillInvoiceService.saveOrUpdateDto(purchaseBillInvoice);
 			for (PmsPurchaseBillDetailDto pmsPurchaseBillDetailDto : pmsPurchaseBillDetailList) {
 				pmsPurchaseBillDetailDto.setBillSid(sid);
 				pmsPurchaseBillDetailService.saveOrUpdateDto(pmsPurchaseBillDetailDto);
 			}
-			pmsPurchaseBillExtend.setPurchaseBillSid(sid);
-			pmsPurchaseBillExtendService.saveOrUpdateDto(pmsPurchaseBillExtend);
             return sid;
         }
 		this.updateByDto(dto);
 		pmsPurchaseBillDetailService.delByMainSid(dtoSid);
-		pmsPurchaseBillExtendService.delByMainSid(dtoSid);
+		pmsPurchasePayService.delByMainSid(dtoSid);
+		pmsPurchaseBillInvoiceService.delByMainSid(dtoSid);
+		purchasePay.setBillSid(dtoSid);
+		pmsPurchasePayService.saveOrUpdateDto(purchasePay);
+		purchaseBillInvoice.setBillSid(dtoSid);
+		pmsPurchaseBillInvoiceService.saveOrUpdateDto(purchaseBillInvoice);
 		for (PmsPurchaseBillDetailDto pmsPurchaseBillDetailDto : pmsPurchaseBillDetailList) {
 			pmsPurchaseBillDetailDto.setBillSid(dtoSid);
 			pmsPurchaseBillDetailService.saveOrUpdateDto(pmsPurchaseBillDetailDto);
 		}
-		pmsPurchaseBillExtend.setPurchaseBillSid(dtoSid);
-		pmsPurchaseBillExtendService.saveOrUpdateDto(pmsPurchaseBillExtend);
 		return dtoSid;
 	}
 
@@ -153,8 +176,6 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
 		BeanUtil.copyProperties(entity, vo);
 		List<PmsPurchaseBillDetailDetailsVo> pmsPurchaseBillDetailDetailsVos = pmsPurchaseBillDetailService.selByMainSid(sid);
 		vo.setPmsPurchaseBillDetailList(pmsPurchaseBillDetailDetailsVos);
-		PmsPurchaseBillExtendDetailsVo pmsPurchaseBillExtendDetailsVo = pmsPurchaseBillExtendService.selByMainSid(sid);
-		vo.setPmsPurchaseBillExtend(pmsPurchaseBillExtendDetailsVo);
 		return vo;
 	}
 
@@ -162,7 +183,6 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
 		delBySids(sids);
 		for (String sid : sids) {
 			pmsPurchaseBillDetailService.delByMainSid(sid);
-			pmsPurchaseBillExtendService.delByMainSid(sid);
 		}
 	}
 
@@ -173,31 +193,42 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
 	public List<PmsPurchaseBillExportVo> listExcel(PmsPurchaseBillQuery query) {
 		QueryWrapper<PmsPurchaseBillExportVo> qw = new QueryWrapper<>();
 		if (query != null) {
-			if (StringUtils.isNotBlank(query.getCreateOrgSid())){
-				qw.eq("pb.createOrgSid",query.getCreateOrgSid());
+			if (StringUtils.isNotBlank(query.getCreateOrgName())){
+				qw.like("ppb.createOrgSid",query.getCreateOrgName());
 			}
-			if (StringUtils.isNotBlank(query.getBillTypeKey())){
-				qw.eq("pb.billTypeKey",query.getBillTypeKey());
+			if (StringUtils.isNotBlank(query.getDeptName())){
+				qw.like("ppb.deptName",query.getDeptName());
 			}
-			if (StringUtils.isNotBlank(query.getSupplierSid())){
-				qw.eq("pb.supplierSid",query.getSupplierSid());
+			if (StringUtils.isNotBlank(query.getCreateByName())){
+				qw.like("ppb.createByName",query.getCreateByName());
 			}
-			if (StringUtils.isNotBlank(query.getSettleState())){
-				qw.eq("pb.settleState",query.getSettleState());
+			if (StringUtils.isNotBlank(query.getBillNo())){
+				qw.like("ppb.billNo",query.getBillNo());
 			}
-			if (StringUtils.isNotBlank(query.getArrearsState())){
-				qw.eq("pb.arrearsState",query.getArrearsState());
+			if (StringUtils.isNotBlank(query.getPurchaseTypeValue())){
+				qw.like("ppb.purchaseTypeValue",query.getPurchaseTypeValue());
 			}
-			if (StringUtils.isNotBlank(query.getDocumentState())){
-				qw.eq("pb.documentState",query.getDocumentState());
+			if (StringUtils.isNotBlank(query.getPurchaseReasonValue())){
+				qw.like("ppb.purchaseReasonValue",query.getPurchaseReasonValue());
 			}
-			if (StringUtils.isNotBlank(query.getOtherQuery())){
-				qw.and(wrapper -> wrapper.like("pb.billNo", query.getOtherQuery()).or().like("pb.supplierPhone", query.getOtherQuery()).or().like("pb.remarks",query.getOtherQuery()));
+			if (StringUtils.isNotBlank(query.getPayTypeValue())){
+				qw.like("ppb.payTypeValue",query.getPayTypeValue());
+			}
+			if (StringUtils.isNotBlank(query.getSupplierName())){
+				qw.like("ppb.supplierName",query.getSupplierName());
+			}
+			if (StringUtils.isNotBlank(query.getIsInvoicing())){
+				qw.eq("ppbi.isInvoicing",query.getIsInvoicing());
 			}
 			String createStartTime = query.getCreateStartTime();
 			String createEndTime = query.getCreateEndTime();
-			qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (pb.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
-					apply(StringUtils.isNotEmpty(createEndTime), "date_format (pb.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
+			qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (ppb.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
+					apply(StringUtils.isNotEmpty(createEndTime), "date_format (ppb.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
+					);
+			String finishStartTime = query.getFinishStartTime();
+			String finishEndTime = query.getFinishEndTime();
+			qw.apply(StringUtils.isNotEmpty(finishStartTime), "date_format (ppb.finishTime,'%Y-%m-%d') >= date_format('" + finishStartTime + "','%Y-%m-%d')").
+					apply(StringUtils.isNotEmpty(finishEndTime), "date_format (ppb.finishTime,'%Y-%m-%d') <= date_format('" + finishEndTime + "','%Y-%m-%d')"
 					);
 		}
 		List<PmsPurchaseBillExportVo> exportVoList = baseMapper.exportList(qw);
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillVo.java
index dbd1504259..565849118d 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillVo.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillVo.java
@@ -55,22 +55,32 @@ public class PmsPurchaseBillVo implements Vo {
 
     private String sid; // sid
 
+    @ApiModelProperty("流程状态")
+    private String nodeState;
     @ApiModelProperty("单据编号")
     private String billNo;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("创建组织名称")
+    private String createOrgName;
+    @ApiModelProperty("申请部门名称")
+    private String deptName;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     @ApiModelProperty("创建时间")
     private Date createTime;
-	@ApiModelProperty("制单人姓名")
-    private String createByName;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @ApiModelProperty("办结时间")
+    private Date finishTime;
+    @ApiModelProperty("采购类型Value（厂家采购、外采、其他）")
+    private String purchaseTypeValue;
+    @ApiModelProperty("采购原因（储备/客户订单/在修车辆）")
+    private String purchaseReasonValue;
+    @ApiModelProperty("付款方式value（预付款/月结/单笔付款）")
+    private String payTypeValue;
     @ApiModelProperty("供应商名称")
     private String supplierName;
-    @ApiModelProperty("供应商联系电话")
-    private String supplierPhone;
-    @ApiModelProperty("库管员姓名")
-    private String storekeeperName;
-    @ApiModelProperty("结算标志")
-    private String settleState;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @ApiModelProperty("结算时间")
-    private Date settleTime;
+    @ApiModelProperty("是否需要开发票（是1，否0）")
+    private String isInvoicing;
+    @ApiModelProperty("采购金额合计")
+    private BigDecimal amountCount;
+    @ApiModelProperty("应付金额（=采购金额+运费-优惠金额）")
+    private BigDecimal payableAmount;
 }
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetail.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetail.java
index 31ab513f7a..cfb597bee0 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetail.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetail.java
@@ -92,9 +92,4 @@ public class PmsPurchaseBillDetail extends BaseEntity {
     private BigDecimal taxPrice; // 含税价
 	@ApiModelProperty("采购金额")
     private BigDecimal amount; // 采购金额
-	@ApiModelProperty("销售单价")
-    private BigDecimal salesPrice; // 销售单价
-	@ApiModelProperty("最低零售价")
-    private BigDecimal minimumSalesPrice; // 最低零售价
-
 }
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailDetailsVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailDetailsVo.java
index 1a35a5121b..914ac0e1c3 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailDetailsVo.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailDetailsVo.java
@@ -91,9 +91,4 @@ public class PmsPurchaseBillDetailDetailsVo implements Vo {
     private BigDecimal taxPrice; // 含税价
 	@ApiModelProperty("采购金额")
     private BigDecimal amount; // 采购金额
-	@ApiModelProperty("销售单价")
-    private BigDecimal salesPrice; // 销售单价
-	@ApiModelProperty("最低零售价")
-    private BigDecimal minimumSalesPrice; // 最低零售价
-
 }
\ No newline at end of file
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailDto.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailDto.java
index 529da00155..41edebe01f 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailDto.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailDto.java
@@ -91,9 +91,4 @@ public class PmsPurchaseBillDetailDto implements Dto {
     private BigDecimal taxPrice; // 含税价
 	@ApiModelProperty("采购金额")
     private BigDecimal amount; // 采购金额
-	@ApiModelProperty("销售单价")
-    private BigDecimal salesPrice; // 销售单价
-	@ApiModelProperty("最低零售价")
-    private BigDecimal minimumSalesPrice; // 最低零售价
-
 }
\ No newline at end of file
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailQuery.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailQuery.java
index 4d4077c76d..35d2a7e587 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailQuery.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailQuery.java
@@ -91,9 +91,4 @@ public class PmsPurchaseBillDetailQuery implements Query {
     private BigDecimal taxPrice; // 含税价
 	@ApiModelProperty("采购金额")
     private BigDecimal amount; // 采购金额
-	@ApiModelProperty("销售单价")
-    private BigDecimal salesPrice; // 销售单价
-	@ApiModelProperty("最低零售价")
-    private BigDecimal minimumSalesPrice; // 最低零售价
-
 }
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailVo.java
index 74f1b7f425..c545ea93f4 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailVo.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailVo.java
@@ -93,9 +93,5 @@ public class PmsPurchaseBillDetailVo implements Vo {
     private BigDecimal taxPrice; // 含税价
 	@ApiModelProperty("采购金额")
     private BigDecimal amount; // 采购金额
-	@ApiModelProperty("销售单价")
-    private BigDecimal salesPrice; // 销售单价
-	@ApiModelProperty("最低零售价")
-    private BigDecimal minimumSalesPrice; // 最低零售价
 
 }
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtend.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtend.java
index 896e1c5a54..ad63b0511e 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtend.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtend.java
@@ -64,8 +64,6 @@ public class PmsPurchaseBillExtend extends BaseEntity {
     private String priceStrategy; // 进价不同时的价格策略（加权平均、分别计价）
 	@ApiModelProperty("临时加价率")
     private Integer tempMarkupRate; // 临时加价率
-	@ApiModelProperty("误差调整金额")
-    private BigDecimal errorAmount; // 误差调整金额
 	@ApiModelProperty("发货人姓名")
     private String shipperName; // 发货人姓名
 	@ApiModelProperty("发货人手机")
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtendDetailsVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtendDetailsVo.java
index be5a05d964..eef8400fdb 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtendDetailsVo.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtendDetailsVo.java
@@ -65,8 +65,6 @@ public class PmsPurchaseBillExtendDetailsVo implements Vo {
     private String priceStrategy; // 进价不同时的价格策略（加权平均、分别计价）
 	@ApiModelProperty("临时加价率")
     private Integer tempMarkupRate; // 临时加价率
-	@ApiModelProperty("误差调整金额")
-    private BigDecimal errorAmount; // 误差调整金额
 	@ApiModelProperty("发货人姓名")
     private String shipperName; // 发货人姓名
 	@ApiModelProperty("发货人手机")
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtendDto.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtendDto.java
index 69ac54d7f3..31dda42ec1 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtendDto.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtendDto.java
@@ -65,8 +65,6 @@ public class PmsPurchaseBillExtendDto implements Dto {
     private String priceStrategy; // 进价不同时的价格策略（加权平均、分别计价）
 	@ApiModelProperty("临时加价率")
     private Integer tempMarkupRate; // 临时加价率
-	@ApiModelProperty("误差调整金额")
-    private BigDecimal errorAmount; // 误差调整金额
 	@ApiModelProperty("发货人姓名")
     private String shipperName; // 发货人姓名
 	@ApiModelProperty("发货人手机")
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtendQuery.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtendQuery.java
index 44fc863bf3..e0838c00ad 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtendQuery.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtendQuery.java
@@ -63,8 +63,6 @@ public class PmsPurchaseBillExtendQuery implements Query {
     private String priceStrategy; // 进价不同时的价格策略（加权平均、分别计价）
 	@ApiModelProperty("临时加价率")
     private Integer tempMarkupRate; // 临时加价率
-	@ApiModelProperty("误差调整金额")
-    private BigDecimal errorAmount; // 误差调整金额
 	@ApiModelProperty("发货人姓名")
     private String shipperName; // 发货人姓名
 	@ApiModelProperty("发货人手机")
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtendVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtendVo.java
index fef51e2088..1c5cbb5cbe 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtendVo.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillextend/PmsPurchaseBillExtendVo.java
@@ -65,8 +65,6 @@ public class PmsPurchaseBillExtendVo implements Vo {
     private String priceStrategy; // 进价不同时的价格策略（加权平均、分别计价）
 	@ApiModelProperty("临时加价率")
     private Integer tempMarkupRate; // 临时加价率
-	@ApiModelProperty("误差调整金额")
-    private BigDecimal errorAmount; // 误差调整金额
 	@ApiModelProperty("发货人姓名")
     private String shipperName; // 发货人姓名
 	@ApiModelProperty("发货人手机")
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoice.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoice.java
new file mode 100644
index 0000000000..3ffc2d78c5
--- /dev/null
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoice.java
@@ -0,0 +1,81 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.pms.biz.pms.pmspurchasebillinvoice;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-pms(采购发票) <br/>
+ * File: PmsPurchaseBillInvoice.java <br/>
+ * Class: com.yxt.pms.api.pmspurchasebillinvoice.PmsPurchaseBillInvoice <br/>
+ * Description: 采购单-发票. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-05-08 09:51:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购单-发票", description = "采购单-发票")
+@TableName("pms_purchase_bill_invoice")
+public class PmsPurchaseBillInvoice extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("制单人姓名")
+    private String createByName; // 制单人姓名
+	@ApiModelProperty("单据sid")
+    private String billSid; // 单据sid
+	@ApiModelProperty("是否需要开发票（是1，否0）")
+    private Integer isInvoicing; // 是否需要开发票（是1，否0）
+	@ApiModelProperty("票据类型key")
+    private String billTypeKey; // 票据类型key
+	@ApiModelProperty("票据类型(不含税、增值税、普通税、已含增值税)")
+    private String billType; // 票据类型(不含税、增值税、普通税、已含增值税)
+	@ApiModelProperty("开票名称")
+    private String invoicingName; // 开票名称
+	@ApiModelProperty("税号")
+    private String taxpayerNo; // 税号
+	@ApiModelProperty("发票代码")
+    private String invoiceCode; // 发票代码
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("开票日期")
+    private Date invoiceDate; // 开票日期
+	@ApiModelProperty("发票金额")
+    private BigDecimal invoiceAmount; // 发票金额
+	@ApiModelProperty("税率")
+    private BigDecimal taxRate; // 税率
+
+}
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceDetailsVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceDetailsVo.java
new file mode 100644
index 0000000000..4714f83f56
--- /dev/null
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceDetailsVo.java
@@ -0,0 +1,82 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.pms.biz.pms.pmspurchasebillinvoice;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-pms(采购发票) <br/>
+ * File: PmsPurchaseBillInvoiceVo.java <br/>
+ * Class: com.yxt.pms.api.pmspurchasebillinvoice.PmsPurchaseBillInvoiceVo <br/>
+ * Description: 采购单-发票 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-05-08 09:51:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购单-发票 视图数据详情", description = "采购单-发票 视图数据详情")
+public class PmsPurchaseBillInvoiceDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("制单人姓名")
+    private String createByName; // 制单人姓名
+	@ApiModelProperty("单据sid")
+    private String billSid; // 单据sid
+	@ApiModelProperty("是否需要开发票（是1，否0）")
+    private Integer isInvoicing; // 是否需要开发票（是1，否0）
+	@ApiModelProperty("票据类型key")
+    private String billTypeKey; // 票据类型key
+	@ApiModelProperty("票据类型(不含税、增值税、普通税、已含增值税)")
+    private String billType; // 票据类型(不含税、增值税、普通税、已含增值税)
+	@ApiModelProperty("开票名称")
+    private String invoicingName; // 开票名称
+	@ApiModelProperty("税号")
+    private String taxpayerNo; // 税号
+	@ApiModelProperty("发票代码")
+    private String invoiceCode; // 发票代码
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("开票日期")
+    private Date invoiceDate; // 开票日期
+	@ApiModelProperty("发票金额")
+    private BigDecimal invoiceAmount; // 发票金额
+	@ApiModelProperty("税率")
+    private BigDecimal taxRate; // 税率
+
+}
\ No newline at end of file
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceDto.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceDto.java
new file mode 100644
index 0000000000..9317ba14cd
--- /dev/null
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceDto.java
@@ -0,0 +1,82 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.pms.biz.pms.pmspurchasebillinvoice;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-pms(采购发票) <br/>
+ * File: PmsPurchaseBillInvoiceDto.java <br/>
+ * Class: com.yxt.pms.api.pmspurchasebillinvoice.PmsPurchaseBillInvoiceDto <br/>
+ * Description: 采购单-发票 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-05-08 09:51:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购单-发票 数据传输对象", description = "采购单-发票 数据传输对象")
+public class PmsPurchaseBillInvoiceDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("制单人姓名")
+    private String createByName; // 制单人姓名
+	@ApiModelProperty("单据sid")
+    private String billSid; // 单据sid
+	@ApiModelProperty("是否需要开发票（是1，否0）")
+    private Integer isInvoicing; // 是否需要开发票（是1，否0）
+	@ApiModelProperty("票据类型key")
+    private String billTypeKey; // 票据类型key
+	@ApiModelProperty("票据类型(不含税、增值税、普通税、已含增值税)")
+    private String billType; // 票据类型(不含税、增值税、普通税、已含增值税)
+	@ApiModelProperty("开票名称")
+    private String invoicingName; // 开票名称
+	@ApiModelProperty("税号")
+    private String taxpayerNo; // 税号
+	@ApiModelProperty("发票代码")
+    private String invoiceCode; // 发票代码
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("开票日期")
+    private Date invoiceDate; // 开票日期
+	@ApiModelProperty("发票金额")
+    private BigDecimal invoiceAmount; // 发票金额
+	@ApiModelProperty("税率")
+    private BigDecimal taxRate; // 税率
+
+}
\ No newline at end of file
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceMapper.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceMapper.java
new file mode 100644
index 0000000000..4c1c1e2bb5
--- /dev/null
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceMapper.java
@@ -0,0 +1,64 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.pms.biz.pms.pmspurchasebillinvoice;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * Project: yxt-pms(采购发票) <br/>
+ * File: PmsPurchaseBillInvoiceMapper.java <br/>
+ * Class: com.yxt.pms.biz.pmspurchasebillinvoice.PmsPurchaseBillInvoiceMapper <br/>
+ * Description: 采购单-发票. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-05-08 09:51:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface PmsPurchaseBillInvoiceMapper extends BaseMapper<PmsPurchaseBillInvoice> {
+
+	IPage<PmsPurchaseBillInvoiceVo> selectPageVo(IPage<PmsPurchaseBillInvoice> page, @Param(Constants.WRAPPER) Wrapper<PmsPurchaseBillInvoice> qw);
+	
+	List<PmsPurchaseBillInvoiceVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<PmsPurchaseBillInvoice> qw);
+	
+	@Select("select * from pms_purchase_bill_invoice")
+	List<PmsPurchaseBillInvoiceVo> selectListVo();
+
+	@Delete("delete from pms_purchase_bill_invoice where billSid = #{dtoSid}")
+    void delByMainSid(String dtoSid);
+}
\ No newline at end of file
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceMapper.xml b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceMapper.xml
new file mode 100644
index 0000000000..d96db5e95e
--- /dev/null
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceMapper.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.pms.biz.pms.pmspurchasebillinvoice.PmsPurchaseBillInvoiceMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.pms.biz.pms.pmspurchasebillinvoice.PmsPurchaseBillInvoiceVo">
+		SELECT * FROM pms_purchase_bill_invoice <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.pms.biz.pms.pmspurchasebillinvoice.PmsPurchaseBillInvoiceVo">
+		SELECT * FROM pms_purchase_bill_invoice <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>
\ No newline at end of file
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceQuery.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceQuery.java
new file mode 100644
index 0000000000..76b988b306
--- /dev/null
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceQuery.java
@@ -0,0 +1,81 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.pms.biz.pms.pmspurchasebillinvoice;
+
+
+import com.yxt.common.core.query.Query;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-pms(采购发票) <br/>
+ * File: PmsPurchaseBillInvoiceQuery.java <br/>
+ * Class: com.yxt.pms.api.pmspurchasebillinvoice.PmsPurchaseBillInvoiceQuery <br/>
+ * Description: 采购单-发票 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-05-08 09:51:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购单-发票 查询条件", description = "采购单-发票 查询条件")
+public class PmsPurchaseBillInvoiceQuery implements Query {
+
+	@ApiModelProperty("制单人姓名")
+    private String createByName; // 制单人姓名
+	@ApiModelProperty("单据sid")
+    private String billSid; // 单据sid
+	@ApiModelProperty("是否需要开发票（是1，否0）")
+    private Integer isInvoicing; // 是否需要开发票（是1，否0）
+	@ApiModelProperty("票据类型key")
+    private String billTypeKey; // 票据类型key
+	@ApiModelProperty("票据类型(不含税、增值税、普通税、已含增值税)")
+    private String billType; // 票据类型(不含税、增值税、普通税、已含增值税)
+	@ApiModelProperty("开票名称")
+    private String invoicingName; // 开票名称
+	@ApiModelProperty("税号")
+    private String taxpayerNo; // 税号
+	@ApiModelProperty("发票代码")
+    private String invoiceCode; // 发票代码
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("开票日期")
+    private Date invoiceDateStart; // 开票日期
+    private Date invoiceDateEnd; // 开票日期
+	@ApiModelProperty("发票金额")
+    private BigDecimal invoiceAmount; // 发票金额
+	@ApiModelProperty("税率")
+    private BigDecimal taxRate; // 税率
+
+}
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceService.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceService.java
new file mode 100644
index 0000000000..5712c1b7f4
--- /dev/null
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceService.java
@@ -0,0 +1,106 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.pms.biz.pms.pmspurchasebillinvoice;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.vo.PagerVo;
+
+import org.springframework.stereotype.Service;
+
+
+/**
+ * Project: yxt-pms(采购发票) <br/>
+ * File: PmsPurchaseBillInvoiceService.java <br/>
+ * Class: com.yxt.pms.biz.pmspurchasebillinvoice.PmsPurchaseBillInvoiceService <br/>
+ * Description: 采购单-发票 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-05-08 09:51:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class PmsPurchaseBillInvoiceService extends MybatisBaseService<PmsPurchaseBillInvoiceMapper, PmsPurchaseBillInvoice> {
+	private QueryWrapper<PmsPurchaseBillInvoice> createQueryWrapper(PmsPurchaseBillInvoiceQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<PmsPurchaseBillInvoice> qw = new QueryWrapper<>();
+		return qw;
+	}
+	
+	public PagerVo<PmsPurchaseBillInvoiceVo> listPageVo(PagerQuery<PmsPurchaseBillInvoiceQuery> pq) {
+		PmsPurchaseBillInvoiceQuery query = pq.getParams();
+		QueryWrapper<PmsPurchaseBillInvoice> qw = createQueryWrapper(query);
+		IPage<PmsPurchaseBillInvoice> page = PagerUtil.queryToPage(pq);
+		IPage<PmsPurchaseBillInvoiceVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<PmsPurchaseBillInvoiceVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public void saveOrUpdateDto(PmsPurchaseBillInvoiceDto dto){
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return; 
+        } 
+		this.updateByDto(dto);
+	}
+	
+	public void insertByDto(PmsPurchaseBillInvoiceDto dto){
+		PmsPurchaseBillInvoice entity = new PmsPurchaseBillInvoice();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public void updateByDto(PmsPurchaseBillInvoiceDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		PmsPurchaseBillInvoice entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public PmsPurchaseBillInvoiceDetailsVo fetchDetailsVoBySid(String sid){
+		PmsPurchaseBillInvoice entity = fetchBySid(sid);
+		PmsPurchaseBillInvoiceDetailsVo vo = new PmsPurchaseBillInvoiceDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+
+	public void delByMainSid(String dtoSid) {
+		baseMapper.delByMainSid(dtoSid);
+	}
+}
\ No newline at end of file
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceVo.java
new file mode 100644
index 0000000000..814da338ab
--- /dev/null
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceVo.java
@@ -0,0 +1,82 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.pms.biz.pms.pmspurchasebillinvoice;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-pms(采购发票) <br/>
+ * File: PmsPurchaseBillInvoiceVo.java <br/>
+ * Class: com.yxt.pms.api.pmspurchasebillinvoice.PmsPurchaseBillInvoiceVo <br/>
+ * Description: 采购单-发票 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-05-08 09:51:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购单-发票 视图数据对象", description = "采购单-发票 视图数据对象")
+public class PmsPurchaseBillInvoiceVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("制单人姓名")
+    private String createByName; // 制单人姓名
+	@ApiModelProperty("单据sid")
+    private String billSid; // 单据sid
+	@ApiModelProperty("是否需要开发票（是1，否0）")
+    private Integer isInvoicing; // 是否需要开发票（是1，否0）
+	@ApiModelProperty("票据类型key")
+    private String billTypeKey; // 票据类型key
+	@ApiModelProperty("票据类型(不含税、增值税、普通税、已含增值税)")
+    private String billType; // 票据类型(不含税、增值税、普通税、已含增值税)
+	@ApiModelProperty("开票名称")
+    private String invoicingName; // 开票名称
+	@ApiModelProperty("税号")
+    private String taxpayerNo; // 税号
+	@ApiModelProperty("发票代码")
+    private String invoiceCode; // 发票代码
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("开票日期")
+    private Date invoiceDate; // 开票日期
+	@ApiModelProperty("发票金额")
+    private BigDecimal invoiceAmount; // 发票金额
+	@ApiModelProperty("税率")
+    private BigDecimal taxRate; // 税率
+
+}
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePay.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePay.java
new file mode 100644
index 0000000000..0b92949955
--- /dev/null
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePay.java
@@ -0,0 +1,80 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.pms.biz.pms.pmspurchasepay;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: yxt-pms(采购) <br/>
+ * File: PmsPurchasePay.java <br/>
+ * Class: com.yxt.pms.api.pmspurchasepay.PmsPurchasePay <br/>
+ * Description: 付款说明. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-05-06 15:43:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "付款说明", description = "付款说明")
+@TableName("pms_purchase_pay")
+public class PmsPurchasePay extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("制单人姓名")
+    private String createByName; // 制单人姓名
+	@ApiModelProperty("单据sid")
+    private String billSid; // 单据sid
+	@ApiModelProperty("是否先付货款 0否，1是")
+    private String isFirstPay; // 是否先付货款 0否，1是
+	@ApiModelProperty("订金")
+    private BigDecimal deposit; // 订金
+	@ApiModelProperty("货款")
+    private BigDecimal goodsMoney; // 货款
+	@ApiModelProperty("收款账户")
+    private String accountName; // 收款账户
+	@ApiModelProperty("开户行")
+    private String bankName; // 开户行
+	@ApiModelProperty("收款账号")
+    private String bankAccount; // 收款账号
+	@ApiModelProperty("其他费用名称")
+    private String otherAmountName; // 其他费用名称
+	@ApiModelProperty("其他费用金额")
+    private BigDecimal otherAmount; // 其他费用金额
+	@ApiModelProperty("付款备注")
+    private String payRemark; // 付款备注
+	@ApiModelProperty("附件")
+    private String filePath; // 附件
+
+}
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayDetailsVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayDetailsVo.java
new file mode 100644
index 0000000000..a1923c492f
--- /dev/null
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayDetailsVo.java
@@ -0,0 +1,82 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.pms.biz.pms.pmspurchasepay;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * Project: yxt-pms(采购) <br/>
+ * File: PmsPurchasePayVo.java <br/>
+ * Class: com.yxt.pms.api.pmspurchasepay.PmsPurchasePayVo <br/>
+ * Description: 付款说明 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-05-06 15:43:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "付款说明 视图数据详情", description = "付款说明 视图数据详情")
+public class PmsPurchasePayDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("制单人姓名")
+    private String createByName; // 制单人姓名
+	@ApiModelProperty("单据sid")
+    private String billSid; // 单据sid
+	@ApiModelProperty("是否先付货款 0否，1是")
+    private String isFirstPay; // 是否先付货款 0否，1是
+	@ApiModelProperty("订金")
+    private BigDecimal deposit; // 订金
+	@ApiModelProperty("货款")
+    private BigDecimal goodsMoney; // 货款
+	@ApiModelProperty("收款账户")
+    private String accountName; // 收款账户
+	@ApiModelProperty("开户行")
+    private String bankName; // 开户行
+	@ApiModelProperty("收款账号")
+    private String bankAccount; // 收款账号
+	@ApiModelProperty("其他费用名称")
+    private String otherAmountName; // 其他费用名称
+	@ApiModelProperty("其他费用金额")
+    private BigDecimal otherAmount; // 其他费用金额
+	@ApiModelProperty("付款备注")
+    private String payRemark; // 付款备注
+	@ApiModelProperty("附件")
+    private List<String> filePaths; // 附件
+
+}
\ No newline at end of file
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayDto.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayDto.java
new file mode 100644
index 0000000000..d2d84dff2e
--- /dev/null
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayDto.java
@@ -0,0 +1,83 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.pms.biz.pms.pmspurchasepay;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Project: yxt-pms(采购) <br/>
+ * File: PmsPurchasePayDto.java <br/>
+ * Class: com.yxt.pms.api.pmspurchasepay.PmsPurchasePayDto <br/>
+ * Description: 付款说明 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-05-06 15:43:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "付款说明 数据传输对象", description = "付款说明 数据传输对象")
+public class PmsPurchasePayDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("制单人姓名")
+    private String createByName; // 制单人姓名
+	@ApiModelProperty("单据sid")
+    private String billSid; // 单据sid
+	@ApiModelProperty("是否先付货款 0否，1是")
+    private String isFirstPay; // 是否先付货款 0否，1是
+	@ApiModelProperty("订金")
+    private BigDecimal deposit; // 订金
+	@ApiModelProperty("货款")
+    private BigDecimal goodsMoney; // 货款
+	@ApiModelProperty("收款账户")
+    private String accountName; // 收款账户
+	@ApiModelProperty("开户行")
+    private String bankName; // 开户行
+	@ApiModelProperty("收款账号")
+    private String bankAccount; // 收款账号
+	@ApiModelProperty("其他费用名称")
+    private String otherAmountName; // 其他费用名称
+	@ApiModelProperty("其他费用金额")
+    private BigDecimal otherAmount; // 其他费用金额
+	@ApiModelProperty("付款备注")
+    private String payRemark; // 付款备注
+    @ApiModelProperty("附件")
+    private List<String> filePaths = new ArrayList<>(); // 附件
+
+}
\ No newline at end of file
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayMapper.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayMapper.java
new file mode 100644
index 0000000000..082cb3155f
--- /dev/null
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayMapper.java
@@ -0,0 +1,64 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.pms.biz.pms.pmspurchasepay;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * Project: yxt-pms(采购) <br/>
+ * File: PmsPurchasePayMapper.java <br/>
+ * Class: com.yxt.pms.biz.pmspurchasepay.PmsPurchasePayMapper <br/>
+ * Description: 付款说明. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-05-06 15:43:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface PmsPurchasePayMapper extends BaseMapper<PmsPurchasePay> {
+
+	IPage<PmsPurchasePayVo> selectPageVo(IPage<PmsPurchasePay> page, @Param(Constants.WRAPPER) Wrapper<PmsPurchasePay> qw);
+	
+	List<PmsPurchasePayVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<PmsPurchasePay> qw);
+	
+	@Select("select * from pms_purchase_pay")
+	List<PmsPurchasePayVo> selectListVo();
+
+	@Delete("delete from pms_purchase_pay where billSid = #{dtoSid}")
+    void delByMainSid(String dtoSid);
+}
\ No newline at end of file
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayMapper.xml b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayMapper.xml
new file mode 100644
index 0000000000..686fb9d8df
--- /dev/null
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayMapper.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.pms.biz.pms.pmspurchasepay.PmsPurchasePayMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.pms.biz.pms.pmspurchasepay.PmsPurchasePayVo">
+		SELECT * FROM pms_purchase_pay <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.pms.biz.pms.pmspurchasepay.PmsPurchasePayVo">
+		SELECT * FROM pms_purchase_pay <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>
\ No newline at end of file
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayQuery.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayQuery.java
new file mode 100644
index 0000000000..f26854ec48
--- /dev/null
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayQuery.java
@@ -0,0 +1,79 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.pms.biz.pms.pmspurchasepay;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: yxt-pms(采购) <br/>
+ * File: PmsPurchasePayQuery.java <br/>
+ * Class: com.yxt.pms.api.pmspurchasepay.PmsPurchasePayQuery <br/>
+ * Description: 付款说明 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-05-06 15:43:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "付款说明 查询条件", description = "付款说明 查询条件")
+public class PmsPurchasePayQuery implements Query {
+
+	@ApiModelProperty("制单人姓名")
+    private String createByName; // 制单人姓名
+	@ApiModelProperty("单据sid")
+    private String billSid; // 单据sid
+	@ApiModelProperty("是否先付货款 0否，1是")
+    private String isFirstPay; // 是否先付货款 0否，1是
+	@ApiModelProperty("订金")
+    private BigDecimal deposit; // 订金
+	@ApiModelProperty("货款")
+    private BigDecimal goodsMoney; // 货款
+	@ApiModelProperty("收款账户")
+    private String accountName; // 收款账户
+	@ApiModelProperty("开户行")
+    private String bankName; // 开户行
+	@ApiModelProperty("收款账号")
+    private String bankAccount; // 收款账号
+	@ApiModelProperty("其他费用名称")
+    private String otherAmountName; // 其他费用名称
+	@ApiModelProperty("其他费用金额")
+    private BigDecimal otherAmount; // 其他费用金额
+	@ApiModelProperty("付款备注")
+    private String payRemark; // 付款备注
+	@ApiModelProperty("附件")
+    private String filePath; // 附件
+
+}
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayService.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayService.java
new file mode 100644
index 0000000000..98df90f458
--- /dev/null
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayService.java
@@ -0,0 +1,127 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.pms.biz.pms.pmspurchasepay;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.common.base.config.component.FileUploadComponent;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.vo.PagerVo;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: yxt-pms(采购) <br/>
+ * File: PmsPurchasePayService.java <br/>
+ * Class: com.yxt.pms.biz.pmspurchasepay.PmsPurchasePayService <br/>
+ * Description: 付款说明 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-05-06 15:43:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class PmsPurchasePayService extends MybatisBaseService<PmsPurchasePayMapper, PmsPurchasePay> {
+
+	@Autowired
+	private FileUploadComponent fileUploadComponent;
+
+	private QueryWrapper<PmsPurchasePay> createQueryWrapper(PmsPurchasePayQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<PmsPurchasePay> qw = new QueryWrapper<>();
+		return qw;
+	}
+	
+	public PagerVo<PmsPurchasePayVo> listPageVo(PagerQuery<PmsPurchasePayQuery> pq) {
+		PmsPurchasePayQuery query = pq.getParams();
+		QueryWrapper<PmsPurchasePay> qw = createQueryWrapper(query);
+		IPage<PmsPurchasePay> page = PagerUtil.queryToPage(pq);
+		IPage<PmsPurchasePayVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<PmsPurchasePayVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public void saveOrUpdateDto(PmsPurchasePayDto dto){
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return; 
+        } 
+		this.updateByDto(dto);
+	}
+	
+	public void insertByDto(PmsPurchasePayDto dto){
+		PmsPurchasePay entity = new PmsPurchasePay();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		List<String> filePaths = dto.getFilePaths();
+		String url = "";
+		for (String filePath : filePaths) {
+			filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
+			url = url + filePath + ",";
+		}
+		entity.setFilePath(url);
+		baseMapper.insert(entity);
+	}
+	
+	public void updateByDto(PmsPurchasePayDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		PmsPurchasePay entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		List<String> filePaths = dto.getFilePaths();
+		String url = "";
+		for (String filePath : filePaths) {
+			filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
+			url = url + filePath + ",";
+		}
+		entity.setFilePath(url);
+		baseMapper.updateById(entity);
+	}
+	
+	public PmsPurchasePayDetailsVo fetchDetailsVoBySid(String sid){
+		PmsPurchasePay entity = fetchBySid(sid);
+		PmsPurchasePayDetailsVo vo = new PmsPurchasePayDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+
+	public void delByMainSid(String dtoSid) {
+		baseMapper.delByMainSid(dtoSid);
+	}
+}
\ No newline at end of file
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayVo.java
new file mode 100644
index 0000000000..06b573b59f
--- /dev/null
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayVo.java
@@ -0,0 +1,81 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.pms.biz.pms.pmspurchasepay;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: yxt-pms(采购) <br/>
+ * File: PmsPurchasePayVo.java <br/>
+ * Class: com.yxt.pms.api.pmspurchasepay.PmsPurchasePayVo <br/>
+ * Description: 付款说明 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-05-06 15:43:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "付款说明 视图数据对象", description = "付款说明 视图数据对象")
+public class PmsPurchasePayVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("制单人姓名")
+    private String createByName; // 制单人姓名
+	@ApiModelProperty("单据sid")
+    private String billSid; // 单据sid
+	@ApiModelProperty("是否先付货款 0否，1是")
+    private String isFirstPay; // 是否先付货款 0否，1是
+	@ApiModelProperty("订金")
+    private BigDecimal deposit; // 订金
+	@ApiModelProperty("货款")
+    private BigDecimal goodsMoney; // 货款
+	@ApiModelProperty("收款账户")
+    private String accountName; // 收款账户
+	@ApiModelProperty("开户行")
+    private String bankName; // 开户行
+	@ApiModelProperty("收款账号")
+    private String bankAccount; // 收款账号
+	@ApiModelProperty("其他费用名称")
+    private String otherAmountName; // 其他费用名称
+	@ApiModelProperty("其他费用金额")
+    private BigDecimal otherAmount; // 其他费用金额
+	@ApiModelProperty("付款备注")
+    private String payRemark; // 付款备注
+	@ApiModelProperty("附件")
+    private String filePath; // 附件
+
+}
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoDetailsVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoDetailsVo.java
index 19bb07efa1..d8ea31acd4 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoDetailsVo.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoDetailsVo.java
@@ -54,6 +54,8 @@ public class PmsSupplierInfoDetailsVo implements Vo {
 
     private String sid; // sid
 
+    @ApiModelProperty("备注")
+    private String remarks;
 	@ApiModelProperty("编码")
     private String supplierCode; // 编码
 	@ApiModelProperty("供应商名称")
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoDto.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoDto.java
index f42a54f830..bcf92d84c0 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoDto.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoDto.java
@@ -55,6 +55,8 @@ public class PmsSupplierInfoDto implements Dto {
 
     private String sid; // sid
 
+    @ApiModelProperty("备注")
+    private String remarks;
 	@ApiModelProperty("编码")
     private String supplierCode; // 编码
 	@ApiModelProperty("供应商名称")
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoService.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoService.java
index df6a4a478e..68066222ac 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoService.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoService.java
@@ -89,6 +89,10 @@ public class PmsSupplierInfoService extends MybatisBaseService<PmsSupplierInfoMa
 		qw.eq("isDelete",0);
 		IPage<PmsSupplierInfo> page = PagerUtil.queryToPage(pq);
 		IPage<PmsSupplierInfoVo> pagging = baseMapper.selectPageVo(page, qw);
+		List<PmsSupplierInfoVo> records = pagging.getRecords();
+		for (PmsSupplierInfoVo record : records) {
+			record.setAddress(record.getProvince() + record.getCity() + record.getCounty() + record.getAddress());
+		}
 		PagerVo<PmsSupplierInfoVo> p = PagerUtil.pageToVo(pagging, null);
 		return p;
 	}
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoVo.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoVo.java
index c1d4fc04cb..a1abe8085b 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoVo.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoVo.java
@@ -62,4 +62,11 @@ public class PmsSupplierInfoVo implements Vo {
     private String contactName;
     @ApiModelProperty("手机")
     private String contactMobile;
+
+    @ApiModelProperty("省")
+    private String province;
+    @ApiModelProperty("市")
+    private String city;
+    @ApiModelProperty("县")
+    private String county;
 }
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeService.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeService.java
index 8811636989..952184e283 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeService.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeService.java
@@ -31,6 +31,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import com.yxt.pms.feign.portal.sysorganization.SysOrganizationFeign;
 import com.yxt.pms.feign.portal.sysorganization.SysOrganizationVo;
@@ -83,7 +84,8 @@ public class PmsSupplierTypeService extends MybatisBaseService<PmsSupplierTypeMa
         return p;
     }
 
-    public void saveOrUpdateDto(PmsSupplierTypeDto dto) {
+    public ResultBean saveOrUpdateDto(PmsSupplierTypeDto dto) {
+        ResultBean rb = ResultBean.fireFail();
         String orgPath = dto.getOrgPath();
         String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(createOrgSid).getData();
@@ -92,8 +94,11 @@ public class PmsSupplierTypeService extends MybatisBaseService<PmsSupplierTypeMa
         dto.setUseOrgSid(createOrgSid);
         BaseSupplierTypeDto baseSupplierTypeDto = new BaseSupplierTypeDto();
 		BeanUtil.copyProperties(dto,baseSupplierTypeDto);
-        baseSupplierTypeFeign.save(baseSupplierTypeDto);
-        return;
+        ResultBean resultBean = baseSupplierTypeFeign.save(baseSupplierTypeDto);
+        if (resultBean.getSuccess()) {
+            return rb.success();
+        }
+        return rb.setMsg(resultBean.getMsg());
     }
 
     public void del(String[] sids) {
diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/feign/yxtbase/supplier/BaseSupplierInfoDto.java b/yxt-pms-biz/src/main/java/com/yxt/pms/feign/yxtbase/supplier/BaseSupplierInfoDto.java
index 3ec91b93eb..57468b509b 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/feign/yxtbase/supplier/BaseSupplierInfoDto.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/feign/yxtbase/supplier/BaseSupplierInfoDto.java
@@ -55,6 +55,8 @@ public class BaseSupplierInfoDto implements Dto {
 
     private String sid; // sid
 
+    @ApiModelProperty("备注")
+    private String remarks;
 	@ApiModelProperty("编码")
     private String supplierCode; // 编码
 	@ApiModelProperty("供应商名称")