From dc5bc48b8d11806442ad78c65e4c10db8754f5c6 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Sat, 1 Apr 2023 19:34:34 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/busType/bussinessType.vue     |   12 +-
 src/views/basic/business/stockOrder.vue       |    2 +-
 src/views/basic/product/UdiInfoSelectRel.vue  |   10 +-
 .../product/basicCompanyProductsImport.vue    |    2 +-
 src/views/basic/product/bindHospProduct.vue   |    4 +-
 src/views/basic/product/product.vue           |   59 +-
 src/views/basic/product/udIInfoSelect.vue     |    2 +-
 src/views/basic/product/udiInfoManageSp.vue   |    2 +-
 .../basic/product/udiInfoselectErpUdi.vue     | 1077 +++++++++--------
 src/views/basic/product/unbindHospProduct.vue |    4 +-
 src/views/diSearch/udiInfoSearch.vue          |    2 +-
 src/views/inout/DialogCheck.vue               |    2 +-
 src/views/inout/DialogSelectProduct.vue       |    2 +-
 src/views/inout/DialogSelectRl.vue            |    2 +-
 src/views/inout/DialogThrReviewOrder.vue      |    2 +-
 src/views/inout/IoSupAduitOrder.vue           |    2 +-
 .../inventory/DeviceReceiveOrderAudit.vue     |    2 +-
 .../inventory/DeviceReceiveOrderModify.vue    |    2 +-
 src/views/inventory/InvCountOrderModify.vue   |    2 +-
 src/views/inventory/InvMAOrderAudit.vue       |    2 +-
 src/views/inventory/InvMAOrderCompleted.vue   |    4 +-
 src/views/inventory/inner/innerOrder.vue      |    2 +-
 .../inner/innerOrderSelectProduct.vue         |    2 +-
 .../inventory/trace/invUdiTraceOrder.vue      |    2 +-
 .../inventory/trace/sickerUdiTraceOrder.vue   |    2 +-
 .../company/basicSelectSingleProducts.vue     |    6 +-
 .../purchase/company/companyProducts.vue      |    2 +-
 .../purchase/product/supProductEditDialog.vue |    4 +-
 src/views/purchase/purApply/purApply.vue      |    2 +-
 .../purchase/purApply/purApplyProducts.vue    |    4 +-
 .../purApply/purOrderSelectProduct.vue        |    2 +-
 .../purchase/purApply/pureApplyAudit.vue      |    2 +-
 .../purApply/pureApplyDetailDialog.vue        |    4 +-
 .../purApply/selectApplyListDialog.vue        |    2 +-
 src/views/purchase/purArrival/purArrival.vue  |    2 +-
 .../purchase/purArrival/purArrivalAudit.vue   |    2 +-
 .../purArrival/purArrivalDetailDialog.vue     |    2 +-
 .../purArrival/purArrivalEditDialog.vue       |    2 +-
 .../purchase/purArrival/purArrivalInvoice.vue |    2 +-
 .../purchase/purArrival/purArrivalSearch.vue  |    2 +-
 .../purArrival/purArrivalSelectProduct.vue    |    2 +-
 .../purDelivery/DialogSelectDeliveryList.vue  |    2 +-
 .../purchase/purDelivery/purDelivery.vue      |    2 +-
 .../purchase/purDelivery/purDeliveryAudit.vue |    2 +-
 .../purDelivery/purDeliveryEditDialog.vue     |    2 +-
 .../purDelivery/purDeliverySearch.vue         |    2 +-
 .../purDelivery/purDeliverySelectProduct.vue  |    2 +-
 .../purOrder/DialogSelectOrderList.vue        |    2 +-
 src/views/purchase/purOrder/purOrder.vue      |    2 +-
 src/views/purchase/purOrder/purOrderAudit.vue |    2 +-
 .../purchase/purOrder/purOrderEditDialog.vue  |    2 +-
 .../purOrder/purOrderOrderSelectProduct.vue   |    2 +-
 .../purOrder/purOrderSelectProduct.vue        |    2 +-
 .../purPlan/purOrderSelectProduct.vue         |    2 +-
 .../purchase/purPlan/purPlanDetailDialog.vue  |    2 +-
 .../purchase/purPlan/purPlanEditDialog.vue    |    4 +-
 .../purPlan/purPlanOrderSelectProduct.vue     |    2 +-
 .../purchase/purReturned/purReturned.vue      |    2 +-
 .../purchase/purReturned/purReturnedAudit.vue |    2 +-
 .../purReturned/purReturnedDetailDialog.vue   |    4 +-
 .../purReturned/purReturnedEditDialog.vue     |    4 +-
 .../purReturned/purReturnedSearch.vue         |    2 +-
 src/views/remind/addInvRemindSetDialog.vue    |    2 +-
 .../supplier/company/SelectDIDetailDialog.vue |    2 +-
 src/views/supplier/company/ThrProductsAdd.vue |    4 +-
 .../supplier/company/basicCompanyProducts.vue |    4 +-
 .../company/basicCompanyProductsImport.vue    |   40 +-
 .../company/basicCompanyproductDetail.vue     |    4 +-
 .../company/basicCompanyproductEdit.vue       |    4 +-
 .../supplier/company/basicProductEdit.vue     |    4 +-
 .../supplier/company/supCompanyProduct.vue    |    2 +-
 .../supplier/company/udiInfoRelevance.vue     |    6 +-
 .../supplier/company/udiInfoselectErpUdi.vue  |    6 +-
 .../products/selectDIDetailDialog.vue         |    2 +-
 .../products/supAddDiProductSelectUdi.vue     |    2 +-
 .../supplier/products/supProductsAdd.vue      |    4 +-
 .../supplier/products/supProductsDetail.vue   |    2 +-
 .../supplier/products/supProductsSubmit.vue   |    6 +-
 .../thirdSys/invProducts/thrInvProducts.vue   |    6 +-
 .../invProducts/thrInvProductsSelect.vue      |    2 +-
 src/views/thirdSys/product/thrProducts.vue    |   12 +-
 src/views/thirdSys/product/thrProductsAdd.vue |    6 +-
 .../thirdSys/product/thrProductsCheck.vue     |    4 +-
 .../thirdSys/product/thrProductsDetail.vue    |   16 +-
 .../product/thrProductsImportDetail.vue       |    2 +-
 .../thirdSys/product/thrProductsSelect.vue    |   66 +-
 86 files changed, 791 insertions(+), 713 deletions(-)

