diff --git a/src/views/basic/corpMaintain/corpMaintain.vue b/src/views/basic/corpMaintain/corpMaintain.vue
index cfb1174..fd90265 100644
--- a/src/views/basic/corpMaintain/corpMaintain.vue
+++ b/src/views/basic/corpMaintain/corpMaintain.vue
@@ -42,7 +42,7 @@
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="往来单位编码" prop="erpId" show-overflow-tooltip></el-table-column>
-        <el-table-column label="第三方主系统ID" prop="thirdId" show-overflow-tooltip></el-table-column>
+        <el-table-column label="第三方主系统编码" prop="thirdId" show-overflow-tooltip></el-table-column>
         <el-table-column label="名称" prop="name" show-overflow-tooltip></el-table-column>
         <el-table-column label="简写" prop="spell" show-overflow-tooltip></el-table-column>
         <el-table-column label="社会信用号" prop="creditNo" show-overflow-tooltip></el-table-column>
diff --git a/src/views/basic/corpMaintain/corpMaintainSelect.vue b/src/views/basic/corpMaintain/corpMaintainSelect.vue
index ce1fd3e..5dbbceb 100644
--- a/src/views/basic/corpMaintain/corpMaintainSelect.vue
+++ b/src/views/basic/corpMaintain/corpMaintainSelect.vue
@@ -24,7 +24,7 @@
                 <el-table v-loading="loading" :data="list"  @current-change="handleSelectChange" style="width: 100%" highlight-current-row border>
                     <el-table-column label="序号" type="index"></el-table-column>
                     <el-table-column label="往来单位编码" prop="erpId" show-overflow-tooltip></el-table-column>
-                    <el-table-column label="第三方主系统ID" prop="thirdId" show-overflow-tooltip></el-table-column>
+                    <el-table-column label="第三方主系统编码" prop="thirdId" show-overflow-tooltip></el-table-column>
                     <el-table-column label="名称" prop="name" show-overflow-tooltip></el-table-column>
                     <el-table-column label="简写" prop="spell" show-overflow-tooltip></el-table-column>
                     <el-table-column label="社会信用号" prop="creditNo" show-overflow-tooltip></el-table-column>
diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue
index 6fb7450..eb6a12b 100644
--- a/src/views/basic/product/product.vue
+++ b/src/views/basic/product/product.vue
@@ -214,10 +214,11 @@
             <el-card>
               <el-table :data="sysList" style="width: 100%;   margin-bottom: 8px" key="2" border>
                 <el-table-column label="序号" type="index"></el-table-column>
-                <el-table-column label="系统名称" prop="sysName" show-overflow-tooltip></el-table-column>
-                <el-table-column label="产品编码" prop="thirdId" show-overflow-tooltip></el-table-column>
-                <el-table-column label="产品名称" prop="thirdName" show-overflow-tooltip></el-table-column>
-                <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
+                <el-table-column label="第三方系统名称" prop="sysName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="第三方系统物资编码" prop="thirdId" show-overflow-tooltip></el-table-column>
+                <el-table-column label="第三方系统物资名称" prop="thirdName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="第三方系统规格型号" prop="spec" show-overflow-tooltip></el-table-column>
+
                 <el-table-column label="注册/备案号" prop="registerNo" show-overflow-tooltip></el-table-column>
                 <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
               </el-table>
@@ -232,7 +233,7 @@
 
               <el-table v-loading="loading" :data="detailList" style="width: 100%; " border key="3"
                         highlight-current-row @current-change="handleDetail">
-                <el-table-column label="产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
+                <el-table-column label="产品最小销售标识" prop="nameCode" show-overflow-tooltip></el-table-column>
                 <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
                 <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
                 <el-table-column label="包装单位" prop="packUnit" show-overflow-tooltip></el-table-column>
@@ -1737,48 +1738,48 @@ export default {
       });
     },
 