diff --git a/src/views/basic/busType/bussinessType.vue b/src/views/basic/busType/bussinessType.vue
index 927411b..2e37a27 100644
--- a/src/views/basic/busType/bussinessType.vue
+++ b/src/views/basic/busType/bussinessType.vue
@@ -206,13 +206,13 @@ export default {
         storageCode: null,
         supplementOrderType: null,
         defaultUnit: null,
-        useDyCount: null,
+        useDyCount: false,
         expireTip: true,
         prefix: null,
         outToSpms: null,
         ullageFill: null,
-        scanPreIn: null,
-        vailInv: null,
+        scanPreIn: false,
+        vailInv: true,
         entrutSpms: null,
         codeFillCheck: null,
         defaultInv: null,
@@ -454,13 +454,13 @@ export default {
         storageCode: null,
         supplementOrderType: null,
         defaultUnit: null,
-        useDyCount: null,
+        useDyCount: false,
         expireTip: true,
         prefix: null,
         outToSpms: null,
         ullageFill: null,
-        scanPreIn: null,
-        vailInv: null,
+        scanPreIn: false,
+        vailInv: true,
         entrutSpms: null,
         codeFillCheck: null,
         defaultInv: null,
diff --git a/src/views/basic/business/stockOrder.vue b/src/views/basic/business/stockOrder.vue
index 5770792..dddcc94 100644
--- a/src/views/basic/business/stockOrder.vue
+++ b/src/views/basic/business/stockOrder.vue
@@ -140,7 +140,7 @@
 
         <el-table-column label="价格" prop="price"></el-table-column>
         <el-table-column label="生产企业" prop="ylqxzcrbarmc"></el-table-column>
-        <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh"></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>
 
       </el-table>
 
diff --git a/src/views/basic/product/UdiInfoSelectRel.vue b/src/views/basic/product/UdiInfoSelectRel.vue
index 89c57a5..efc61b2 100644
--- a/src/views/basic/product/UdiInfoSelectRel.vue
+++ b/src/views/basic/product/UdiInfoSelectRel.vue
@@ -34,10 +34,10 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item class="query-form-item" label="注册/备案凭证号:">
+              <el-form-item class="query-form-item" label="注册/备案号:">
                 <el-input v-model="erpQuery.registerNo"
                           clearable="true"
-                          placeholder="注册/备案凭证号"></el-input>
+                          placeholder="注册/备案号"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -101,7 +101,7 @@
           <el-table-column label="产品名称" prop="name" show-overflow-tooltip></el-table-column>
           <el-table-column label="计量单位" prop="measname" 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="registerNo" show-overflow-tooltip></el-table-column>
           <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
         </el-table>
         <pagination
@@ -178,12 +178,12 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item class="query-form-item" label="注册/备案凭证号:">
+              <el-form-item class="query-form-item" label="注册/备案号:">
                 <el-input
                   v-model="unionQuery.zczbhhzbapzbh"
                   clearable="true"
                   :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && (unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''))"
-                  placeholder="注册/备案凭证号"
+                  placeholder="注册/备案号"
                   size="mini"
                 ></el-input>
               </el-form-item>
diff --git a/src/views/basic/product/basicCompanyProductsImport.vue b/src/views/basic/product/basicCompanyProductsImport.vue
index b31140f..a758683 100644
--- a/src/views/basic/product/basicCompanyProductsImport.vue
+++ b/src/views/basic/product/basicCompanyProductsImport.vue
@@ -56,7 +56,7 @@
             <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
             <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
             <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
-            <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+            <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
             <el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
             <el-table-column label="配送企业" prop="supName" show-overflow-tooltip></el-table-column>
             <el-table-column width="60" label="操作" >
diff --git a/src/views/basic/product/bindHospProduct.vue b/src/views/basic/product/bindHospProduct.vue
index 44c87e6..0ea37a0 100644
--- a/src/views/basic/product/bindHospProduct.vue
+++ b/src/views/basic/product/bindHospProduct.vue
@@ -77,11 +77,11 @@
       <el-table v-loading="loading" :data="list" style="width: 100%;" @selection-change="handleSelectionChange" border key="1">
         <el-table-column type="selection" width="55" :selectable="selectable"></el-table-column>
         <el-table-column label="最小销售产品标识" prop="nameCode" width="140" show-overflow-tooltip></el-table-column>
-        <el-table-column label="主系统产品编码" prop="mainId" show-overflow-tooltip></el-table-column>
+        <el-table-column label="主系统编码" prop="mainId" show-overflow-tooltip></el-table-column>
         <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
         <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
-        <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
         <el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
       </el-table>
       <pagination
diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue
index 6e6c877..6fb7450 100644
--- a/src/views/basic/product/product.vue
+++ b/src/views/basic/product/product.vue
@@ -29,8 +29,8 @@
             </el-row>
             <el-row>
               <el-col :span="6">
-                <el-form-item class="query-form-item" label="产品编码:">
-                  <el-input v-model="filterQuery.unionCode" placeholder="DI/医保编码/商品条码"
+                <el-form-item class="query-form-item" label="最小销售标识:">
+                  <el-input v-model="filterQuery.unionCode" placeholder="最小销售标识"
                             style="width: 90%"
                             clearable="true"></el-input>
                 </el-form-item>
@@ -63,17 +63,16 @@
               </el-col>
             </el-row>
             <el-row>
-
               <el-col :span="6">
                 <el-form-item class="query-form-item" label="注册备案人:">
-                  <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产企业/注册备案人"
+                  <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="注册备案人"
                             style="width: 90%"
                             clearable="true"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item class="query-form-item" label="外部产品编码:">
-                  <el-input v-model="filterQuery.thrPiId" placeholder="第三方产品编码"
+                <el-form-item class="query-form-item" label="第三方编码:">
+                  <el-input v-model="filterQuery.thrPiId" placeholder="第三方主系统编码"
                             style="width: 90%"
                             clearable="true"></el-input>
                 </el-form-item>
@@ -97,6 +96,23 @@
                 </el-form-item>
               </el-col>
             </el-row>
+
+            <el-row>
+              <el-col :span="6">
+                <el-form-item class="query-form-item" label="注册/备案号:">
+                  <el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="注册/备案号"
+                            style="width: 90%"
+                            clearable="true"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item class="query-form-item" label="生产企业:">
+                  <el-input v-model="filterQuery.manufactory" placeholder="生产企业"
+                            style="width: 90%"
+                            clearable="true"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
           </el-form>
           <div class="top-right-btn">
             <el-button-group>
@@ -126,36 +142,39 @@
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
-              label="主系统产品编码"
+              label="主系统编码"
               prop="mainId"
+              width="120"
               show-overflow-tooltip
             ></el-table-column>
-            <el-table-column
-              label="生产企业"
-              prop="ylqxzcrbarmc"
-              show-overflow-tooltip
-            ></el-table-column>
+
             <el-table-column
               label="物资名称"
               prop="cpmctymc"
+              width="160"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               label="规格型号"
-              prop="ggxh"
+              prop="ggxh" width="160"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
-              label="注册/备案凭证"
-              prop="zczbhhzbapzbh"
+              label="注册/备案号"
+              prop="zczbhhzbapzbh" width="160"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
-              label="器械类别"
-              prop="qxlb"
+              label="生产企业"
+              prop="ylqxzcrbarmc" width="180"
               show-overflow-tooltip
             ></el-table-column>
-            <el-table-column width="200" label="操作">
+            <!--            <el-table-column-->
+            <!--              label="器械类别"-->
+            <!--              prop="qxlb"-->
+            <!--              show-overflow-tooltip-->
+            <!--            ></el-table-column>-->
+            <el-table-column width="180" label="操作" fixed="right">
               <template slot-scope="scope">
                 <el-button
                   type="text"
@@ -1204,7 +1223,7 @@ export default {
         filterType: null,
         dispatch: null,
         groupBuy: null,
-
+        zczbhhzbapzbh: null,
       },
       rId: null,
       selectUdiTypeVisible: false,
@@ -1235,7 +1254,7 @@ export default {
         allowNoBatch: null,
         allowNoExpire: null,
         allowNoProduct: null,
-        allowNoSerial:null,
+        allowNoSerial: null,
         pId: null,
       },
       defaultSys: null,
diff --git a/src/views/basic/product/udIInfoSelect.vue b/src/views/basic/product/udIInfoSelect.vue
index 54a18c1..4629889 100644
--- a/src/views/basic/product/udIInfoSelect.vue
+++ b/src/views/basic/product/udIInfoSelect.vue
@@ -77,7 +77,7 @@
             <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
             <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
             <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
-            <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+            <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
             <el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
             <el-table-column width="60" label="操作">
                 <template slot-scope="scope">
diff --git a/src/views/basic/product/udiInfoManageSp.vue b/src/views/basic/product/udiInfoManageSp.vue
index 95fecab..d112fae 100644
--- a/src/views/basic/product/udiInfoManageSp.vue
+++ b/src/views/basic/product/udiInfoManageSp.vue
@@ -107,7 +107,7 @@
         <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
         <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
-        <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
         <el-table-column label="物资分类" prop="classifyName" show-overflow-tooltip></el-table-column>
         <el-table-column
           v-if="isSpCombine"
diff --git a/src/views/basic/product/udiInfoselectErpUdi.vue b/src/views/basic/product/udiInfoselectErpUdi.vue
index caca9b7..aeb5cf3 100644
--- a/src/views/basic/product/udiInfoselectErpUdi.vue
+++ b/src/views/basic/product/udiInfoselectErpUdi.vue
@@ -1,552 +1,605 @@
 <template>
-    <div>
-        <el-card class="el-card">
-                <el-form  :model="erpQuery" label-width="120px" v-show="showSearch">
-                    <el-row>
-                      <el-col :span="6">
-                        <el-form-item label="物品编码:">
-                            <el-input v-model="erpQuery.code"style="width: 90%" placeholder="请输入物资编码/商品条码/医保编码" clearable="true" @keyup.enter.native="keyupErp_submit($event)"></el-input>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="6">
-                        <el-form-item label="产品名称:">
-                            <el-input v-model="erpQuery.name" style="width: 90%" placeholder="请输入产品名称" clearable="true" @keyup.enter.native="keyup_submit($event)"></el-input>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="6">
-                        <el-form-item label="规格型号:">
-                            <el-input v-model="erpQuery.spec" style="width: 90%" placeholder="请输入规格型号" clearable="true" @keyup.enter.native="keyupErp_submit($event)"></el-input>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="6">
-                        <el-form-item label="注册/备案号:">
-                            <el-input v-model="erpQuery.registerNo" style="width: 90%" clearable="true" placeholder="请输入注册/备案号" @keyup.enter.native="keyup_submit($event)"></el-input>
-                        </el-form-item>
-                      </el-col>
-                    </el-row>
-                  <el-row>
-                      <el-col :span="6">
-                        <el-form-item label="生产企业:">
-                            <el-input v-model="erpQuery.manufactory" style="width: 90%" clearable="true" placeholder="请输入生产企业" @keyup.enter.native="keyup_submit($event)"></el-input>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="6">
-                        <el-form-item label="配送企业:">
-                            <el-input v-model="erpQuery.supName" style="width: 90%" clearable="true" placeholder="请输入配送企业" @keyup.enter.native="keyup_submit($event)"></el-input>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="6">
-                        <el-form-item label="外部系统:">
-                            <el-select v-model="thirdSysFk" style="width: 90%" placeholder="请设置主系统" disabled="isImport">
-                                <el-option
-                                    v-for="item in thirdSys"
-                                    :key="item.value"
-                                    :label="item.thirdName"
-                                    :value="item.thirdId">
-                                    <span style="float: left">{{ item.thirdName }}</span>
-                                    <span
-                                        style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                      </el-col>
-                  </el-row>
-                </el-form>
-
-
-          <div class="top-right-btn">
-            <el-button-group style="display:flex;">
-              <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
-              <el-button type="primary" icon="search" @click="searchErpList">查询</el-button>
-              <el-button type="primary" icon="search" @click="combine" :loading="combineLoading">选入</el-button>
-              <el-button type="primary" icon="search" @click="combineAll" v-if="isImport  &&  !supEnable">结果全部选入</el-button>
-            </el-button-group>
-          </div>
-
-          <el-divider style="margin: 15px"></el-divider>
-
-                <el-table :data="erpList" style="width: 100%" highlight-current-row="true"  border
-                          v-loading="erpLloading" @current-change="handleErpChange" @selection-change="handleSelectionChange">
-                    <el-table-column v-if="isImport" type="selection" width="55"></el-table-column>
-                    <el-table-column label="序号" type="index"></el-table-column>
-                    <el-table-column label="物资编码" prop="code"></el-table-column>
-                    <el-table-column label="产品名称" prop="name"></el-table-column>
-                    <el-table-column label="计量单位" prop="measname"></el-table-column>
-                    <el-table-column label="规格型号" prop="spec"></el-table-column>
-                    <el-table-column label="注册/备案号" prop="registerNo"></el-table-column>
-                    <el-table-column label="生产企业" prop="manufactory"></el-table-column>
-                    <el-table-column label="配送企业" prop="supName"></el-table-column>
-                </el-table>
-          <pagination
-            v-show="pageTotal>0"
-            :total="pageTotal"
-            :page.sync="erpQuery.page"
-            :limit.sync="erpQuery.limit"
-            @pagination="handleErpPageChange"
-          ></pagination>
-        </el-card>
-
-        <el-card class="el-card" v-if="!isImport">
-          <el-form  label-width="120px">
-                <el-row>
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="产品名称:">
-                            <el-input style="width: 90%" size="small" splaceholder="请输入内容" :disabled="true" v-model="data.cpmctymc"></el-input>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="产品标识:">
-                            <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="data.nameCode"></el-input>
-                      </el-form-item>
-                    </el-col>
-                </el-row>
-
-                <el-row>
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="规格型号:">
-                            <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="data.ggxh"></el-input>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="医疗器械注册人:">
-                            <el-input style="width: 90%" :disabled="true" size="small" splaceholder="ylqxzcrbarmc" v-model="data.ylqxzcrbarmc"></el-input>
-                      </el-form-item>
-                    </el-col>
-                </el-row>
-
-                <el-row>
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="注册人英文名称:">
-                            <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="data.ylqxzcrbarywmc"></el-input>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="器械类别:">
-                            <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="data.qxlb"></el-input>
-                      </el-form-item>
-                    </el-col>
-                </el-row>
-
-                <el-row>
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="产品类别:">
-                            <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="data.cplb"></el-input>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="分类编码:">
-                            <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="data.flbm"></el-input>
-                      </el-form-item>
-                    </el-col>
-                </el-row>
-
-                <el-row >
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="商品条码:">
-                            <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="data.sptm"></el-input>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="医保编码:">
-                            <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="data.ybbm"></el-input>
-                      </el-form-item>
-                    </el-col>
-                </el-row>
-
-                <el-row>
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="统一社会信用号:">
-                            <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="data.tyshxydm"></el-input>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12" class="el-col">
-                      <el-form-item label="注册证/备案号:">
-                            <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="data.zczbhhzbapzbh"></el-input>
-                      </el-form-item>
-                    </el-col>
-                </el-row>
-          </el-form>
-        </el-card>
-    </div>
+  <div>
+    <el-card class="el-card">
+      <el-form :model="erpQuery" label-width="120px" v-show="showSearch">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="物品编码:">
+              <el-input v-model="erpQuery.code" style="width: 90%" placeholder="请输入物资编码/商品条码/医保编码" clearable="true"
+                        @keyup.enter.native="keyupErp_submit($event)"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="产品名称:">
+              <el-input v-model="erpQuery.name" style="width: 90%" placeholder="请输入产品名称" clearable="true"
+                        @keyup.enter.native="keyup_submit($event)"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="规格型号:">
+              <el-input v-model="erpQuery.spec" style="width: 90%" placeholder="请输入规格型号" clearable="true"
+                        @keyup.enter.native="keyupErp_submit($event)"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="注册/备案号:">
+              <el-input v-model="erpQuery.registerNo" style="width: 90%" clearable="true" placeholder="请输入注册/备案号"
+                        @keyup.enter.native="keyup_submit($event)"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="生产企业:">
+              <el-input v-model="erpQuery.manufactory" style="width: 90%" clearable="true" placeholder="请输入生产企业"
+                        @keyup.enter.native="keyup_submit($event)"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="配送企业:">
+              <el-input v-model="erpQuery.supName" style="width: 90%" clearable="true" placeholder="请输入配送企业"
+                        @keyup.enter.native="keyup_submit($event)"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="外部系统:">
+              <el-select v-model="thirdSysFk" style="width: 90%" placeholder="请设置主系统" disabled="isImport">
+                <el-option
+                  v-for="item in thirdSys"
+                  :key="item.value"
+                  :label="item.thirdName"
+                  :value="item.thirdId">
+                  <span style="float: left">{{ item.thirdName }}</span>
+                  <span
+                    style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+
+      <div class="top-right-btn">
+        <el-button-group style="display:flex;">
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button type="primary" icon="search" @click="searchErpList">查询</el-button>
+          <el-button type="primary" icon="search" @click="combine" :loading="combineLoading">选入</el-button>
+          <el-button type="primary" icon="search" @click="combineAll" v-if="isImport  &&  !supEnable">结果全部选入</el-button>
+        </el-button-group>
+      </div>
+
+      <el-divider style="margin: 15px"></el-divider>
+
+      <el-table :data="erpList" style="width: 100%" highlight-current-row="true" border
+                v-loading="erpLloading" @current-change="handleErpChange" @selection-change="handleSelectionChange">
+        <el-table-column v-if="isImport" type="selection" width="55"></el-table-column>
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="物资编码" prop="code"></el-table-column>
+        <el-table-column label="产品名称" prop="name"></el-table-column>
+        <el-table-column label="计量单位" prop="measname"></el-table-column>
+        <el-table-column label="规格型号" prop="spec"></el-table-column>
+        <el-table-column label="注册/备案号" prop="registerNo"></el-table-column>
+        <el-table-column label="生产企业" prop="manufactory"></el-table-column>
+        <el-table-column label="配送企业" prop="supName"></el-table-column>
+        <el-table-column label="操作" width="60">
+          <template slot-scope="scope">
+            <el-button type="text" @click.native.stop="detailDialog(scope.row)">详情</el-button>
+          </template>
+        </el-table-column>
+
+      </el-table>
+      <pagination
+        v-show="pageTotal>0"
+        :total="pageTotal"
+        :page.sync="erpQuery.page"
+        :limit.sync="erpQuery.limit"
+        @pagination="handleErpPageChange"
+      ></pagination>
+    </el-card>
+
+    <el-card class="el-card" v-if="!isImport">
+      <el-form label-width="120px">
+        <el-row>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="产品名称:">
+              <el-input style="width: 90%" size="small" splaceholder="请输入内容" :disabled="true"
+                        v-model="data.cpmctymc"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="产品标识:">
+              <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容"
+                        v-model="data.nameCode"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="规格型号:">
+              <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容"
+                        v-model="data.ggxh"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="医疗器械注册人:">
+              <el-input style="width: 90%" :disabled="true" size="small" splaceholder="ylqxzcrbarmc"
+                        v-model="data.ylqxzcrbarmc"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="注册人英文名称:">
+              <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容"
+                        v-model="data.ylqxzcrbarywmc"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="器械类别:">
+              <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容"
+                        v-model="data.qxlb"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="产品类别:">
+              <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容"
+                        v-model="data.cplb"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="分类编码:">
+              <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容"
+                        v-model="data.flbm"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="商品条码:">
+              <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容"
+                        v-model="data.sptm"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="医保编码:">
+              <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容"
+                        v-model="data.ybbm"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="统一社会信用号:">
+              <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容"
+                        v-model="data.tyshxydm"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="注册证/备案号:">
+              <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容"
+                        v-model="data.zczbhhzbapzbh"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
+
+    <el-dialog
+      title="产品信息详情"
+      :visible.sync="thrProductsDetailVisible"
+      width="60%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      append-to-body
+      v-if="thrProductsDetailVisible"
+    >
+      <thrProductsDetail
+        :data="thisData"
+      ></thrProductsDetail>
+    </el-dialog>
+
+  </div>
 
 </template>
 
 <script>
-import {modifyRel, addErp, addAllErp,combineUdi} from "@/api/basic/udiRelevance";
+import {modifyRel, addErp, addAllErp, combineUdi} from "@/api/basic/udiRelevance";
 import {getInvbasdoc} from "@/api/basic/getErps";
 import {getBasicThirdSys} from "@/api/basic/basicThirdSys";
+import thrProductsDetail from "../../thirdSys/product/thrProductsDetail";
 
 export default {
-    name: "closeDialog",
-    props: {
-        uuid: {
-            type: Object,
-            required: true,
-        },
-
-        data: {
-            type: Object,
-            required: true,
-        },
-
-        relId: {
-            type: Number,
-            required: true,
-        },
-
-        isImport: {
-            type: Boolean,
-            required: true,
-        },
-
-        closeDialog: {
-            type: Function,
-            required: true,
-        },
-        defaultSys: {
-            type: Object,
-            required: true,
-        },
-        supEnable: {
-            type: Object,
-            required: true,
-        },
-        intentThirdId: {
-            type: Object,
-            required: true,
-        }
+  name: "closeDialog",
+  props: {
+    uuid: {
+      type: Object,
+      required: true,
+    },
 
+    data: {
+      type: Object,
+      required: true,
     },
 
-    data() {
-        return {
-          showSearch: true,
-            erpQuery: {
-                code: null,
-                name: null,
-                spec: null,
-                registerNo: null,
-                manufactory: null,
-                thirdSys: null,
-                supName: null,
-                measname: null,
-                page: 1,
-                limit: 10,
-
-            },
-            combineLoading: false,
-            combineQuery: {
-                thirdId: "",
-                relId: "",
-                erpName: "",
-                keys: [],
-                thirdIds: [],
-                thirdSys: null,
-                query: null,
-                isRlInv: null,
-                manufactory: null,
-                measname: null,
-                ybbm: null,
-                sptm: null,
-            },
-
-            udidlList: [],
-            erpList: [],
-            pageTotal: 1,
-            total: 1,
-            currentRow: null,
-            loading: false,
-            erpLloading: false,
-            multipleUdiSelection: [],
-            thirdSys: [],
-            thirdSysFk: null,
-        };
+    relId: {
+      type: Number,
+      required: true,
+    },
+
+    isImport: {
+      type: Boolean,
+      required: true,
+    },
+
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    defaultSys: {
+      type: Object,
+      required: true,
+    },
+    supEnable: {
+      type: Object,
+      required: true,
+    },
+    intentThirdId: {
+      type: Object,
+      required: true,
+    }
+
+  },
+
+  data() {
+    return {
+      showSearch: true,
+      erpQuery: {
+        code: null,
+        name: null,
+        spec: null,
+        registerNo: null,
+        manufactory: null,
+        thirdSys: null,
+        supName: null,
+        measname: null,
+        page: 1,
+        limit: 10,
+
+      },
+      thisData: null,
+      thrProductsDetailVisible: false,
+      combineLoading: false,
+      combineQuery: {
+        thirdId: "",
+        relId: "",
+        erpName: "",
+        keys: [],
+        thirdIds: [],
+        thirdSys: null,
+        query: null,
+        isRlInv: null,
+        manufactory: null,
+        measname: null,
+        ybbm: null,
+        sptm: null,
+      },
+
+      udidlList: [],
+      erpList: [],
+      pageTotal: 1,
+      total: 1,
+      currentRow: null,
+      loading: false,
+      erpLloading: false,
+      multipleUdiSelection: [],
+      thirdSys: [],
+      thirdSysFk: null,
+    };
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.erpQuery = {
+        code: null,
+        name: null,
+        spec: null,
+        registerNo: null,
+        manufactory: null,
+        thirdSys: null,
+        supName: null,
+        measname: null,
+        page: 1,
+        limit: 10,
+      };
+      this.getErpList();
+    },
+    tableRowClassName({row}) {
+      if (row.checked) return "warning-row";
+      return "";
+    },
+
+    detailDialog(row) {
+      this.thisData = row;
+      this.thrProductsDetailVisible = true;
+    },
+
+    checkSelectable(row) {
+      return !row.checked;
+    },
+    handleCurrentChange(val) {
+      this.unionQuery.page = val;
+      this.getList();
+    },
+    handleErpChange(val) {
+      console.log(val);
+      this.currentRow = val;
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    handleErpPageChange(val) {
+      this.erpQuery.page = val.page;
+      this.getErpList();
+    },
+
+    searchErpList() {
+      this.erpQuery.page = 1;
+      this.getErpList();
     },
-    methods: {
-        onReset() {
-            this.$router.push({
-                path: "",
-            });
-            this.erpQuery = {
-                code: null,
-                name: null,
-                spec: null,
-                registerNo: null,
-                manufactory: null,
-                thirdSys: null,
-                supName: null,
-                measname: null,
-                page: 1,
-                limit: 10,
-            };
-            this.getErpList();
-        },
-        tableRowClassName({row}) {
-            if (row.checked) return "warning-row";
-            return "";
-        },
-        checkSelectable(row) {
-            return !row.checked;
-        },
-        handleCurrentChange(val) {
-            this.unionQuery.page = val;
-            this.getList();
-        },
-        handleErpChange(val) {
-            console.log(val);
-            this.currentRow = val;
-        },
-        hideSearch() {
-          this.showSearch = !this.showSearch;
-        },
-        handleErpPageChange(val) {
-            this.erpQuery.page = val.page;
-            this.getErpList();
-        },
-
-        searchErpList() {
-            this.erpQuery.page = 1;
-            this.getErpList();
-        },
-
-        keyup_submit(event) {
-
-            this.erpQuery.page = 1;
-            this.getErpList();
-            event.target.select();
-        },
-        getErpList() {
-            this.erplLoading = true;
-            this.erpQuery.thirdSys = this.thirdSysFk;
-            getInvbasdoc(this.erpQuery)
-                .then((response) => {
-                    this.erplLoading = false;
-                    if (response.code == 20000) {
-                        this.erpList = response.data.list || [];
-                        this.pageTotal = response.data.total || 0;
-                    } else {
-                        this.$message.error(response.message);
-                        this.erpList = [];
-                        this.pageTotal = 0;
-                    }
-                })
-                .catch(() => {
-                    this.erplLoading = false;
-                    this.erpList = [];
-                    this.pageTotal = 0;
-                });
-        },
-        intentBack() {
-            this.closeDialog();
-        },
 
-        combineAll() {
+    keyup_submit(event) {
+
+      this.erpQuery.page = 1;
+      this.getErpList();
+      event.target.select();
+    },
+    getErpList() {
+      this.erplLoading = true;
+      this.erpQuery.thirdSys = this.thirdSysFk;
+      getInvbasdoc(this.erpQuery)
+        .then((response) => {
+          this.erplLoading = false;
+          if (response.code == 20000) {
+            this.erpList = response.data.list || [];
+            this.pageTotal = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
+            this.erpList = [];
+            this.pageTotal = 0;
+          }
+        })
+        .catch(() => {
+          this.erplLoading = false;
+          this.erpList = [];
+          this.pageTotal = 0;
+        });
+    },
+    intentBack() {
+      this.closeDialog();
+    },
 
-            this.$confirm("此操作将在后台自动下载所有查询结果, 是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
+    combineAll() {
+
+      this.$confirm("此操作将在后台自动下载所有查询结果, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.combineQuery.thirdSys = this.thirdSysFk;
+          this.combineQuery.query = this.erpQuery;
+          addAllErp(this.combineQuery)
+            .then((response) => {
+              if (response.code == 20000) {
+                this.$message.success(response.data);
+                this.$emit("closeUdi", true);
+              } else {
+                this.$message.error(response.message);
+                this.$emit("closeUdi", false);
+              }
             })
-                .then(() => {
-                    this.combineQuery.thirdSys = this.thirdSysFk;
-                    this.combineQuery.query = this.erpQuery;
-                    addAllErp(this.combineQuery)
-                        .then((response) => {
-                            if (response.code == 20000) {
-                                this.$message.success(response.data);
-                                this.$emit("closeUdi", true);
-                            } else {
-                                this.$message.error(response.message);
-                                this.$emit("closeUdi", false);
-                            }
-                        })
-                        .catch(() => {
-                            this.$emit("closeUdi", false);
-                        });
-                })
-                .catch(() => {
-                });
+            .catch(() => {
+              this.$emit("closeUdi", false);
+            });
+        })
+        .catch(() => {
+        });
+
 
+    },
 
-        },
+    combine() {
+      this.combineQuery.query = null;
+      this.combineQuery.relId = this.relId;
+      this.combineQuery.thirdSys = this.thirdSysFk;
+      this.combineQuery.supEnable = this.supEnable;
+      if (this.isImport) {
+        this.combineQuery.thirdId = null;
+        let selectData = this.multipleUdiSelection;
+        let selected = '';
+        selectData.forEach((row) => {
+
+          if (row.checked) {
+            selected = selected + row.code + ",";
+          }
+          this.combineQuery.thirdIds.push(row.code);
+          this.combineQuery.manufactory = row.manufactory;
+          this.combineQuery.measname = row.measname;
+
+        });
+        if (this.currentRow != null) {
+          this.combineQuery.manufactory = this.currentRow.manufactory;
+          this.combineQuery.measname = this.currentRow.measname;
+        }
 
-        combine() {
-            this.combineQuery.query = null;
-            this.combineQuery.relId = this.relId;
-            this.combineQuery.thirdSys = this.thirdSysFk;
-            this.combineQuery.supEnable = this.supEnable;
-            if (this.isImport) {
-                this.combineQuery.thirdId = null;
-                let selectData = this.multipleUdiSelection;
-                let selected = '';
-                selectData.forEach((row) => {
 
-                    if (row.checked) {
-                        selected = selected + row.code + ",";
-                    }
-                    this.combineQuery.thirdIds.push(row.code);
-                    this.combineQuery.manufactory = row.manufactory;
-                    this.combineQuery.measname = row.measname;
+        if (selectData.length == 0) {
+          this.$message.warning("未选择产品");
+          return;
+        }
+        if (selected != '') {
+          this.$confirm("物资编码：" + selected + "已被添加,是否继续添加", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+            .then(() => {
+              this.combineLoading = true;
+              combineUdi(this.combineQuery)
+                .then((response) => {
+                  this.combineLoading = false;
+                  if (response.code == 20000) {
+                    this.$emit("closeUdi", true);
+                    this.$message.success(response.data);
+                  } else {
+                    this.$message.error(response.message);
+                  }
+                })
+                .catch(() => {
+                  this.combineLoading = false;
+                  this.combineQuery.thirdIds = [];
+                  this.$emit("closeUdi", false);
 
                 });
-                if (this.currentRow != null) {
-                    this.combineQuery.manufactory = this.currentRow.manufactory;
-                    this.combineQuery.measname = this.currentRow.measname;
-                }
-
-
-                if (selectData.length == 0) {
-                    this.$message.warning("未选择产品");
-                    return;
-                }
-                if (selected != '') {
-                    this.$confirm("物资编码：" + selected + "已被添加,是否继续添加", "提示", {
-                        confirmButtonText: "确定",
-                        cancelButtonText: "取消",
-                        type: "warning",
-                    })
-                        .then(() => {
-                            this.combineLoading = true;
-                            combineUdi(this.combineQuery)
-                                .then((response) => {
-                                    this.combineLoading = false;
-                                    if (response.code == 20000) {
-                                        this.$emit("closeUdi", true);
-                                        this.$message.success(response.data);
-                                    } else {
-                                        this.$message.error(response.message);
-                                    }
-                                })
-                                .catch(() => {
-                                    this.combineLoading = false;
-                                    this.combineQuery.thirdIds = [];
-                                    this.$emit("closeUdi", false);
-
-                                });
-                        })
-                        .catch(() => {
-                            this.combineQuery.thirdIds = [];
-                        });
-                } else {
-                    combineUdi(this.combineQuery)
-                        .then((response) => {
-                            this.combineLoading = false;
-                            if (response.code == 20000) {
-                                this.$emit("closeUdi", true);
-                                this.$message.success(response.data);
-                            } else {
-                                this.$emit("closeUdi", false);
-                                this.$message.warning(response.message);
-                            }
-                        })
-                        .catch(() => {
-                            this.combineLoading = false;
-                            this.$emit("closeUdi", false);
-                        });
-                }
-
-            } else {
-                this.combineQuery.thirdId = this.currentRow.code;
-                this.combineQuery.erpName = this.currentRow.name;
-                this.combineQuery.manufactory = this.currentRow.manufactory;
-                this.combineQuery.measname = this.currentRow.measname;
-                this.combineQuery.ybbm = this.currentRow.ybbm;
-                this.combineQuery.sptm = this.currentRow.sptm;
-                this.erpQuery.manufactory = this.currentRow.manufactory;
-                this.erpQuery.measname = this.currentRow.measname;
-                this.combineQuery.price = this.currentRow.price;
-
-
-                if (this.currentRow.checked) {
-
-                    this.$confirm("物资编码：" + this.currentRow.code + "已被选入,是否继续选入", "提示", {
-                        confirmButtonText: "确定",
-                        cancelButtonText: "取消",
-                        type: "warning",
-                    })
-                        .then(() => {
-                            this.combineLoading = true;
-                            modifyRel(this.combineQuery)
-                                .then((response) => {
-                                    this.combineLoading = false;
-                                    if (response.code == 20000) {
-                                        this.$emit("closeUdi", true);
-                                    } else {
-                                        this.$emit("closeUdi", false);
-                                        this.$message.error(response.message);
-                                    }
-                                })
-                                .catch(() => {
-                                    this.combineLoading = false;
-                                    this.$emit("closeUdi", false);
-                                });
-                        })
-                } else {
-                    this.combineLoading = true;
-                    modifyRel(this.combineQuery)
-                        .then((response) => {
-                            this.combineLoading = false;
-                            if (response.code == 20000) {
-                                this.$emit("closeUdi", true);
-                            } else {
-                                this.$emit("closeUdi", false);
-                                this.$message.error(response.message);
-                            }
-                        })
-                        .catch(() => {
-                            this.combineLoading = false;
-                            this.$emit("closeUdi", false);
-                        });
-                }
-
-            }
-        },
-
-        handleSelectionChange(val) {
-            console.log("----" + val);
-            this.multipleUdiSelection = val;
-        },
-        getBasicThirdSys() {
-            let query = {
-                enabled: true,
-                mainSys: false,
-                filter: true,
-            };
-            if (this.isImport) {
-                query.mainSys = true;
-            }
-            getBasicThirdSys(query)
-                .then((response) => {
-                    this.thirdSys = response.data.list || [];
-                    this.thirdSysFk = this.thirdSys[0].thirdId;
-                    if (this.defaultSys != null) {
-                        this.thirdSysFk = this.defaultSys;
-                    }
-                    this.searchErpList();
+            })
+            .catch(() => {
+              this.combineQuery.thirdIds = [];
+            });
+        } else {
+          combineUdi(this.combineQuery)
+            .then((response) => {
+              this.combineLoading = false;
+              if (response.code == 20000) {
+                this.$emit("closeUdi", true);
+                this.$message.success(response.data);
+              } else {
+                this.$emit("closeUdi", false);
+                this.$message.warning(response.message);
+              }
+            })
+            .catch(() => {
+              this.combineLoading = false;
+              this.$emit("closeUdi", false);
+            });
+        }
 
+      } else {
+        this.combineQuery.thirdId = this.currentRow.code;
+        this.combineQuery.erpName = this.currentRow.name;
+        this.combineQuery.manufactory = this.currentRow.manufactory;
+        this.combineQuery.measname = this.currentRow.measname;
+        this.combineQuery.ybbm = this.currentRow.ybbm;
+        this.combineQuery.sptm = this.currentRow.sptm;
+        this.erpQuery.manufactory = this.currentRow.manufactory;
+        this.erpQuery.measname = this.currentRow.measname;
+        this.combineQuery.price = this.currentRow.price;
+
+
+        if (this.currentRow.checked) {
+
+          this.$confirm("物资编码：" + this.currentRow.code + "已被选入,是否继续选入", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+            .then(() => {
+              this.combineLoading = true;
+              modifyRel(this.combineQuery)
+                .then((response) => {
+                  this.combineLoading = false;
+                  if (response.code == 20000) {
+                    this.$emit("closeUdi", true);
+                  } else {
+                    this.$emit("closeUdi", false);
+                    this.$message.error(response.message);
+                  }
                 })
                 .catch(() => {
-                    this.loading = false;
-                    this.list = [];
+                  this.combineLoading = false;
+                  this.$emit("closeUdi", false);
                 });
-        },
+            })
+        } else {
+          this.combineLoading = true;
+          modifyRel(this.combineQuery)
+            .then((response) => {
+              this.combineLoading = false;
+              if (response.code == 20000) {
+                this.$emit("closeUdi", true);
+              } else {
+                this.$emit("closeUdi", false);
+                this.$message.error(response.message);
+              }
+            })
+            .catch(() => {
+              this.combineLoading = false;
+              this.$emit("closeUdi", false);
+            });
+        }
+
+      }
     },
-    created() {
-        console.log("-------------" + this.uuid);
-        this.getBasicThirdSys();
-        this.erpQuery.code = this.intentThirdId;
 
+    handleSelectionChange(val) {
+      console.log("----" + val);
+      this.multipleUdiSelection = val;
+    },
+    getBasicThirdSys() {
+      let query = {
+        enabled: true,
+        mainSys: false,
+        filter: true,
+      };
+      if (this.isImport) {
+        query.mainSys = true;
+      }
+      getBasicThirdSys(query)
+        .then((response) => {
+          this.thirdSys = response.data.list || [];
+          this.thirdSysFk = this.thirdSys[0].thirdId;
+          if (this.defaultSys != null) {
+            this.thirdSysFk = this.defaultSys;
+          }
+          this.searchErpList();
+
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+        });
     },
+  },
+
+  components: {
+    thrProductsDetail
+  },
+
+  created() {
+    console.log("-------------" + this.uuid);
+    this.getBasicThirdSys();
+    this.erpQuery.code = this.intentThirdId;
+
+  },
 };
 </script>
 
 <style scoped>
 
 div /deep/ .el-table .warning-row {
-    background: #bebebe;
+  background: #bebebe;
 }
 
 div /deep/ .el-table .success-row {
-    background: #ffffff;
+  background: #ffffff;
 }
 </style>
diff --git a/src/views/basic/product/unbindHospProduct.vue b/src/views/basic/product/unbindHospProduct.vue
index 1aadfee..252bea9 100644
--- a/src/views/basic/product/unbindHospProduct.vue
+++ b/src/views/basic/product/unbindHospProduct.vue
@@ -77,11 +77,11 @@
       <el-table v-loading="loading" :data="list" style="width: 100%;" @selection-change="handleSelectionChange"  border key="1">
         <el-table-column type="selection" width="55" ></el-table-column>
         <el-table-column label="最小销售产品标识" prop="nameCode" width="140" show-overflow-tooltip></el-table-column>
-        <el-table-column label="主系统产品编码" prop="mainId" show-overflow-tooltip></el-table-column>
+        <el-table-column label="主系统编码" prop="mainId" show-overflow-tooltip></el-table-column>
         <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
         <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
-        <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
         <el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
       </el-table>
       <pagination
diff --git a/src/views/diSearch/udiInfoSearch.vue b/src/views/diSearch/udiInfoSearch.vue
index 31fa4ea..46793bb 100644
--- a/src/views/diSearch/udiInfoSearch.vue
+++ b/src/views/diSearch/udiInfoSearch.vue
@@ -204,7 +204,7 @@
 
             <el-row>
               <el-col :span="12" class="el-col">
-                <el-form-item label="包装单位/包装级别:">
+                <el-form-item label="包装级别:">
                   <el-input style="width: 90%" size="small" splaceholder="请输入内容" v-model="editQuery.bzcj" :disabled="true"></el-input>
                 </el-form-item>
               </el-col>
diff --git a/src/views/inout/DialogCheck.vue b/src/views/inout/DialogCheck.vue
index dab9d10..dcf016c 100644
--- a/src/views/inout/DialogCheck.vue
+++ b/src/views/inout/DialogCheck.vue
@@ -57,7 +57,7 @@
         <el-row>
           <el-col :span="3">
             <div class="ao-text">
-              <span>生产厂家：</span>
+              <span>生产企业：</span>
             </div>
           </el-col>
           <el-col :span="8">
diff --git a/src/views/inout/DialogSelectProduct.vue b/src/views/inout/DialogSelectProduct.vue
index 366e650..6481913 100644
--- a/src/views/inout/DialogSelectProduct.vue
+++ b/src/views/inout/DialogSelectProduct.vue
@@ -101,7 +101,7 @@
           show-overflow-tooltip
         ></el-table-column>
         <el-table-column
-          label="注册/备案凭证"
+          label="注册/备案号"
           prop="zczbhhzbapzbh"
           show-overflow-tooltip
         ></el-table-column>
diff --git a/src/views/inout/DialogSelectRl.vue b/src/views/inout/DialogSelectRl.vue
index 7f0d15a..059e777 100644
--- a/src/views/inout/DialogSelectRl.vue
+++ b/src/views/inout/DialogSelectRl.vue
@@ -35,7 +35,7 @@
         show-overflow-tooltip
       ></el-table-column>
       <el-table-column
-        label="注册/备案凭证"
+        label="注册/备案号"
         prop="zczbhhzbapzbh"
         show-overflow-tooltip
       ></el-table-column>
diff --git a/src/views/inout/DialogThrReviewOrder.vue b/src/views/inout/DialogThrReviewOrder.vue
index 6d50f6a..5cb5815 100644
--- a/src/views/inout/DialogThrReviewOrder.vue
+++ b/src/views/inout/DialogThrReviewOrder.vue
@@ -106,7 +106,7 @@
         <el-table-column label="价格" width="120" prop="price"></el-table-column>
         <el-table-column width="100" label="计量单位" prop="measname">
         </el-table-column>
-        <el-table-column label="注册/备案凭证号" width="150" prop="certCode"></el-table-column>
+        <el-table-column label="注册/备案号" width="150" prop="certCode"></el-table-column>
 
         <el-table-column label="销售清单号（第二票）" width="180" prop="secSalesListNo">
         </el-table-column>
diff --git a/src/views/inout/IoSupAduitOrder.vue b/src/views/inout/IoSupAduitOrder.vue
index 9d091be..2690147 100644
--- a/src/views/inout/IoSupAduitOrder.vue
+++ b/src/views/inout/IoSupAduitOrder.vue
@@ -248,7 +248,7 @@
           <el-table-column width="100" label="计量单位" prop="measname">
           </el-table-column>
           <el-table-column
-            label="生产厂家"
+            label="生产企业"
             prop="manufacturer"
             width="160"
             show-overflow-tooltip
diff --git a/src/views/inventory/DeviceReceiveOrderAudit.vue b/src/views/inventory/DeviceReceiveOrderAudit.vue
index 9f79a0c..0da2a3c 100644
--- a/src/views/inventory/DeviceReceiveOrderAudit.vue
+++ b/src/views/inventory/DeviceReceiveOrderAudit.vue
@@ -107,7 +107,7 @@
         <el-table-column label="领用日期" prop="createTime" width="150"></el-table-column>
         <el-table-column label="生产日期" prop="productionDate" width="150"></el-table-column>
         <el-table-column label="失效日期" prop="expireDate" width="150"></el-table-column>
-        <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh"
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"
                          show-overflow-tooltip></el-table-column>
         <el-table-column  label="生产企业" prop="ylqxzcrbarmc"
                          show-overflow-tooltip></el-table-column>
diff --git a/src/views/inventory/DeviceReceiveOrderModify.vue b/src/views/inventory/DeviceReceiveOrderModify.vue
index c292676..68ccf52 100644
--- a/src/views/inventory/DeviceReceiveOrderModify.vue
+++ b/src/views/inventory/DeviceReceiveOrderModify.vue
@@ -183,7 +183,7 @@
           <el-table-column label="生产日期(yyMMdd)" prop="productionDate"></el-table-column>
           <el-table-column label="失效日期(yyMMdd)" prop="expireDate"
                            show-overflow-tooltip></el-table-column>
-          <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh"
+          <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"
                            show-overflow-tooltip></el-table-column>
           <el-table-column label="生产企业" prop="ylqxzcrbarmc"
                            show-overflow-tooltip></el-table-column>
diff --git a/src/views/inventory/InvCountOrderModify.vue b/src/views/inventory/InvCountOrderModify.vue
index 6b58668..1a436d1 100644
--- a/src/views/inventory/InvCountOrderModify.vue
+++ b/src/views/inventory/InvCountOrderModify.vue
@@ -122,7 +122,7 @@
           <el-table-column width="150" label="盘点数量" prop="countNum"></el-table-column>
           <el-table-column label="生产日期(yyMMdd)" prop="produceDate"></el-table-column>
           <el-table-column label="失效日期(yyMMdd)" prop="expireDate" show-overflow-tooltip></el-table-column>
-          <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+          <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
           <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
           <el-table-column label="操作">
             <template slot-scope="scope">
diff --git a/src/views/inventory/InvMAOrderAudit.vue b/src/views/inventory/InvMAOrderAudit.vue
index 4071c94..36cd07e 100644
--- a/src/views/inventory/InvMAOrderAudit.vue
+++ b/src/views/inventory/InvMAOrderAudit.vue
@@ -116,7 +116,7 @@
         <el-table-column width="150" label="生产日期(yyMMdd)" prop="productionDate"></el-table-column>
         <el-table-column width="160" label="失效日期(yyMMdd)" prop="expireDate"
                          show-overflow-tooltip></el-table-column>
-        <el-table-column width="250" label="注册/备案凭证号" prop="zczbhhzbapzbh"
+        <el-table-column width="250" label="注册/备案号" prop="zczbhhzbapzbh"
                          show-overflow-tooltip></el-table-column>
         <el-table-column width="200" label="生产企业" prop="ylqxzcrbarmc"
                          show-overflow-tooltip></el-table-column>
diff --git a/src/views/inventory/InvMAOrderCompleted.vue b/src/views/inventory/InvMAOrderCompleted.vue
index d5471c4..de2a67b 100644
--- a/src/views/inventory/InvMAOrderCompleted.vue
+++ b/src/views/inventory/InvMAOrderCompleted.vue
@@ -99,9 +99,9 @@
         <el-table-column width="150" label="生产日期(yyMMdd)" prop="productionDate"></el-table-column>
         <el-table-column width="160" label="失效日期(yyMMdd)" prop="expireDate"
                          show-overflow-tooltip></el-table-column>
-        <el-table-column width="250" label="注册/备案凭证号" prop="zczbhhzbapzbh"
+        <el-table-column width="250" label="注册/备案号" prop="zczbhhzbapzbh"
                          show-overflow-tooltip></el-table-column>
-        <el-table-column width="200" label="生产厂家" prop="ylqxzcrbarmc"
+        <el-table-column width="200" label="生产企业" prop="ylqxzcrbarmc"
                          show-overflow-tooltip></el-table-column>
       </el-table>
 
diff --git a/src/views/inventory/inner/innerOrder.vue b/src/views/inventory/inner/innerOrder.vue
index f911a5e..e080ee3 100644
--- a/src/views/inventory/inner/innerOrder.vue
+++ b/src/views/inventory/inner/innerOrder.vue
@@ -73,7 +73,7 @@
     <el-card class="el-card">
       <el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row>
         <el-table-column label="序号" type="index" width="120"></el-table-column>
-        <el-table-column label="产品编码" prop="productId"></el-table-column>
+        <el-table-column label="物资编码" prop="productId"></el-table-column>
         <el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="批次号" prop="batchNo" show-overflow-tooltip="true"></el-table-column>
diff --git a/src/views/inventory/inner/innerOrderSelectProduct.vue b/src/views/inventory/inner/innerOrderSelectProduct.vue
index a2d2186..56f2148 100644
--- a/src/views/inventory/inner/innerOrderSelectProduct.vue
+++ b/src/views/inventory/inner/innerOrderSelectProduct.vue
@@ -62,7 +62,7 @@
                     <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc"></el-table-column>
                     <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
                     <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
-                    <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+                    <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
                     <el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
                     <el-table-column label="配送企业" prop="companyName" show-overflow-tooltip></el-table-column>
                     <el-table-column label="操作"  width="160">
diff --git a/src/views/inventory/trace/invUdiTraceOrder.vue b/src/views/inventory/trace/invUdiTraceOrder.vue
index c6e9899..810f83e 100644
--- a/src/views/inventory/trace/invUdiTraceOrder.vue
+++ b/src/views/inventory/trace/invUdiTraceOrder.vue
@@ -169,7 +169,7 @@
           :show-overflow-tooltip="true"
         ></el-table-column>
         <el-table-column
-          label="注册/备案凭证号"
+          label="注册/备案号"
           prop="certCode"
           :show-overflow-tooltip="true"
         ></el-table-column>
diff --git a/src/views/inventory/trace/sickerUdiTraceOrder.vue b/src/views/inventory/trace/sickerUdiTraceOrder.vue
index 252f5c7..612f11e 100644
--- a/src/views/inventory/trace/sickerUdiTraceOrder.vue
+++ b/src/views/inventory/trace/sickerUdiTraceOrder.vue
@@ -116,7 +116,7 @@
           :show-overflow-tooltip="true"
         ></el-table-column>
         <el-table-column
-          label="注册/备案凭证号"
+          label="注册/备案号"
           prop="zczbhhzbapzbh"
           :show-overflow-tooltip="true"
         ></el-table-column>
diff --git a/src/views/purchase/company/basicSelectSingleProducts.vue b/src/views/purchase/company/basicSelectSingleProducts.vue
index 072b63a..8c918b2 100644
--- a/src/views/purchase/company/basicSelectSingleProducts.vue
+++ b/src/views/purchase/company/basicSelectSingleProducts.vue
@@ -56,7 +56,7 @@
           <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
           <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
           <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
-          <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+          <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
           <el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
           <el-table-column width="60" label="操作" >
             <template slot-scope="scope">
@@ -325,7 +325,7 @@ export default {
                 isUseDy: false,
             },
 
-            replTitle: "产品信息补齐:",
+            replTitle: "物资字典信息补齐:",
             isImport: false,
             isImportUdi: false,
             isUploadSmp: false,
@@ -435,7 +435,7 @@ export default {
         selectExport() {
             var selectData = this.multipleSelection;
             if (selectData == null || selectData.length == 0) {
-                this.$message.warning("请先选入产品！");
+                this.$message.warning("请先选入物资字典信息！");
                 return;
             }
             this.closeSelDialog(selectData[0].id);
diff --git a/src/views/purchase/company/companyProducts.vue b/src/views/purchase/company/companyProducts.vue
index 818d488..a460531 100644
--- a/src/views/purchase/company/companyProducts.vue
+++ b/src/views/purchase/company/companyProducts.vue
@@ -348,7 +348,7 @@ export default {
     selectExport() {
       var selectData = this.multipleSelection;
       if (selectData == null) {
-        this.$message.warning("请先选入产品！");
+        this.$message.warning("请先选入物资字典信息！");
         return;
       }
       this.closeSelDialog(selectData.id);
diff --git a/src/views/purchase/product/supProductEditDialog.vue b/src/views/purchase/product/supProductEditDialog.vue
index 1206c50..be0bb73 100644
--- a/src/views/purchase/product/supProductEditDialog.vue
+++ b/src/views/purchase/product/supProductEditDialog.vue
@@ -15,7 +15,7 @@
             icon="search"
             v-if="inputQuery.auditStatus == 0"
             @click="selectProduct()"
-          >选入产品
+          >选入物资字典
           </el-button
           >
           <el-button
@@ -376,7 +376,7 @@
 
 
     <el-dialog
-      title="选入产品"
+      title="选入物资字典信息"
       :visible.sync="selectSingleProductVisible"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
diff --git a/src/views/purchase/purApply/purApply.vue b/src/views/purchase/purApply/purApply.vue
index 06a4e8a..9c8f8ee 100644
--- a/src/views/purchase/purApply/purApply.vue
+++ b/src/views/purchase/purApply/purApply.vue
@@ -83,7 +83,7 @@
                 <el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="申购数量" prop="count"></el-table-column>
-                <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="供应商" prop="supName" show-overflow-tooltip="true"></el-table-column>
diff --git a/src/views/purchase/purApply/purApplyProducts.vue b/src/views/purchase/purApply/purApplyProducts.vue
index b25b81e..98f2731 100644
--- a/src/views/purchase/purApply/purApplyProducts.vue
+++ b/src/views/purchase/purApply/purApplyProducts.vue
@@ -56,7 +56,7 @@
             <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
             <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
             <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
-            <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+            <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
             <el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
             <el-table-column width="60" label="操作" >
                 <template slot-scope="scope">
@@ -435,7 +435,7 @@ export default {
         selectExport() {
             var selectData = this.multipleSelection;
           if (selectData == null || selectData.length == 0) {
-            this.$message.warning("请先选入产品！");
+            this.$message.warning("请先选入物资字典信息！");
             return;
           }
           this.closeSelDialog(selectData[0].id);
diff --git a/src/views/purchase/purApply/purOrderSelectProduct.vue b/src/views/purchase/purApply/purOrderSelectProduct.vue
index 7c8be12..f774196 100644
--- a/src/views/purchase/purApply/purOrderSelectProduct.vue
+++ b/src/views/purchase/purApply/purOrderSelectProduct.vue
@@ -62,7 +62,7 @@
                     <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc"></el-table-column>
                     <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
                     <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
-                    <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+                    <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
                     <el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
                     <el-table-column label="配送企业" prop="companyName" show-overflow-tooltip></el-table-column>
                     <el-table-column label="操作"  width="160">
diff --git a/src/views/purchase/purApply/pureApplyAudit.vue b/src/views/purchase/purApply/pureApplyAudit.vue
index b963f82..55cb908 100644
--- a/src/views/purchase/purApply/pureApplyAudit.vue
+++ b/src/views/purchase/purApply/pureApplyAudit.vue
@@ -91,7 +91,7 @@
                 <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="申购数量" prop="count"></el-table-column>
-                <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="供应商" prop="supName" show-overflow-tooltip="true"></el-table-column>
diff --git a/src/views/purchase/purApply/pureApplyDetailDialog.vue b/src/views/purchase/purApply/pureApplyDetailDialog.vue
index d07f112..ae08141 100644
--- a/src/views/purchase/purApply/pureApplyDetailDialog.vue
+++ b/src/views/purchase/purApply/pureApplyDetailDialog.vue
@@ -97,8 +97,8 @@
                     <el-table-column label="物资名称" prop="productName" show-overflow-tooltip></el-table-column>
                     <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
                     <el-table-column width="150" label="单据数量" prop="count"></el-table-column>
-                    <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
-                    <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
+                    <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+                    <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
                     <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
                 </el-table>
             </el-card>
diff --git a/src/views/purchase/purApply/selectApplyListDialog.vue b/src/views/purchase/purApply/selectApplyListDialog.vue
index cd43f24..ed0759e 100644
--- a/src/views/purchase/purApply/selectApplyListDialog.vue
+++ b/src/views/purchase/purApply/selectApplyListDialog.vue
@@ -68,7 +68,7 @@
         <el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="申购数量" prop="count"></el-table-column>
-        <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="供应商" prop="supName" show-overflow-tooltip="true"></el-table-column>
diff --git a/src/views/purchase/purArrival/purArrival.vue b/src/views/purchase/purArrival/purArrival.vue
index 801e15f..931210e 100644
--- a/src/views/purchase/purArrival/purArrival.vue
+++ b/src/views/purchase/purArrival/purArrival.vue
@@ -89,7 +89,7 @@
         <el-table-column label="批次号" prop="batchNo"></el-table-column>
         <el-table-column label="生产日期" prop="productDate"></el-table-column>
         <el-table-column label="失效日期" prop="expireDate"></el-table-column>
-        <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
       </el-table>
diff --git a/src/views/purchase/purArrival/purArrivalAudit.vue b/src/views/purchase/purArrival/purArrivalAudit.vue
index e9dff42..336f68a 100644
--- a/src/views/purchase/purArrival/purArrivalAudit.vue
+++ b/src/views/purchase/purArrival/purArrivalAudit.vue
@@ -85,7 +85,7 @@
         <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="送货数量" prop="count"></el-table-column>
         <el-table-column label="到货数量" prop="count"></el-table-column>
-        <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
       </el-table>
diff --git a/src/views/purchase/purArrival/purArrivalDetailDialog.vue b/src/views/purchase/purArrival/purArrivalDetailDialog.vue
index 26621fd..f031cd4 100644
--- a/src/views/purchase/purArrival/purArrivalDetailDialog.vue
+++ b/src/views/purchase/purArrival/purArrivalDetailDialog.vue
@@ -179,7 +179,7 @@
             </template>
           </el-table-column>
           <el-table-column label="供应商" prop="supName" width="150" show-overflow-tooltip></el-table-column>
-          <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" width="150" show-overflow-tooltip></el-table-column>
+          <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="150" show-overflow-tooltip></el-table-column>
           <el-table-column label="生产企业" prop="manufactory" width="150" show-overflow-tooltip></el-table-column>
           <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" width="150" show-overflow-tooltip></el-table-column>
         </el-table>
diff --git a/src/views/purchase/purArrival/purArrivalEditDialog.vue b/src/views/purchase/purArrival/purArrivalEditDialog.vue
index 93873b1..e9ff5f1 100644
--- a/src/views/purchase/purArrival/purArrivalEditDialog.vue
+++ b/src/views/purchase/purArrival/purArrivalEditDialog.vue
@@ -144,7 +144,7 @@
             </template>
           </el-table-column>
           <el-table-column label="供应商" prop="supName" width="150" show-overflow-tooltip></el-table-column>
-          <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" width="150" show-overflow-tooltip></el-table-column>
+          <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="150" show-overflow-tooltip></el-table-column>
           <el-table-column label="生产企业" prop="manufactory" width="150" show-overflow-tooltip></el-table-column>
           <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" width="150" show-overflow-tooltip></el-table-column>
           <el-table-column label="操作" width="120" fixed="right">
diff --git a/src/views/purchase/purArrival/purArrivalInvoice.vue b/src/views/purchase/purArrival/purArrivalInvoice.vue
index 7f3e474..97570c8 100644
--- a/src/views/purchase/purArrival/purArrivalInvoice.vue
+++ b/src/views/purchase/purArrival/purArrivalInvoice.vue
@@ -85,7 +85,7 @@
         <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="送货数量" prop="count"></el-table-column>
         <el-table-column label="到货数量" prop="count"></el-table-column>
-        <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
       </el-table>
diff --git a/src/views/purchase/purArrival/purArrivalSearch.vue b/src/views/purchase/purArrival/purArrivalSearch.vue
index 021f48b..e55534e 100644
--- a/src/views/purchase/purArrival/purArrivalSearch.vue
+++ b/src/views/purchase/purArrival/purArrivalSearch.vue
@@ -85,7 +85,7 @@
         <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="送货数量" prop="count"></el-table-column>
         <el-table-column label="到货数量" prop="count"></el-table-column>
-        <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
       </el-table>
diff --git a/src/views/purchase/purArrival/purArrivalSelectProduct.vue b/src/views/purchase/purArrival/purArrivalSelectProduct.vue
index 751826b..8ddb938 100644
--- a/src/views/purchase/purArrival/purArrivalSelectProduct.vue
+++ b/src/views/purchase/purArrival/purArrivalSelectProduct.vue
@@ -67,7 +67,7 @@
         <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc"></el-table-column>
         <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
-        <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
         <el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
         <el-table-column label="配送企业" prop="companyName" show-overflow-tooltip></el-table-column>
         <el-table-column label="操作" width="160">
diff --git a/src/views/purchase/purDelivery/DialogSelectDeliveryList.vue b/src/views/purchase/purDelivery/DialogSelectDeliveryList.vue
index f09887f..f238c63 100644
--- a/src/views/purchase/purDelivery/DialogSelectDeliveryList.vue
+++ b/src/views/purchase/purDelivery/DialogSelectDeliveryList.vue
@@ -72,7 +72,7 @@
         <el-table-column label="批次号" prop="batchNo"></el-table-column>
         <el-table-column label="生产日期" prop="productDate"></el-table-column>
         <el-table-column label="失效日期" prop="expireDate"></el-table-column>
-        <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="供应商" prop="supName" show-overflow-tooltip="true"></el-table-column>
diff --git a/src/views/purchase/purDelivery/purDelivery.vue b/src/views/purchase/purDelivery/purDelivery.vue
index 6b501df..fe09922 100644
--- a/src/views/purchase/purDelivery/purDelivery.vue
+++ b/src/views/purchase/purDelivery/purDelivery.vue
@@ -85,7 +85,7 @@
         <el-table-column label="批次号" prop="batchNo"></el-table-column>
         <el-table-column label="生产日期" prop="productDate"></el-table-column>
         <el-table-column label="失效日期" prop="expireDate"></el-table-column>
-        <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
       </el-table>
diff --git a/src/views/purchase/purDelivery/purDeliveryAudit.vue b/src/views/purchase/purDelivery/purDeliveryAudit.vue
index 8d1d247..2ae5c0c 100644
--- a/src/views/purchase/purDelivery/purDeliveryAudit.vue
+++ b/src/views/purchase/purDelivery/purDeliveryAudit.vue
@@ -83,7 +83,7 @@
         <el-table-column label="批次号" prop="batchNo"></el-table-column>
         <el-table-column label="生产日期" prop="productDate"></el-table-column>
         <el-table-column label="失效日期" prop="expireDate"></el-table-column>
-        <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
       </el-table>
diff --git a/src/views/purchase/purDelivery/purDeliveryEditDialog.vue b/src/views/purchase/purDelivery/purDeliveryEditDialog.vue
index 4627b79..b6802a3 100644
--- a/src/views/purchase/purDelivery/purDeliveryEditDialog.vue
+++ b/src/views/purchase/purDelivery/purDeliveryEditDialog.vue
@@ -116,7 +116,7 @@
                         oninput="value=value.replace(/[^\d]/g,'')"></el-input>
             </template>
           </el-table-column>
-          <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" width="150" show-overflow-tooltip></el-table-column>
+          <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="150" show-overflow-tooltip></el-table-column>
           <el-table-column label="生产企业" prop="manufactory" width="150" show-overflow-tooltip></el-table-column>
           <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" width="150" show-overflow-tooltip></el-table-column>
           <el-table-column label="操作" width="120" fixed="right">
diff --git a/src/views/purchase/purDelivery/purDeliverySearch.vue b/src/views/purchase/purDelivery/purDeliverySearch.vue
index 78faba4..4cebd46 100644
--- a/src/views/purchase/purDelivery/purDeliverySearch.vue
+++ b/src/views/purchase/purDelivery/purDeliverySearch.vue
@@ -82,7 +82,7 @@
         <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="送货数量" prop="count"></el-table-column>
-        <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
       </el-table>
diff --git a/src/views/purchase/purDelivery/purDeliverySelectProduct.vue b/src/views/purchase/purDelivery/purDeliverySelectProduct.vue
index 5043a67..67d2eb0 100644
--- a/src/views/purchase/purDelivery/purDeliverySelectProduct.vue
+++ b/src/views/purchase/purDelivery/purDeliverySelectProduct.vue
@@ -63,7 +63,7 @@
         <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc"></el-table-column>
         <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
-        <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
         <el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
         <el-table-column label="配送企业" prop="companyName" show-overflow-tooltip></el-table-column>
         <el-table-column label="操作"  width="160">
diff --git a/src/views/purchase/purOrder/DialogSelectOrderList.vue b/src/views/purchase/purOrder/DialogSelectOrderList.vue
index bf992f4..5616472 100644
--- a/src/views/purchase/purOrder/DialogSelectOrderList.vue
+++ b/src/views/purchase/purOrder/DialogSelectOrderList.vue
@@ -68,7 +68,7 @@
         <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="采购数量" prop="count"></el-table-column>
-        <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="供应商" prop="supName" show-overflow-tooltip="true"></el-table-column>
diff --git a/src/views/purchase/purOrder/purOrder.vue b/src/views/purchase/purOrder/purOrder.vue
index 8d066eb..ec17444 100644
--- a/src/views/purchase/purOrder/purOrder.vue
+++ b/src/views/purchase/purOrder/purOrder.vue
@@ -87,7 +87,7 @@
         <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="计量单位" prop="spec" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="采购数量" prop="count"></el-table-column>
-        <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="供应商" prop="supName" show-overflow-tooltip="true"></el-table-column>
diff --git a/src/views/purchase/purOrder/purOrderAudit.vue b/src/views/purchase/purOrder/purOrderAudit.vue
index c8ed018..08c3a8e 100644
--- a/src/views/purchase/purOrder/purOrderAudit.vue
+++ b/src/views/purchase/purOrder/purOrderAudit.vue
@@ -84,7 +84,7 @@
                 <el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="申购数量" prop="count"></el-table-column>
-                <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
+                <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="供应商" prop="supName" show-overflow-tooltip="true"></el-table-column>
diff --git a/src/views/purchase/purOrder/purOrderEditDialog.vue b/src/views/purchase/purOrder/purOrderEditDialog.vue
index 49ed890..40e3e46 100644
--- a/src/views/purchase/purOrder/purOrderEditDialog.vue
+++ b/src/views/purchase/purOrder/purOrderEditDialog.vue
@@ -89,7 +89,7 @@
                         </template>
                     </el-table-column>
                     <el-table-column label="供应商" prop="supName" show-overflow-tooltip></el-table-column>
-                    <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+                    <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
                     <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
                     <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
                     <el-table-column label="操作"  width="120">
diff --git a/src/views/purchase/purOrder/purOrderOrderSelectProduct.vue b/src/views/purchase/purOrder/purOrderOrderSelectProduct.vue
index 4ba0746..60624cc 100644
--- a/src/views/purchase/purOrder/purOrderOrderSelectProduct.vue
+++ b/src/views/purchase/purOrder/purOrderOrderSelectProduct.vue
@@ -91,7 +91,7 @@
                         show-overflow-tooltip
                     ></el-table-column>
                     <el-table-column
-                        label="注册/备案凭证"
+                        label="注册/备案号"
                         prop="zczbhhzbapzbh"
                         show-overflow-tooltip
                     ></el-table-column>
diff --git a/src/views/purchase/purOrder/purOrderSelectProduct.vue b/src/views/purchase/purOrder/purOrderSelectProduct.vue
index a44c864..24f88fb 100644
--- a/src/views/purchase/purOrder/purOrderSelectProduct.vue
+++ b/src/views/purchase/purOrder/purOrderSelectProduct.vue
@@ -66,7 +66,7 @@
         <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc"></el-table-column>
         <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
-        <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
         <el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
         <el-table-column label="配送企业" prop="companyName" show-overflow-tooltip></el-table-column>
         <el-table-column label="操作" width="160">
diff --git a/src/views/purchase/purPlan/purOrderSelectProduct.vue b/src/views/purchase/purPlan/purOrderSelectProduct.vue
index 43fc9a8..6fb6623 100644
--- a/src/views/purchase/purPlan/purOrderSelectProduct.vue
+++ b/src/views/purchase/purPlan/purOrderSelectProduct.vue
@@ -62,7 +62,7 @@
                     <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc"></el-table-column>
                     <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
                     <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
-                    <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+                    <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
                     <el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
                     <el-table-column label="配送企业" prop="companyName" show-overflow-tooltip></el-table-column>
                     <el-table-column label="操作"  width="160">
diff --git a/src/views/purchase/purPlan/purPlanDetailDialog.vue b/src/views/purchase/purPlan/purPlanDetailDialog.vue
index eec326f..19c22bb 100644
--- a/src/views/purchase/purPlan/purPlanDetailDialog.vue
+++ b/src/views/purchase/purPlan/purPlanDetailDialog.vue
@@ -104,7 +104,7 @@
                     <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip></el-table-column>
                     <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
                     <el-table-column label="计量单位" prop="measname" show-overflow-tooltip></el-table-column>
-                    <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
+                    <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
                     <el-table-column width="150" label="单据数量">
                         <template slot-scope="scope">
                             <el-input size="small" v-model="scope.row.count"
diff --git a/src/views/purchase/purPlan/purPlanEditDialog.vue b/src/views/purchase/purPlan/purPlanEditDialog.vue
index b4c4a74..889c5b6 100644
--- a/src/views/purchase/purPlan/purPlanEditDialog.vue
+++ b/src/views/purchase/purPlan/purPlanEditDialog.vue
@@ -89,8 +89,8 @@
                         </template>
                     </el-table-column>
                     <el-table-column label="供应商" prop="supName" show-overflow-tooltip></el-table-column>
-                    <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
-                    <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
+                    <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+                    <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
                     <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
                     <el-table-column label="操作"  width="120">
                         <template slot-scope="scope">
diff --git a/src/views/purchase/purPlan/purPlanOrderSelectProduct.vue b/src/views/purchase/purPlan/purPlanOrderSelectProduct.vue
index ee6de27..825f8c4 100644
--- a/src/views/purchase/purPlan/purPlanOrderSelectProduct.vue
+++ b/src/views/purchase/purPlan/purPlanOrderSelectProduct.vue
@@ -91,7 +91,7 @@
                         show-overflow-tooltip
                     ></el-table-column>
                     <el-table-column
-                        label="注册/备案凭证"
+                        label="注册/备案号"
                         prop="zczbhhzbapzbh"
                         show-overflow-tooltip
                     ></el-table-column>
diff --git a/src/views/purchase/purReturned/purReturned.vue b/src/views/purchase/purReturned/purReturned.vue
index 4f36510..f800d7c 100644
--- a/src/views/purchase/purReturned/purReturned.vue
+++ b/src/views/purchase/purReturned/purReturned.vue
@@ -86,7 +86,7 @@
         <el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="退货数量" prop="count"></el-table-column>
-        <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
       </el-table>
diff --git a/src/views/purchase/purReturned/purReturnedAudit.vue b/src/views/purchase/purReturned/purReturnedAudit.vue
index 5ac3cfc..323c3de 100644
--- a/src/views/purchase/purReturned/purReturnedAudit.vue
+++ b/src/views/purchase/purReturned/purReturnedAudit.vue
@@ -84,7 +84,7 @@
         <el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="退货数量" prop="count"></el-table-column>
-        <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
       </el-table>
diff --git a/src/views/purchase/purReturned/purReturnedDetailDialog.vue b/src/views/purchase/purReturned/purReturnedDetailDialog.vue
index 1102f29..c3a37b7 100644
--- a/src/views/purchase/purReturned/purReturnedDetailDialog.vue
+++ b/src/views/purchase/purReturned/purReturnedDetailDialog.vue
@@ -107,8 +107,8 @@
           <el-table-column width="150" label="退货数量" prop="count">
           </el-table-column>
           <el-table-column label="供应商" prop="supName" show-overflow-tooltip></el-table-column>
-          <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
-          <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
+          <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+          <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
           <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
           <el-table-column label="操作" width="120">
             <template slot-scope="scope">
diff --git a/src/views/purchase/purReturned/purReturnedEditDialog.vue b/src/views/purchase/purReturned/purReturnedEditDialog.vue
index ccc461e..0f5f308 100644
--- a/src/views/purchase/purReturned/purReturnedEditDialog.vue
+++ b/src/views/purchase/purReturned/purReturnedEditDialog.vue
@@ -117,8 +117,8 @@
             </template>
           </el-table-column>
           <el-table-column label="供应商" prop="supName" show-overflow-tooltip></el-table-column>
-          <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
-          <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
+          <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+          <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
           <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
           <el-table-column label="操作" width="120">
             <template slot-scope="scope">
diff --git a/src/views/purchase/purReturned/purReturnedSearch.vue b/src/views/purchase/purReturned/purReturnedSearch.vue
index 3b4647b..f89adb8 100644
--- a/src/views/purchase/purReturned/purReturnedSearch.vue
+++ b/src/views/purchase/purReturned/purReturnedSearch.vue
@@ -84,7 +84,7 @@
         <el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="退货数量" prop="count"></el-table-column>
-        <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
       </el-table>
diff --git a/src/views/remind/addInvRemindSetDialog.vue b/src/views/remind/addInvRemindSetDialog.vue
index 28cbe8b..0d8a0f0 100644
--- a/src/views/remind/addInvRemindSetDialog.vue
+++ b/src/views/remind/addInvRemindSetDialog.vue
@@ -132,7 +132,7 @@
         <el-table-column label="规格型号" prop="ggxh" width="200" show-overflow-tooltip></el-table-column>
         <el-table-column label="仓库名称" prop="invName" width="200"></el-table-column>
         <el-table-column label="供应商名称" prop="supName" width="200" show-overflow-tooltip></el-table-column>
-        <el-table-column label="生产厂家" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
+        <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
         <el-table-column label="注册备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
       </el-table>
 
diff --git a/src/views/supplier/company/SelectDIDetailDialog.vue b/src/views/supplier/company/SelectDIDetailDialog.vue
index b3a41a1..eb20fa0 100644
--- a/src/views/supplier/company/SelectDIDetailDialog.vue
+++ b/src/views/supplier/company/SelectDIDetailDialog.vue
@@ -408,7 +408,7 @@
                             <el-col :span="12" class="el-col">
                                 <div class="text item">
                                     <div class="itemTag">
-                                        <span>包装单位/包装级别:&nbsp;</span>
+                                        <span>包装级别:&nbsp;</span>
                                     </div>
 
                                     <el-input
diff --git a/src/views/supplier/company/ThrProductsAdd.vue b/src/views/supplier/company/ThrProductsAdd.vue
index ddc5e19..27345a2 100644
--- a/src/views/supplier/company/ThrProductsAdd.vue
+++ b/src/views/supplier/company/ThrProductsAdd.vue
@@ -98,7 +98,7 @@
                     <el-col :span="12" class="el-col">
                         <div class="text item">
                             <div class="itemTag">
-                                <span>生产厂家:&nbsp;</span>
+                                <span>生产企业:&nbsp;</span>
                             </div>
                             <el-input
                                 style="width: 60%"
@@ -355,7 +355,7 @@ export default {
                 return;
             }
             if (this.$isBlank(this.newProductData.manufactory)) {
-                this.$message.warning("生产厂家不能为空！");
+                this.$message.warning("生产企业不能为空！");
                 return;
             }
             if (this.$isBlank(this.newProductData.registerNo)) {
diff --git a/src/views/supplier/company/basicCompanyProducts.vue b/src/views/supplier/company/basicCompanyProducts.vue
index aa06f95..220a851 100644
--- a/src/views/supplier/company/basicCompanyProducts.vue
+++ b/src/views/supplier/company/basicCompanyProducts.vue
@@ -78,7 +78,7 @@
         <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
         <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
-        <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
         <el-table-column label="物资分类" prop="classifyName" show-overflow-tooltip></el-table-column>
         <el-table-column v-if="isSpCombine" label="锁定状态" prop="lockStatus" show-overflow-tooltip>
           <template slot-scope="scope">
@@ -224,7 +224,7 @@
         ></selectLocalUdi>
       </el-dialog>
       <el-dialog
-        title="选入产品信息"
+        title="选入物资字典信息"
         :visible.sync="selectProductVisible"
         width="85%"
         :close-on-click-modal="false"
diff --git a/src/views/supplier/company/basicCompanyProductsImport.vue b/src/views/supplier/company/basicCompanyProductsImport.vue
index 6575470..263afd7 100644
--- a/src/views/supplier/company/basicCompanyProductsImport.vue
+++ b/src/views/supplier/company/basicCompanyProductsImport.vue
@@ -4,8 +4,8 @@
       <el-form :model="filterQuery" label-width="120px" v-show="showSearch">
         <el-row>
           <el-col :span="6">
-            <el-form-item label="产品编码:">
-              <el-input v-model="filterQuery.unionCode" style="width: 90%" placeholder="DI/医保编码/商品条码"
+            <el-form-item label="最小销售标识:">
+              <el-input v-model="filterQuery.unionCode" style="width: 90%" placeholder="最小销售标识"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
@@ -34,8 +34,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="第三方产品编码:">
-              <el-input v-model="filterQuery.thrPiId" style="width: 90%" placeholder="第三方产品编码"
+            <el-form-item label="第三方编码:">
+              <el-input v-model="filterQuery.thrPiId" style="width: 90%" placeholder="第三方主系统编码"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
@@ -64,12 +64,11 @@
         </el-table-column>
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="最小销售产品标识" prop="nameCode" width="140"></el-table-column>
-        <el-table-column label="产品编码" prop="thirdId" show-overflow-tooltip></el-table-column>
-        <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
+        <el-table-column label="第三方主系统编码" prop="thirdId" show-overflow-tooltip></el-table-column>
         <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
-        <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
-        <el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+        <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
         <el-table-column width="120" label="操作">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.native.stop="handleModifyClick(scope.row)">详情</el-button>
@@ -77,18 +76,19 @@
         </el-table-column>
       </el-table>
 
-      <el-dialog title="产品信息详情" :visible.sync="editDialogVisible" width="80%" :close-on-click-modal="false"
+      <el-dialog title="物资字典信息详情" :visible.sync="editDialogVisible" width="80%" :close-on-click-modal="false"
                  :close-on-press-escape="false" append-to-body v-if="editDialogVisible">
         <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="thirdName" show-overflow-tooltip></el-table-column>
-          <el-table-column label="第三方产品ID" 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>
 
         <el-table v-loading="loading" :data="detailList" style="width: 100%; margin-top: 20px" border
                   @current-change="handleDetail" border highlight-current-row>
-          <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="bzcj" show-overflow-tooltip></el-table-column>
@@ -97,13 +97,13 @@
         <el-form :model="editQuery" :rules="rules" ref="editQuery" label-width="190px" style="margin-top: 20px">
           <el-row>
             <el-col :span="12">
-              <el-form-item label="产品名称" prop="cpmctymc">
+              <el-form-item label="物资名称" prop="cpmctymc">
                 <el-input style="width: 90%" size="small" splaceholder="请输入产品名称" :disabled="true"
                           v-model="editQuery.cpmctymc"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12" class="el-col">
-              <el-form-item label="产品标识" prop="nameCode">
+              <el-form-item label="最小销售产品标识" prop="nameCode">
                 <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入产品标识"
                           v-model="editQuery.nameCode"></el-input>
               </el-form-item>
@@ -188,7 +188,7 @@
 
           <el-row>
             <el-col :span="12" class="el-col">
-              <el-form-item label="上级产品编码" prop="sjcpbm">
+              <el-form-item label="上级产品标识" prop="sjcpbm">
                 <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入上级产品编码"
                           v-model="editQuery.sjcpbm"></el-input>
               </el-form-item>
@@ -204,8 +204,8 @@
 
           <el-row>
             <el-col :span="12" class="el-col">
-              <el-form-item label="包装单位/包装级别" prop="bzcj">
-                <el-input style="width: 90%" size="small" splaceholder="请输入包装单位/包装级别" v-model="editQuery.bzcj"
+              <el-form-item label="包装级别" prop="bzcj">
+                <el-input style="width: 90%" size="small" splaceholder="请输入包装级别" v-model="editQuery.bzcj"
                           :disabled="true"></el-input>
               </el-form-item>
             </el-col>
@@ -220,7 +220,7 @@
 
           <el-row>
             <el-col :span="12" class="el-col">
-              <el-form-item label="包含下级产品编码" prop="bhxjcpbm">
+              <el-form-item label="包含下级产品标识" prop="bhxjcpbm">
                 <el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入包含下级产品编码"
                           v-model="editQuery.bhxjcpbm"></el-input>
               </el-form-item>
@@ -616,7 +616,7 @@ export default {
         isUseDy: false,
       },
 
-      replTitle: "产品信息补齐:",
+      replTitle: "物资字典信息补齐:",
       isImport: false,
       isImportUdi: false,
       isUploadSmp: false,
@@ -728,7 +728,7 @@ export default {
     selectExport() {
       var selectData = this.multipleSelection;
       if (selectData == null || selectData.length == 0) {
-        this.$message.warning("请先选入产品！");
+        this.$message.warning("请先选入物资字典信息！");
         return;
       }
       if (this.repEditQuery.price < 0) {
diff --git a/src/views/supplier/company/basicCompanyproductDetail.vue b/src/views/supplier/company/basicCompanyproductDetail.vue
index 4c0b81e..ba496ce 100644
--- a/src/views/supplier/company/basicCompanyproductDetail.vue
+++ b/src/views/supplier/company/basicCompanyproductDetail.vue
@@ -7,7 +7,7 @@
         <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="registerNo" show-overflow-tooltip></el-table-column>
         <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
@@ -749,7 +749,7 @@
               <el-col :span="12" class="el-col">
                 <div class="text item">
                   <div class="itemTag">
-                    <span>包装单位/包装级别:&nbsp;</span>
+                    <span>包装级别:&nbsp;</span>
                   </div>
 
                   <el-input
diff --git a/src/views/supplier/company/basicCompanyproductEdit.vue b/src/views/supplier/company/basicCompanyproductEdit.vue
index 0726998..463cd6b 100644
--- a/src/views/supplier/company/basicCompanyproductEdit.vue
+++ b/src/views/supplier/company/basicCompanyproductEdit.vue
@@ -8,8 +8,8 @@
         <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="注册/备案号" prop="registerNo" show-overflow-tooltip></el-table-column>
+        <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
             <el-button type="text" @click="addSelectErp(scope.row)" :disabled="scope.row.thirdId==editQuery.nameCode">
diff --git a/src/views/supplier/company/basicProductEdit.vue b/src/views/supplier/company/basicProductEdit.vue
index 6b9080c..26c5e00 100644
--- a/src/views/supplier/company/basicProductEdit.vue
+++ b/src/views/supplier/company/basicProductEdit.vue
@@ -19,7 +19,7 @@
                     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="registerNo" show-overflow-tooltip></el-table-column>
                 <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
                 <el-table-column label="操作" fixed="right">
                     <template slot-scope="scope">
@@ -679,7 +679,7 @@
                             <el-col :span="12" class="el-col">
                                 <div class="text item">
                                     <div class="itemTag">
-                                        <span>包装单位/包装级别:&nbsp;</span>
+                                        <span>包装级别:&nbsp;</span>
                                     </div>
 
                                     <el-input
diff --git a/src/views/supplier/company/supCompanyProduct.vue b/src/views/supplier/company/supCompanyProduct.vue
index c23ee11..6eb5977 100644
--- a/src/views/supplier/company/supCompanyProduct.vue
+++ b/src/views/supplier/company/supCompanyProduct.vue
@@ -66,7 +66,7 @@
                 <el-table-column type="index" label="序号" width="50"></el-table-column>
                 <el-table-column label="产品名称" prop="cpmctymc"></el-table-column>
                 <el-table-column label="规格型号" prop="ggxh"></el-table-column>
-                <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh"></el-table-column>
+                <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>
                 <el-table-column label="生产企业" prop="ylqxzcrbarmc"></el-table-column>
                 <el-table-column label="审核状态" prop="auditStatus" width="120">
                     <template slot-scope="scope">
diff --git a/src/views/supplier/company/udiInfoRelevance.vue b/src/views/supplier/company/udiInfoRelevance.vue
index 6a7b5a3..1dedb0a 100644
--- a/src/views/supplier/company/udiInfoRelevance.vue
+++ b/src/views/supplier/company/udiInfoRelevance.vue
@@ -37,7 +37,7 @@
                         <el-form-item class="query-form-item">
                             <el-input v-model="erpQuery.registerNo"
                                       clearable="true"
-                                      placeholder="注册/备案凭证号"></el-input>
+                                      placeholder="注册/备案号"></el-input>
                         </el-form-item>
                         <el-form-item class="query-form-item">
                             <el-input v-model="erpQuery.manufactory"
@@ -88,7 +88,7 @@
                     <el-table-column label="产品名称" prop="name"></el-table-column>
                     <el-table-column label="计量单位" prop="measname"></el-table-column>
                     <el-table-column label="规格型号" prop="spec"></el-table-column>
-                    <el-table-column label="注册/备案凭证号" prop="registerNo"></el-table-column>
+                    <el-table-column label="注册/备案号" prop="registerNo"></el-table-column>
                     <el-table-column label="生产企业" prop="manufactory"></el-table-column>
                 </el-table>
                 <el-pagination
@@ -162,7 +162,7 @@
                                 v-model="unionQuery.zczbhhzbapzbh"
                                 clearable="true"
                                 :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && (unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''))"
-                                placeholder="注册/备案凭证号"
+                                placeholder="注册/备案号"
                                 size="mini"
                             ></el-input>
                         </el-form-item>
diff --git a/src/views/supplier/company/udiInfoselectErpUdi.vue b/src/views/supplier/company/udiInfoselectErpUdi.vue
index 1f445c9..01650c0 100644
--- a/src/views/supplier/company/udiInfoselectErpUdi.vue
+++ b/src/views/supplier/company/udiInfoselectErpUdi.vue
@@ -30,10 +30,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="注册/备案凭证号:">
+            <el-form-item label="注册/备案号:">
               <el-input
                 v-model="erpQuery.registerNo" clearable="true"
-                placeholder="请输入注册/备案凭证号"
+                placeholder="请输入注册/备案号"
                 style="width: 90%"
                 @keyup.enter.native="keyup_submit($event)"
               ></el-input>
@@ -106,7 +106,7 @@
         <el-table-column label="产品名称" prop="name"></el-table-column>
         <el-table-column label="计量单位" prop="measname"></el-table-column>
         <el-table-column label="规格型号" prop="spec"></el-table-column>
-        <el-table-column label="注册/备案凭证号" prop="registerNo"></el-table-column>
+        <el-table-column label="注册/备案号" prop="registerNo"></el-table-column>
         <el-table-column label="生产企业" prop="manufactory"></el-table-column>
         <el-table-column label="配送企业" prop="supName"></el-table-column>
       </el-table>
diff --git a/src/views/supplier/products/selectDIDetailDialog.vue b/src/views/supplier/products/selectDIDetailDialog.vue
index 90299bf..d428d37 100644
--- a/src/views/supplier/products/selectDIDetailDialog.vue
+++ b/src/views/supplier/products/selectDIDetailDialog.vue
@@ -198,7 +198,7 @@
 
                         <el-row>
                             <el-col :span="12" class="el-col">
-                              <el-form-item label="包装单位/包装级别:">
+                              <el-form-item label="包装级别:">
                                     <el-input style="width: 90%" size="small" splaceholder="请输入内容" v-model="editQuery.bzcj" :disabled="true"></el-input>
                               </el-form-item>
                             </el-col>
diff --git a/src/views/supplier/products/supAddDiProductSelectUdi.vue b/src/views/supplier/products/supAddDiProductSelectUdi.vue
index 9e0af4b..1355b81 100644
--- a/src/views/supplier/products/supAddDiProductSelectUdi.vue
+++ b/src/views/supplier/products/supAddDiProductSelectUdi.vue
@@ -164,7 +164,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12" class="el-col">
-            <el-form-item label="生产厂家:">
+            <el-form-item label="生产企业:">
               <el-input style="width: 65%" size="small" v-model="editQuery.manufactory" splaceholder="请输入内容" @input="change($event)"></el-input>
             </el-form-item>
           </el-col>
diff --git a/src/views/supplier/products/supProductsAdd.vue b/src/views/supplier/products/supProductsAdd.vue
index a16dfc5..2202e99 100644
--- a/src/views/supplier/products/supProductsAdd.vue
+++ b/src/views/supplier/products/supProductsAdd.vue
@@ -52,7 +52,7 @@
 
                 <el-row>
                     <el-col :span="12" class="el-col">
-                      <el-form-item label="生产厂家:">
+                      <el-form-item label="生产企业:">
                             <el-input style="width: 90%" size="small" placeholder="请输入内容" v-model.trim="newProductData.manufactory"></el-input>
                       </el-form-item>
                     </el-col>
@@ -202,7 +202,7 @@ export default {
                 return;
             }
             if (this.$isBlank(this.newProductData.manufactory)) {
-                this.$message.warning("生产厂家不能为空！");
+                this.$message.warning("生产企业不能为空！");
                 return;
             }
             if (this.$isBlank(this.newProductData.registerNo)) {
diff --git a/src/views/supplier/products/supProductsDetail.vue b/src/views/supplier/products/supProductsDetail.vue
index 28d2b99..a613355 100644
--- a/src/views/supplier/products/supProductsDetail.vue
+++ b/src/views/supplier/products/supProductsDetail.vue
@@ -40,7 +40,7 @@
 
                   <el-row>
                     <el-col :span="12" class="el-col">
-                      <el-form-item label="生产厂家:">
+                      <el-form-item label="生产企业:">
                         <el-input style="width: 90%" size="small"   :disabled="true" placeholder="请输入内容" v-model.trim="data.manufactory"></el-input>
                       </el-form-item>
                     </el-col>
diff --git a/src/views/supplier/products/supProductsSubmit.vue b/src/views/supplier/products/supProductsSubmit.vue
index 15b280e..5557a63 100644
--- a/src/views/supplier/products/supProductsSubmit.vue
+++ b/src/views/supplier/products/supProductsSubmit.vue
@@ -20,7 +20,7 @@
                 </el-col>
                 <el-col :span="6">
                 <el-form-item label="注册人:">
-                    <el-input v-model="filterQuery.registerNo" clearable style="width: 90%" placeholder="请输入注册/备案凭证"></el-input>
+                    <el-input v-model="filterQuery.registerNo" clearable style="width: 90%" placeholder="请输入注册/备案号"></el-input>
                 </el-form-item>
                 </el-col>
               </el-row>
@@ -69,8 +69,8 @@
                 <el-table-column label="产品名称" prop="name" show-overflow-tooltip></el-table-column>
                 <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
                 <el-table-column label="计量单位" prop="measname" 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="注册/备案号" prop="registerNo" show-overflow-tooltip></el-table-column>
+                <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
 
                 <el-table-column label="审核状态" prop="checkStatus" show-overflow-tooltip>
                     <template slot-scope="scope">
diff --git a/src/views/thirdSys/invProducts/thrInvProducts.vue b/src/views/thirdSys/invProducts/thrInvProducts.vue
index d75becf..09a06e6 100644
--- a/src/views/thirdSys/invProducts/thrInvProducts.vue
+++ b/src/views/thirdSys/invProducts/thrInvProducts.vue
@@ -19,8 +19,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label-width="120px"  label="注册/备案凭证号:">
-              <el-input v-model="filterQuery.registerCertNo" clearable style="width: 90%" placeholder="请输入注册/备案凭证号"></el-input>
+            <el-form-item label-width="120px"  label="注册/备案号:">
+              <el-input v-model="filterQuery.registerCertNo" clearable style="width: 90%" placeholder="请输入注册/备案号"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -79,7 +79,7 @@
         <el-table-column label="失效日期" prop="expirationDate" show-overflow-tooltip></el-table-column>
         <el-table-column label="数量" prop="count" show-overflow-tooltip></el-table-column>
         <el-table-column label="注册证号" prop="registerCertNo" show-overflow-tooltip></el-table-column>
-        <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
+        <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
         <el-table-column label="仓位" prop="warehouseName" show-overflow-tooltip></el-table-column>
         <el-table-column label="货位" prop="spaceName" show-overflow-tooltip></el-table-column>
 
diff --git a/src/views/thirdSys/invProducts/thrInvProductsSelect.vue b/src/views/thirdSys/invProducts/thrInvProductsSelect.vue
index 94d895a..85785a7 100644
--- a/src/views/thirdSys/invProducts/thrInvProductsSelect.vue
+++ b/src/views/thirdSys/invProducts/thrInvProductsSelect.vue
@@ -20,7 +20,7 @@
             </el-col>
             <el-col :span="6">
             <el-form-item label="产品编码:">
-                <el-input v-model="filterQuery.registerCertNo"   style="width: 90%" clearable placeholder="请输入注册/备案凭证号"></el-input>
+                <el-input v-model="filterQuery.registerCertNo"   style="width: 90%" clearable placeholder="请输入注册/备案号"></el-input>
             </el-form-item>
             </el-col>
           </el-row>
diff --git a/src/views/thirdSys/product/thrProducts.vue b/src/views/thirdSys/product/thrProducts.vue
index aeb5d4a..660d84f 100644
--- a/src/views/thirdSys/product/thrProducts.vue
+++ b/src/views/thirdSys/product/thrProducts.vue
@@ -21,13 +21,13 @@
         </el-row>
         <el-row>
           <el-col :span="6">
-            <el-form-item label="注册/备案凭证:">
-              <el-input v-model="filterQuery.registerNo" clearable style="width: 90%" placeholder="请输入注册/备案凭证"></el-input>
+            <el-form-item label="注册/备案号:">
+              <el-input v-model="filterQuery.registerNo" clearable style="width: 90%" placeholder="请输入注册/备案号"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="生产厂家:">
-              <el-input v-model="filterQuery.manufactory" clearable style="width: 90%" placeholder="请输入生产厂家"></el-input>
+            <el-form-item label="生产企业:">
+              <el-input v-model="filterQuery.manufactory" clearable style="width: 90%" placeholder="请输入生产企业"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -65,8 +65,8 @@
         <el-table-column label="产品名称" prop="name" show-overflow-tooltip></el-table-column>
         <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
         <el-table-column label="计量单位" prop="measname" 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="注册/备案号" prop="registerNo" show-overflow-tooltip></el-table-column>
+        <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
         <el-table-column label="操作" width="180px">
           <template slot-scope="scope">
             <el-button type="text" @click.native.stop="detailDialog(scope.row)">详情</el-button>
diff --git a/src/views/thirdSys/product/thrProductsAdd.vue b/src/views/thirdSys/product/thrProductsAdd.vue
index 64ae78e..a0116b2 100644
--- a/src/views/thirdSys/product/thrProductsAdd.vue
+++ b/src/views/thirdSys/product/thrProductsAdd.vue
@@ -46,8 +46,8 @@
                 </el-row>
                 <el-row  type="flex">
                     <el-col :span="11" class="el-col">
-                          <el-form-item label="生产厂家:" prop="manufactory">
-                            <el-input style="width: 90%" size="small" placeholder="请输入生产厂家" v-model.trim="newProductData.manufactory"></el-input>
+                          <el-form-item label="生产企业:" prop="manufactory">
+                            <el-input style="width: 90%" size="small" placeholder="请输入生产企业" v-model.trim="newProductData.manufactory"></el-input>
                           </el-form-item>
                     </el-col>
                     <el-col :span="11" class="el-col">
@@ -189,7 +189,7 @@ export default {
                 return;
             }
             if (this.$isBlank(this.newProductData.manufactory)) {
-                this.$message.warning("生产厂家不能为空！");
+                this.$message.warning("生产企业不能为空！");
                 return;
             }
             if (this.$isBlank(this.newProductData.registerNo)) {
diff --git a/src/views/thirdSys/product/thrProductsCheck.vue b/src/views/thirdSys/product/thrProductsCheck.vue
index 897b78b..0352ffe 100644
--- a/src/views/thirdSys/product/thrProductsCheck.vue
+++ b/src/views/thirdSys/product/thrProductsCheck.vue
@@ -125,8 +125,8 @@
         <el-table-column label="产品名称" prop="name" show-overflow-tooltip></el-table-column>
         <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
         <el-table-column label="计量单位" prop="measname" 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="注册/备案号" prop="registerNo" show-overflow-tooltip></el-table-column>
+        <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
         <el-table-column label="配送企业" prop="corpName" show-overflow-tooltip></el-table-column>
 
         <el-table-column label="审核状态" prop="checkStatus" show-overflow-tooltip>
diff --git a/src/views/thirdSys/product/thrProductsDetail.vue b/src/views/thirdSys/product/thrProductsDetail.vue
index b45705c..a97576a 100644
--- a/src/views/thirdSys/product/thrProductsDetail.vue
+++ b/src/views/thirdSys/product/thrProductsDetail.vue
@@ -1,13 +1,13 @@
 <template>
   <el-form  label-width="120px">
             <div v-if="!isImport" style="margin-bottom: 20px">
-                <el-row type="flex">
-                    <el-col :span="11" class="el-col">
-                      <el-form-item label="第三方系统" prop="thirdSysFk">
-                            <el-input style="width: 90%" size="small" :disabled="true" v-model="data.thirdName"></el-input>
-                      </el-form-item>
-                    </el-col>
-                </el-row>
+<!--                <el-row type="flex">-->
+<!--                    <el-col :span="11" class="el-col">-->
+<!--                      <el-form-item label="第三方系统" prop="thirdSysFk">-->
+<!--                            <el-input style="width: 90%" size="small" :disabled="true" v-model="data.thirdName"></el-input>-->
+<!--                      </el-form-item>-->
+<!--                    </el-col>-->
+<!--                </el-row>-->
               <el-row type="flex">
                 <el-col :span="11" type="flex">
                   <el-form-item label="产品编码:" prop="code">
@@ -22,7 +22,7 @@
               </el-row>
               <el-row  type="flex">
                 <el-col :span="11" class="el-col">
-                  <el-form-item label="生产厂家:" prop="manufactory">
+                  <el-form-item label="生产企业:" prop="manufactory">
                     <el-input style="width: 90%" size="small" :disabled="true" v-model.trim="data.manufactory"></el-input>
                   </el-form-item>
                 </el-col>
diff --git a/src/views/thirdSys/product/thrProductsImportDetail.vue b/src/views/thirdSys/product/thrProductsImportDetail.vue
index c246e5d..e772d57 100644
--- a/src/views/thirdSys/product/thrProductsImportDetail.vue
+++ b/src/views/thirdSys/product/thrProductsImportDetail.vue
@@ -29,7 +29,7 @@
                 <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
                 <el-table-column label="计量单位" prop="measname" 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="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
             </el-table>
           <pagination
             v-show="total>0"
diff --git a/src/views/thirdSys/product/thrProductsSelect.vue b/src/views/thirdSys/product/thrProductsSelect.vue
index e875dca..951d479 100644
--- a/src/views/thirdSys/product/thrProductsSelect.vue
+++ b/src/views/thirdSys/product/thrProductsSelect.vue
@@ -5,7 +5,8 @@
         <el-row>
           <el-col :span="6">
             <el-form-item label="产品编码:">
-              <el-input v-model="filterQuery.code" placeholder="请输入产品编码/商品条码/医保编码" style="width: 90%" @keyup.enter.native="keyupErp_submit($event)"></el-input>
+              <el-input v-model="filterQuery.code" placeholder="请输入产品编码/商品条码/医保编码" style="width: 90%"
+                        @keyup.enter.native="keyupErp_submit($event)"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -20,30 +21,33 @@
           </el-col>
         </el-row>
         <el-row>
-        <el-col :span="6">
-          <el-form-item label="注册/备案凭证:">
-            <el-input v-model="filterQuery.registerNo" clearable="true" style="width: 90%" placeholder="请输入注册/备案凭证"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="生产企业:">
-            <el-input v-model="filterQuery.manufactory" clearable="true" style="width: 90%" placeholder="请输入生产企业"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="外部系统:">
-            <el-select v-model="filterQuery.thirdSys" style="width: 90%" placeholder="请选择第三方系统" @change="thirdSysChange">
-              <el-option
-                v-for="item in thirdSys"
-                :key="item.value"
-                :label="item.thirdName"
-                :value="item.thirdId">
-                <span style="float: left">{{ item.thirdName }}</span>
-                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
+          <el-col :span="6">
+            <el-form-item label="注册/备案号:">
+              <el-input v-model="filterQuery.registerNo" clearable="true" style="width: 90%"
+                        placeholder="请输入注册/备案号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="生产企业:">
+              <el-input v-model="filterQuery.manufactory" clearable="true" style="width: 90%"
+                        placeholder="请输入生产企业"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="外部系统:">
+              <el-select v-model="filterQuery.thirdSys" style="width: 90%" placeholder="请选择第三方系统"
+                         @change="thirdSysChange">
+                <el-option
+                  v-for="item in thirdSys"
+                  :key="item.value"
+                  :label="item.thirdName"
+                  :value="item.thirdId">
+                  <span style="float: left">{{ item.thirdName }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
 
@@ -55,9 +59,11 @@
           <el-button type="primary" icon="el-icon-upload2" @click="selectExport" v-if="selectType==0">选中导出</el-button>
           <el-button type="primary" icon="el-icon-upload2" @click="allExport" v-if="selectType==0">结果全部导出</el-button>
           <el-button type="primary" icon="el-icon-top-upload" @click="uploadSmp" v-if="selectType==1">选中上传</el-button>
-          <el-button type="primary" icon="el-icon-top-upload" @click="allUploadSmp" v-if="selectType==1">一键上传</el-button>
+          <el-button type="primary" icon="el-icon-top-upload" @click="allUploadSmp" v-if="selectType==1">一键上传
+          </el-button>
           <el-button type="primary" icon="el-icon-download" @click="downloadErp" v-if="selectType==3">选中下载</el-button>
-          <el-button type="primary" icon="el-icon-download" @click="downloadAllErp" v-if="selectType==3">结果全部下载</el-button>
+          <el-button type="primary" icon="el-icon-download" @click="downloadAllErp" v-if="selectType==3">结果全部下载
+          </el-button>
         </el-button-group>
       </div>
       <el-divider style="margin: 15px"></el-divider>
@@ -143,7 +149,7 @@ export default {
         limit: 10,
         isDownThrSys: null,
       },
-      mainThirdSys:'',
+      mainThirdSys: '',
       total: 0,
       thirdSys: [],
       thirdSysDetail: null,
@@ -264,8 +270,8 @@ export default {
       getBasicThirdSys(query)
         .then((response) => {
           this.thirdSys = response.data.list || [];
-          for(var i=0;i<this.thirdSys.length;i++){
-            if(this.thirdSys[i].mainSys){
+          for (var i = 0; i < this.thirdSys.length; i++) {
+            if (this.thirdSys[i].mainSys) {
               this.filterQuery.thirdSys = this.thirdSys[i].thirdId;
               this.mainThirdSys = this.thirdSys[i].thirdId;
             }