-    selectSysParam() {
-      let query = {
-        paramKey: "smp_isUploadProuct",
-      };
-      spcombie().then((response) => {
-        if (response.code == 20000) {
-          if (response.data.paramValue == "1") {
-            this.isSpCombine = true;
-          } else {
-            this.isSpCombine = false;
-          }
-        }
-      });
-
-      selectSysParamByKey(query).then((response) => {
-        if (response.code == 20000) {
-          if (response.data.paramValue == "1") {
-            this.isUploadSmp = true;
-          } else {
-            this.isUploadSmp = false;
-          }
-        }
-      });
-      let query1 = {
-        paramKey: "upload_pi_file_enabled",
-      };
-      selectSysParamByKey(query1).then((response) => {
-        if (response.code == 20000) {
-          if (response.data.paramValue == "1") {
-            this.isImportFile = true;
-          }
-        }
-      });
-      let query2 = {
-        paramKey: "upload_pi_file_url",
-      };
-      selectSysParamByKey(query2).then((response) => {
-        if (response.code == 20000) {
-          this.uploadFileUrl = response.data.paramValue;
-        }
-      });
-    },
+    // selectSysParam() {
+    //   let query = {
+    //     paramKey: "smp_isUploadProuct",
+    //   };
+    //   spcombie().then((response) => {
+    //     if (response.code == 20000) {
+    //       if (response.data.paramValue == "1") {
+    //         this.isSpCombine = true;
+    //       } else {
+    //         this.isSpCombine = false;
+    //       }
+    //     }
+    //   });
+    //
+    //   selectSysParamByKey(query).then((response) => {
+    //     if (response.code == 20000) {
+    //       if (response.data.paramValue == "1") {
+    //         this.isUploadSmp = true;
+    //       } else {
+    //         this.isUploadSmp = false;
+    //       }
+    //     }
+    //   });
+    //   let query1 = {
+    //     paramKey: "upload_pi_file_enabled",
+    //   };
+    //   selectSysParamByKey(query1).then((response) => {
+    //     if (response.code == 20000) {
+    //       if (response.data.paramValue == "1") {
+    //         this.isImportFile = true;
+    //       }
+    //     }
+    //   });
+    //   let query2 = {
+    //     paramKey: "upload_pi_file_url",
+    //   };
+    //   selectSysParamByKey(query2).then((response) => {
+    //     if (response.code == 20000) {
+    //       this.uploadFileUrl = response.data.paramValue;
+    //     }
+    //   });
+    // },
 
     editUdiType() {
       this.selectUdiTypeVisible = true;
@@ -1839,7 +1840,7 @@ export default {
     this.findBasicProductSet();
     this.getList();
     this.getTerrList();
-    this.selectSysParam();
+    // this.selectSysParam();
     this.getSysFilter();
   },
 };
diff --git a/src/views/basic/product/productEdit.vue b/src/views/basic/product/productEdit.vue
index 87e630e..e7096d5 100644
--- a/src/views/basic/product/productEdit.vue
+++ b/src/views/basic/product/productEdit.vue
@@ -5,15 +5,15 @@
       :rules="rules"
       ref="editQuery"
       border
-      label-width="120px"
+      label-width="130px"
     >
       <el-card>
         <el-table :data="sysList" style="width: 100%;   margin-bottom: 8px" key="2" border>
           <el-table-column label="序号" type="index"></el-table-column>
-          <el-table-column label="系统名称" prop="sysName" show-overflow-tooltip></el-table-column>
-          <el-table-column label="物资编码" prop="thirdId" show-overflow-tooltip></el-table-column>
-          <el-table-column label="产品名称" prop="thirdName" show-overflow-tooltip></el-table-column>
-          <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
+          <el-table-column label="第三方系统名称" prop="sysName" show-overflow-tooltip></el-table-column>
+          <el-table-column label="第三方系统物资编码" prop="thirdId" show-overflow-tooltip></el-table-column>
+          <el-table-column label="第三方系统物资名称" prop="thirdName" show-overflow-tooltip></el-table-column>
+          <el-table-column label="第三方系统规格型号" prop="spec" show-overflow-tooltip></el-table-column>
           <el-table-column label="注册/备案号" prop="registerNo" show-overflow-tooltip></el-table-column>
           <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
           <el-table-column label="操作">
@@ -44,7 +44,7 @@
         </div>
         <el-table v-loading="loading" :data="detailList" style="width: 100%; " border key="3" highlight-current-row
                   @current-change="handleDetail">
-          <el-table-column label="产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
+          <el-table-column label="产品最小销售标识" prop="nameCode" show-overflow-tooltip></el-table-column>
           <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
           <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
           <el-table-column label="包装单位" prop="packUnit" show-overflow-tooltip></el-table-column>
@@ -56,8 +56,6 @@
         </el-table>
       </el-card>
       <el-card>
-
-
         <el-row type="flex" class="edit-row" style="margin-top: 20px">
           <el-col :span="12">
             <el-form-item label="计量单位:">
@@ -102,6 +100,30 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row type="flex" class="edit-row">
+          <el-col :span="12">
+            <el-form-item label="物资所属分类:">
+              <treeselect
+                v-model="editQuery.relCode"
+                :options="fromDeptOptions"
+                :normalizer="normalizer"
+                :show-count="true"
+                style="width: 80%;"
+                placeholder="选择物资所属分类"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="医保编码:">
+              <el-input
+                style="width: 80%"
+                size="small"
+                splaceholder="请输入内容"
+                v-model="editQuery.ybbm"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row type="flex" class="edit-row">
           <el-col :span="12">
             <el-form-item label="库存积压预警数量:">
@@ -136,7 +158,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="预警时间格式:">
+            <el-form-item label="预警时间单位:">
               <el-select v-model="editQuery.isDateBy" style="width: 65%" placeholder="状态" clearable>
                 <el-option label="天" :value="1"></el-option>
                 <el-option label="小时" :value="2"></el-option>
@@ -148,7 +170,7 @@
 
         <el-row type="flex" class="edit-row">
           <el-col :span="12" v-if="productRemarkSet.remarkEnable1">
-            <el-form-item :label="productRemarkSet.remarkTitle1+':'" +>
+            <el-form-item :label="productRemarkSet.remarkTitle1+':'">
               <el-input
                 style="width: 80%"
                 size="small"
@@ -158,7 +180,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12" v-if="productRemarkSet.remarkEnable2">
-            <el-form-item :label="productRemarkSet.remarkTitle2+':'" +>
+            <el-form-item :label="productRemarkSet.remarkTitle2+':'">
               <el-input
                 style="width: 80%"
                 size="small"
@@ -170,7 +192,7 @@
         </el-row>
         <el-row type="flex" class="edit-row">
           <el-col :span="12" v-if="productRemarkSet.remarkEnable3">
-            <el-form-item :label="productRemarkSet.remarkTitle3+':'" +>
+            <el-form-item :label="productRemarkSet.remarkTitle3+':'">
               <el-input
                 style="width: 80%"
                 size="small"
@@ -180,7 +202,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12" v-if="productRemarkSet.remarkEnable4">
-            <el-form-item :label="productRemarkSet.remarkTitle4+':'" +>
+            <el-form-item :label="productRemarkSet.remarkTitle4+':'">
               <el-input
                 style="width: 80%"
                 size="small"
@@ -192,7 +214,7 @@
         </el-row>
         <el-row type="flex" class="edit-row">
           <el-col :span="12" v-if="productRemarkSet.remarkEnable5">
-            <el-form-item :label="productRemarkSet.remarkTitle5+':'" +>
+            <el-form-item :label="productRemarkSet.remarkTitle5+':'">
               <el-input
                 style="width: 80%"
                 size="small"
@@ -202,7 +224,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12" v-if="productRemarkSet.remarkEnable6">
-            <el-form-item :label="productRemarkSet.remarkTitle6+':'" +>
+            <el-form-item :label="productRemarkSet.remarkTitle6+':'">
               <el-input
                 style="width: 80%"
                 size="small"
@@ -214,7 +236,7 @@
         </el-row>
         <el-row type="flex" class="edit-row">
           <el-col :span="12" v-if="productRemarkSet.remarkEnable7">
-            <el-form-item :label="productRemarkSet.remarkTitle7+':'" +>
+            <el-form-item :label="productRemarkSet.remarkTitle7+':'">
               <el-input
                 style="width: 80%"
                 size="small"
@@ -224,7 +246,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12" v-if="productRemarkSet.remarkEnable8">
-            <el-form-item :label="productRemarkSet.remarkTitle8+':'" +>
+            <el-form-item :label="productRemarkSet.remarkTitle8+':'">
               <el-input
                 style="width: 80%"
                 size="small"
@@ -234,43 +256,14 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row type="flex" class="edit-row">
-          <el-col :span="12">
-            <el-form-item label="医保编码:">
-              <el-input
-                style="width: 80%"
-                size="small"
-                splaceholder="请输入内容"
-                v-model="editQuery.ybbm"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
 
-      </el-card>
 
+      </el-card>
       <el-collapse v-model="activeNames" style="margin-top: 12px">
         <el-collapse-item title="高级设置" name="1"
                           style="font-size: 19px;
           margin-left: 25px;
           font-weight: bold;">
-
-
-          <el-row type="flex" class="edit-row">
-            <el-col :span="12">
-              <el-form-item label="物资所属分类:">
-                <treeselect
-                  v-model="editQuery.relCode"
-                  :options="fromDeptOptions"
-                  :normalizer="normalizer"
-                  :show-count="true"
-                  style="width: 65%;"
-                  placeholder="选择物资所属分类"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-divider></el-divider>
           <div style="width: 96%;margin: 0 auto">
             <el-row>
               <el-col span="5">
@@ -389,8 +382,6 @@
                 <span class="sptext">是否可配送</span>
               </el-col>
             </el-row>
-
-
             <el-divider></el-divider>
             <el-row>
               <el-col span="5">
@@ -468,7 +459,6 @@
             <el-divider></el-divider>
 
 
-
             <el-row>
               <el-col span="5">
                 <span class="sptext">允许无序列号</span>
diff --git a/src/views/inout/DialogSelectRl.vue b/src/views/inout/DialogSelectRl.vue
index 059e777..7342194 100644
--- a/src/views/inout/DialogSelectRl.vue
+++ b/src/views/inout/DialogSelectRl.vue
@@ -76,7 +76,7 @@
       <el-table :data="sysList" style="width: 100%" border>
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column
-          label="系统名称"
+          label="第三方系统名称"
           prop="sysName"
           show-overflow-tooltip
         ></el-table-column>
diff --git a/src/views/inout/InvoiceRegistration.vue b/src/views/inout/InvoiceRegistration.vue
index e181ce8..7ff1378 100644
--- a/src/views/inout/InvoiceRegistration.vue
+++ b/src/views/inout/InvoiceRegistration.vue
@@ -449,7 +449,7 @@ export default {
         mainAction: null,
         action: null,
         page: 1,
-        statusType: "supInvoice",
+        supInoivceSearch: "supInvoice",
         limit: 10,
         startTime: null,
         endTime: null,
@@ -592,7 +592,7 @@ export default {
         action: null,
         page: 1,
         limit: 10,
-        statusType: "supInvoice",
+        supInoivceSearch: "supInvoice",
         startTime: null,
         endTime: null,
         invCode: this.$store.getters.locInvCode,
diff --git a/src/views/supplier/company/basicCompanyProducts.vue b/src/views/supplier/company/basicCompanyProducts.vue
index 220a851..8c6c932 100644
--- a/src/views/supplier/company/basicCompanyProducts.vue
+++ b/src/views/supplier/company/basicCompanyProducts.vue
@@ -91,10 +91,10 @@
                        :disabled="scope.row.originUuid!=null || scope.row.lockStatus===3"
                        @click.native.stop="intentSelectUdi(scope.row)">关联DI
             </el-button>
-            <el-button v-if="scope.row.lockStatus!=3" type="text" size="small"
+            <el-button type="text" size="small"
                        @click.native.stop="handleModifyClick(scope.row)">编辑
             </el-button>
-            <el-button v-if=" scope.row.lockStatus!=3" type="text" size="small"
+            <el-button type="text" size="small"
                        @click.native.stop="handleDetailClick(scope.row)">详情
             </el-button>
 
@@ -104,7 +104,7 @@
                   <i class="el-icon-d-arrow-right el-icon--right"></i>更多
                 </span>
               <el-dropdown-menu slot="dropdown">
-<!--                <el-dropdown-item command="handleDetailClick" v-if=" scope.row.lockStatus!=3">详情</el-dropdown-item>-->
+                <!--                <el-dropdown-item command="handleDetailClick" v-if=" scope.row.lockStatus!=3">详情</el-dropdown-item>-->
                 <el-dropdown-item command="sumitLockStatus" v-if="isSpCombine" :disabled="scope.row.lockStatus===3">
                   提交审核
                 </el-dropdown-item>
diff --git a/src/views/supplier/company/basicCompanyProductsImport.vue b/src/views/supplier/company/basicCompanyProductsImport.vue
index 263afd7..ba11440 100644
--- a/src/views/supplier/company/basicCompanyProductsImport.vue
+++ b/src/views/supplier/company/basicCompanyProductsImport.vue
@@ -81,9 +81,12 @@
         <el-table :data="sysList" style="width: 100%" border highlight-current-row>
           <el-table-column label="序号" type="index"></el-table-column>
           <el-table-column label="第三方系统名称" prop="sysName" show-overflow-tooltip></el-table-column>
+          <el-table-column label="第三方系统物资编码" prop="thirdId" show-overflow-tooltip></el-table-column>
           <el-table-column label="第三方系统物资名称" prop="thirdName" show-overflow-tooltip></el-table-column>
           <el-table-column label="第三方系统规格型号" prop="spec" show-overflow-tooltip></el-table-column>
-          <el-table-column label="第三方系统物资编码" prop="thirdId" show-overflow-tooltip></el-table-column>
+
+          <el-table-column label="注册/备案号" prop="registerNo" show-overflow-tooltip></el-table-column>
+          <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
         </el-table>
 
         <el-table v-loading="loading" :data="detailList" style="width: 100%; margin-top: 20px" border
diff --git a/src/views/supplier/company/basicCompanyproductDetail.vue b/src/views/supplier/company/basicCompanyproductDetail.vue
index ba496ce..f5d7d31 100644
--- a/src/views/supplier/company/basicCompanyproductDetail.vue
+++ b/src/views/supplier/company/basicCompanyproductDetail.vue
@@ -3,7 +3,7 @@
     <el-card>
       <el-table :data="sysList" style="width: 100%;   margin-bottom: 8px" key="2" border>
         <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="系统名称" prop="sysName" show-overflow-tooltip></el-table-column>
+        <el-table-column label="第三方系统名称" prop="sysName" show-overflow-tooltip></el-table-column>
         <el-table-column label="产品编码" prop="thirdId" show-overflow-tooltip></el-table-column>
         <el-table-column label="产品名称" prop="thirdName" show-overflow-tooltip></el-table-column>
         <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
diff --git a/src/views/supplier/company/basicCompanyproductEdit.vue b/src/views/supplier/company/basicCompanyproductEdit.vue
index 463cd6b..4993774 100644
--- a/src/views/supplier/company/basicCompanyproductEdit.vue
+++ b/src/views/supplier/company/basicCompanyproductEdit.vue
@@ -4,10 +4,10 @@
     <el-card>
       <el-table :data="sysList" style="width: 100%;   margin-bottom: 8px" key="2" border>
         <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="系统名称" prop="sysName" show-overflow-tooltip></el-table-column>
-        <el-table-column label="产品编码" prop="thirdId" show-overflow-tooltip></el-table-column>
-        <el-table-column label="产品名称" prop="thirdName" show-overflow-tooltip></el-table-column>
-        <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
+        <el-table-column label="第三方系统名称" prop="sysName" show-overflow-tooltip></el-table-column>
+        <el-table-column label="第三方系统物资编码" prop="thirdId" show-overflow-tooltip></el-table-column>
+        <el-table-column label="第三方系统物资名称" prop="thirdName" show-overflow-tooltip></el-table-column>
+        <el-table-column label="第三方系统规格型号" prop="spec" show-overflow-tooltip></el-table-column>
         <el-table-column label="注册/备案号" prop="registerNo" show-overflow-tooltip></el-table-column>
         <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
         <el-table-column label="操作">
@@ -37,8 +37,8 @@
         </el-button>
       </div>
       <el-table v-loading="loading" :data="detailList" style="width: 100%; " border key="3" highlight-current-row>
-        <el-table-column label="产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
-        <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+        <el-table-column label="产品最小销售标识" prop="nameCode" show-overflow-tooltip></el-table-column>
+        <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
         <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
         <el-table-column label="包装层级" prop="bzcj" show-overflow-tooltip></el-table-column>
       </el-table>
@@ -85,48 +85,48 @@
         </el-row>
 
 
-        <el-row type="flex" class="edit-row">
-          <el-col :span="12">
-            <el-form-item label="库存积压预警数量:">
-              <el-input
-                style="width: 80%"
-                size="small"
-                splaceholder="请输入内容"
-                v-model="editQuery.overStockNum"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="低库存预警数量:">
-              <el-input
-                style="width: 80%"
-                size="small"
-                splaceholder="请输入内容"
-                v-model="editQuery.lowStockNum"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row type="flex" class="edit-row">
-          <el-col :span="12">
-            <el-form-item label="近效期预警时间:">
-              <el-input
-                style="width: 80%"
-                size="small"
-                splaceholder="请输入内容"
-                v-model="editQuery.recentDateTime"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="预警时间格式:">
-              <el-select v-model="editQuery.isDateBy" style="width: 65%" placeholder="状态" clearable>
-                <el-option label="天" :value="1"></el-option>
-                <el-option label="小时" :value="2"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
+<!--        <el-row type="flex" class="edit-row">-->
+        <!--          <el-col :span="12">-->
+        <!--            <el-form-item label="库存积压预警数量:">-->
+        <!--              <el-input-->
+        <!--                style="width: 80%"-->
+        <!--                size="small"-->
+        <!--                splaceholder="请输入内容"-->
+        <!--                v-model="editQuery.overStockNum"-->
+        <!--              ></el-input>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--          <el-col :span="12">-->
+        <!--            <el-form-item label="低库存预警数量:">-->
+        <!--              <el-input-->
+        <!--                style="width: 80%"-->
+        <!--                size="small"-->
+        <!--                splaceholder="请输入内容"-->
+        <!--                v-model="editQuery.lowStockNum"-->
+        <!--              ></el-input>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--        </el-row>-->
+        <!--        <el-row type="flex" class="edit-row">-->
+        <!--          <el-col :span="12">-->
+        <!--            <el-form-item label="近效期预警时间:">-->
+        <!--              <el-input-->
+        <!--                style="width: 80%"-->
+        <!--                size="small"-->
+        <!--                splaceholder="请输入内容"-->
+        <!--                v-model="editQuery.recentDateTime"-->
+        <!--              ></el-input>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--          <el-col :span="12">-->
+        <!--            <el-form-item label="预警时间单位:">-->
+        <!--              <el-select v-model="editQuery.isDateBy" style="width: 65%" placeholder="状态" clearable>-->
+        <!--                <el-option label="天" :value="1"></el-option>-->
+        <!--                <el-option label="小时" :value="2"></el-option>-->
+        <!--              </el-select>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--        </el-row>-->
         <el-row type="flex" class="edit-row">
           <el-col :span="12">
             <el-form-item label="产品描述:">
diff --git a/src/views/supplier/company/basicProductEdit.vue b/src/views/supplier/company/basicProductEdit.vue
index 26c5e00..d3dfc8f 100644
--- a/src/views/supplier/company/basicProductEdit.vue
+++ b/src/views/supplier/company/basicProductEdit.vue
@@ -4,7 +4,7 @@
             <el-table :data="sysList" style="width: 100%" border>
                 <el-table-column label="序号" type="index"></el-table-column>
                 <el-table-column
-                    label="系统名称"
+                    label="第三方系统名称"
                     prop="sysName"
                     show-overflow-tooltip
                 ></el-table-column>
diff --git a/src/views/system/dept/invRelUsers.vue b/src/views/system/dept/invRelUsers.vue
index f5c0425..074edd3 100644
--- a/src/views/system/dept/invRelUsers.vue
+++ b/src/views/system/dept/invRelUsers.vue
@@ -69,7 +69,7 @@
             type="text"
             :disabled="!configParms.basicInv"
             @click.native="relBusttype(scope.row)">
-            管理单据类型
+            用户可用单据
           </el-button>
         </template>
       </el-table-column>
@@ -311,7 +311,12 @@ export default {
       this.relBusUserVisile = false;
     },
   },
-
+  watch: {
+    inputQuery: function () {
+      this.userQuery.code = this.inputQuery.code;
+      this.loadUserList();
+    },
+  },
   created() {
     this.userQuery.code = this.inputQuery.code;
     this.loadUserList();
diff --git a/src/views/system/dept/invWarehouse.vue b/src/views/system/dept/invWarehouse.vue
index 034500b..bdda283 100644
--- a/src/views/system/dept/invWarehouse.vue
+++ b/src/views/system/dept/invWarehouse.vue
@@ -58,20 +58,20 @@
             </el-button
             >
 
-            <el-button
-              type="text"
-              :disabled="!configParms.basicInv"
-              @click.native.stop="popInvRelUser( scope.row)"
-            >用户管理
-            </el-button
-            >
+<!--            <el-button-->
+<!--              type="text"-->
+<!--              :disabled="!configParms.basicInv"-->
+<!--              @click.native.stop="popInvRelUser( scope.row)"-->
+<!--            >用户管理-->
+<!--            </el-button-->
+<!--            >-->
 
 
             <el-button
               type="text"
               :disabled="!configParms.basicInv"
               @click.native.stop="popInvRelBustype(scope.row)"
-            >单据类型
+            >仓库可用单据
             </el-button
             >
 
@@ -322,9 +322,14 @@
 
     </el-card>
     <el-tabs type="border-card" style="margin: 15px">
-      <!--      <el-tab-pane>-->
-      <!--        <span slot="label">{{ currentRow.name }}-用户列表</span>-->
-      <!--      </el-tab-pane>-->
+            <el-tab-pane>
+              <span slot="label">{{ currentRow.name }}-用户列表</span>
+
+              <inv-rel-users :inputQuery="currentRow"
+                             :configParms="configParms"
+              ></inv-rel-users>
+
+            </el-tab-pane>
       <!--      <el-tab-pane>-->
       <!--        <span slot="label">{{ currentRow.name }}-单据类型</span>-->
       <!--      </el-tab-pane>-->
diff --git a/src/views/userManage/param/basicProductConfig.vue b/src/views/userManage/param/basicProductConfig.vue
index b7d5b1c..6e48f26 100644
--- a/src/views/userManage/param/basicProductConfig.vue
+++ b/src/views/userManage/param/basicProductConfig.vue
@@ -57,9 +57,9 @@
 
         <el-table v-loading="systemLoading" :data="systemList" style="width: 100%" border>
           <el-table-column type="index" label="序号" width="50"></el-table-column>
-          <el-table-column label="标题" prop="paramName" width="320"></el-table-column>
+          <el-table-column label="参数名" prop="paramName" width="320"></el-table-column>
           <!--        <el-table-column label="参数键" prop="paramKey" width="200"></el-table-column>-->
-          <el-table-column label="参数名称" prop="paramValue" width="100"></el-table-column>
+          <el-table-column label="标题名称" prop="paramValue" width="100"></el-table-column>
           <el-table-column label="描述" :show-overflow-tooltip="true">
             <template slot-scope="scope">
               <span>{{ scope.row.paramExplain }}</span>