From d52241145e99da87bd981d67bb419bdade27e180 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Sat, 18 Mar 2023 16:28:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=97=E6=9D=90=E5=AD=97=E5=85=B8=E7=BB=B4?=
 =?UTF-8?q?=E6=8A=A4=EF=BC=8C=E6=9C=AC=E4=BC=81=E4=B8=9A=E9=80=89=E5=85=A5?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=B8=A6=E5=85=A5=EF=BC=8C=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9=EF=BC=8C?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2=E5=AD=97=E5=85=B8=E4=B8=8E?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |    2 +-
 .env.production                               |    2 +-
 src/layout/components/Navbar.vue              |    2 +-
 src/views/basic/product/product.vue           |    8 +-
 src/views/basic/product/productEdit.vue       |   14 +-
 src/views/basic/product/productSingleEdit.vue |   66 +-
 src/views/diSearch/udiInfoSearch.vue          |    2 +-
 src/views/inout/DialogSelectRl.vue            |    2 +-
 src/views/inventory/InvProducts.vue           |  121 +-
 src/views/login.vue                           |    2 +-
 src/views/myLogin.vue                         |    9 +-
 .../company/basicSelectSingleProducts.vue     |    2 +-
 .../purchase/company/companyProducts.vue      |    2 +-
 .../company/supCompanyAduditDialog.vue        |    7 +-
 .../purchase/purApply/purApplyProducts.vue    |    2 +-
 .../purApply/purUdiRlDetailDialog.vue         |    2 +-
 .../supplier/company/SelectDIDetailDialog.vue |    2 +-
 .../supplier/company/basicCompanyProducts.vue |   38 +-
 .../company/basicCompanyProductsImport.vue    | 1797 +++++++++--------
 .../company/basicCompanyproductDetail.vue     |    2 +-
 .../supplier/company/basicProductEdit.vue     |    2 +-
 .../supplier/products/supProductsAddDi.vue    |    4 +-
 22 files changed, 1102 insertions(+), 988 deletions(-)

diff --git a/.env.development b/.env.development
index 545bade..3d5a50f 100644
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = UDI自助平台
+VUE_APP_TITLE = 供应商自助管理系统
 
 # 开发环境配置
 ENV = 'development'
diff --git a/.env.production b/.env.production
index 9712998..6139ee6 100644
--- a/.env.production
+++ b/.env.production
@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = UDI自助平台
+VUE_APP_TITLE = 供应商自助管理系统
 
 # 生产环境配置
 ENV = 'production'
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 8a4e77f..a6ef0c1 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -9,7 +9,7 @@
       <template v-if="device!=='mobile'">
 
         <div class="inv-hos-title">
-          <span style="font-weight: bold;color: #303133;">平潭协和医院</span>
+          <span style="font-weight: bold;color: #303133;">协和医院平潭分院</span>
           <span
             style="margin-right: 18px;margin-left:8px;color: #2d8cf0;font-size: 14px;">({{ inv }})</span>
 
diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue
index 2afde55..cacb8b8 100644
--- a/src/views/basic/product/product.vue
+++ b/src/views/basic/product/product.vue
@@ -13,7 +13,7 @@
             </el-tree>
           </div>
         </el-col>
-        <el-col :span="21" style="border-left:  1px solid #dddddd">
+        <el-col :span="21" style="border-left:  3px solid #dddddd">
           <el-form :model="filterQuery" size="mini" label-width="100px" v-show="showSearch">
             <el-row>
               <el-col :span="18">
@@ -102,9 +102,9 @@
               <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
               <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
               <el-button type="primary" icon="el-icon-search" @click="submit">查询</el-button>
-              <el-button type="primary" icon="el-icon-plus" @click="editUdiType">编辑菜单分类</el-button>
-              <el-button type="primary" icon="el-icon-plus" @click="intentImportUdi">添加DI信息</el-button>
-              <el-button type="primary" icon="el-icon-plus" @click="intentImportErp">添加产品信息</el-button>
+              <el-button type="primary" icon="el-icon-plus" @click="editUdiType">物资分类管理</el-button>
+              <el-button type="primary" icon="el-icon-plus" @click="intentImportUdi">选入DI信息</el-button>
+              <el-button type="primary" icon="el-icon-plus" @click="intentImportErp">添加院内字典</el-button>
               <el-button type="primary" icon="el-icon-plus" @click="intentDetail">关联添加</el-button>
             </el-button-group>
           </div>
diff --git a/src/views/basic/product/productEdit.vue b/src/views/basic/product/productEdit.vue
index a65265f..36ff682 100644
--- a/src/views/basic/product/productEdit.vue
+++ b/src/views/basic/product/productEdit.vue
@@ -562,15 +562,14 @@
                 <template slot="label">
 
                 </template>
-                启用使用单元
+                是否必须维护资质材料
               </el-descriptions-item>
               <el-descriptions-item>
                 <template slot="label">
-
                 </template>
-                <el-radio-group v-model="checked">
-                  <el-radio :label="true" :value="true">启用</el-radio>
-                  <el-radio :label="false" :value="false">不启用</el-radio>
+                <el-radio-group v-model="editQuery.needCert">
+                  <el-radio :label="true" :value="true">是</el-radio>
+                  <el-radio :label="false" :value="false">否</el-radio>
                 </el-radio-group>
               </el-descriptions-item>
               <el-descriptions-item>
@@ -578,8 +577,10 @@
                   <i class="el-icon-tickets"></i>
                   描述
                 </template>
-                启用使用单元
+                是否必须维护资质材料
               </el-descriptions-item>
+
+
             </el-descriptions>
 
           </div>
@@ -784,6 +785,7 @@ export default {
       this.editSingleFormat.packUnit = temp.packUnit;
       this.editSingleFormat.measname = temp.measname;
       this.editSingleFormat.nameCode = temp.nameCode;
+      this.editSingleFormat.cpmctymc = temp.cpmctymc;
       this.editSingleDiDialogVisible = true;
     },
     onAddSingleSubmit() {
diff --git a/src/views/basic/product/productSingleEdit.vue b/src/views/basic/product/productSingleEdit.vue
index 2dd3004..946bbf4 100644
--- a/src/views/basic/product/productSingleEdit.vue
+++ b/src/views/basic/product/productSingleEdit.vue
@@ -7,27 +7,59 @@
       border
       label-width="120px"
     >
+
+      <el-row>
+        <el-col span="20">
+          <el-form-item label="产品标识:">
+            <el-input
+              disabled
+              style="width: 90%"
+              size="small"
+              splaceholder="请输入内容"
+              v-model="editQuery.nameCode"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col span="20">
+          <el-form-item label="产品通用名:">
+            <el-input
+              style="width: 90%"
+              size="small"
+              disabled
+              splaceholder="请输入内容"
+              v-model="editQuery.cpmctymc"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
       <el-row>
-        <el-form-item label="商品条码:">
-          <el-input
-            style="width: 80%"
-            size="small"
-            splaceholder="请输入内容"
-            v-model="editQuery.sptm"
-          ></el-input>
-        </el-form-item>
+        <el-col span="20">
+          <el-form-item label="商品条码:">
+            <el-input
+              style="width: 90%"
+              size="small"
+              splaceholder="请输入内容"
+              v-model="editQuery.sptm"
+            ></el-input>
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row>
-        <el-form-item label="包装单位:">
-          <el-input
-            style="width: 80%"
-            size="small"
-            splaceholder="请输入内容"
-            v-model="editQuery.packUnit"
-          ></el-input>
-        </el-form-item>
+        <el-col span="20">
+          <el-form-item label="包装单位:">
+            <el-input
+              style="width: 90%"
+              size="small"
+              splaceholder="请输入内容"
+              v-model="editQuery.packUnit"
+            ></el-input>
+          </el-form-item>
+        </el-col>
       </el-row>
-<!--      <el-row>-->
+      <!--      <el-row>-->
       <!--        <el-form-item label="计量单位:">-->
       <!--          <el-input-->
       <!--            style="width: 80%"-->
diff --git a/src/views/diSearch/udiInfoSearch.vue b/src/views/diSearch/udiInfoSearch.vue
index 5ed6850..84a95b1 100644
--- a/src/views/diSearch/udiInfoSearch.vue
+++ b/src/views/diSearch/udiInfoSearch.vue
@@ -36,7 +36,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: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.zxxsbzbhsydysl"></el-input>
                 </el-form-item>
               </el-col>
diff --git a/src/views/inout/DialogSelectRl.vue b/src/views/inout/DialogSelectRl.vue
index 70cda00..19db5c9 100644
--- a/src/views/inout/DialogSelectRl.vue
+++ b/src/views/inout/DialogSelectRl.vue
@@ -421,7 +421,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: 65%"
diff --git a/src/views/inventory/InvProducts.vue b/src/views/inventory/InvProducts.vue
index b593793..61fb79f 100644
--- a/src/views/inventory/InvProducts.vue
+++ b/src/views/inventory/InvProducts.vue
@@ -3,28 +3,51 @@
     <el-card class="el-card">
       <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
         <el-row>
-          <el-col :span="4">
-            <el-form-item class="query-form-item" label="产品标识DI:">
-              <el-input v-model="filterQuery.nameCode" placeholder="产品标识DI"
-                        style="width: 90%"
-                        clearable="true"></el-input>
+          <el-col :span="20">
+            <el-form-item class="query-form-item" label-width="100px" label="UDI码:">
+              <el-input
+                id="inputer"
+                v-model="filterQuery.code"
+                placeholder="UDI码"
+                ref='inputRef'
+                @keypress.enter.native="enterKey($event)"
+                clearable
+              ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
-            <el-form-item class="query-form-item" label="产品名称:">
-              <el-input v-model="filterQuery.cpmctymc" placeholder="产品名称"
-                        style="width: 90%"
-                        clearable="true"></el-input>
+        </el-row>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="所属仓库:">
+              <el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
+                         style="width: 90%"
+              >
+                <el-option
+                  v-for="item in invList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.code">
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
-            <el-form-item class="query-form-item" label="批次号:">
-              <el-input v-model="filterQuery.batchNo" placeholder="批次号"
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="货位:">
+              <el-input v-model="filterQuery.nameCode" placeholder="货位"
                         style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+          <!--          <el-col :span="6">-->
+          <!--            <el-form-item class="query-form-item" label="产品标识DI:">-->
+          <!--              <el-input v-model="filterQuery.nameCode" placeholder="产品标识DI"-->
+          <!--                        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-select
                 v-model="filterQuery.supId"
@@ -50,43 +73,44 @@
               </el-select>
             </el-form-item>
           </el-col>
+
+
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="生产厂家:">
+              <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产厂家"
+                        style="width: 90%"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
         </el-row>
 
         <el-row>
-          <el-col :span="4">
-            <el-form-item class="query-form-item" label="规格型号:">
-              <el-input v-model="filterQuery.ggxh" placeholder="规格型号"
+          <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="4">
-            <el-form-item class="query-form-item" label="批准文号:">
-              <el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="批准文号"
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="产品名称:">
+              <el-input v-model="filterQuery.cpmctymc" placeholder="产品名称"
                         style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
-            <el-form-item class="query-form-item" label="生产厂家:">
-              <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产厂家"
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="规格型号:">
+              <el-input v-model="filterQuery.ggxh" placeholder="规格型号"
                         style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
-            <el-form-item class="query-form-item" label="所属仓库:">
-              <el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
-                         style="width: 90%"
-              >
-                <el-option
-                  v-for="item in invList"
-                  :key="item.name"
-                  :label="item.name"
-                  :value="item.code">
-                  <span style="float: left">{{ item.name }}</span>
-                </el-option>
-              </el-select>
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="批次号:">
+              <el-input v-model="filterQuery.batchNo" placeholder="批次号"
+                        style="width: 90%"
+                        clearable="true"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -110,23 +134,28 @@
       <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
                 border>
         <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="产品标识" prop="nameCode"></el-table-column>
-        <el-table-column label="产品名称" prop="cpmctymc"></el-table-column>
+        <el-table-column label="仓库" prop="invName" v-if="showSup"
+                         show-overflow-tooltip width="120"></el-table-column>
+        <el-table-column label="货位" prop="spaceName" v-if="showSup"
+                         show-overflow-tooltip width="120"></el-table-column>
+        <el-table-column label="DI标识" prop="nameCode"></el-table-column>
+        <el-table-column label="物资名称" prop="cpmctymc"></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
         <el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
-        <el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>
-        <el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
-        <el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>
-        <el-table-column label="出库数量" prop="outCount" width="120"></el-table-column>
-        <el-table-column label="结余数量" prop="reCount" width="120"></el-table-column>
+        <!--        <el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>-->
+        <!--        <el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>-->
+        <!--        <el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>-->
+        <!--        <el-table-column label="出库数量" prop="outCount" width="120"></el-table-column>-->
+        <el-table-column label="库存数量" prop="reCount" width="120"></el-table-column>
         <el-table-column label="生产厂家" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
                          width="120"></el-table-column>
+
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" v-if="showSup" show-overflow-tooltip
+                         width="120"></el-table-column>
         <el-table-column label="供应商" prop="supName" v-if="showSup" show-overflow-tooltip
                          width="120"></el-table-column>
         <el-table-column label="部门" prop="deptName" v-if="showSup"
                          show-overflow-tooltip width="120"></el-table-column>
-        <el-table-column label="仓库" prop="invName" v-if="showSup"
-                         show-overflow-tooltip width="120"></el-table-column>
         <el-table-column label="操作" width="150">
           <template slot-scope="scope">
             <el-button
@@ -207,7 +236,7 @@ export default {
       corpLoading: false,
       dialogVisible: false,
       fromOptions: [],
-      showSup: false,
+      showSup: true,
       detailDialogVisible: false,
       inputQuery: {
         cpmctymc: null,
diff --git a/src/views/login.vue b/src/views/login.vue
index 916a8a7..d28916c 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">UDI自助平台</h3>
+      <h3 class="title">供应商自助管理系统</h3>
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"
diff --git a/src/views/myLogin.vue b/src/views/myLogin.vue
index 064ab00..f1b0b3e 100644
--- a/src/views/myLogin.vue
+++ b/src/views/myLogin.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="login-container">
     <div>
-      <h3 class="toptitle">平潭协和医院</h3>
+      <h3 class="toptitle">协和医院平潭分院</h3>
     </div>
     <el-form
       class="card-box login-form"
@@ -64,7 +64,7 @@
         </div>
         <div style="margin-top: -15px">
           <a style="margin-left: 50%; font-size: 12px" :href="'#/register'"
-          >立即注册</a
+          >新用户注册</a
           >
           <a style="margin-left: 5%; font-size: 12px" :href="'#/forgetPasswd'"
           >忘记密码</a
@@ -82,7 +82,10 @@
           font-size: 12px;
           color: white;
         ">
-      开发单位：厦门高立新鹏软件科技有限公司 技术支持：13459286066
+      <a href="http://www.xmglxp.com/" target="_blank">
+        开发单位：厦门高立新鹏软件科技有限公司 技术支持：400-990-9112
+      </a>
+
     </div>
 
   </div>
diff --git a/src/views/purchase/company/basicSelectSingleProducts.vue b/src/views/purchase/company/basicSelectSingleProducts.vue
index 926fe88..9fab203 100644
--- a/src/views/purchase/company/basicSelectSingleProducts.vue
+++ b/src/views/purchase/company/basicSelectSingleProducts.vue
@@ -254,7 +254,7 @@
             </el-row>
             <el-row >
               <el-col :span="12" class="el-col">
-                <el-form-item label="最小包装单元内包含使用单元数量" prop="zxxsbzbhsydysl">
+                <el-form-item label="使用单元数量" prop="zxxsbzbhsydysl">
                   <el-input style="width: 90%" :disabled="!checked" size="small" splaceholder="请输入内容" v-model="editQuery.zxxsbzbhsydysl"></el-input>
                 </el-form-item>
               </el-col>
diff --git a/src/views/purchase/company/companyProducts.vue b/src/views/purchase/company/companyProducts.vue
index 6ee8f76..982ce7c 100644
--- a/src/views/purchase/company/companyProducts.vue
+++ b/src/views/purchase/company/companyProducts.vue
@@ -253,7 +253,7 @@
                 </el-row>
                 <el-row >
                     <el-col :span="12" class="el-col">
-                      <el-form-item label="最小包装单元内包含使用单元数量" prop="zxxsbzbhsydysl">
+                      <el-form-item label="使用单元数量" prop="zxxsbzbhsydysl">
                         <el-input style="width: 90%" :disabled="!checked" size="small" splaceholder="请输入内容" v-model="editQuery.zxxsbzbhsydysl"></el-input>
                       </el-form-item>
                     </el-col>
diff --git a/src/views/purchase/company/supCompanyAduditDialog.vue b/src/views/purchase/company/supCompanyAduditDialog.vue
index 002f5f6..756185f 100644
--- a/src/views/purchase/company/supCompanyAduditDialog.vue
+++ b/src/views/purchase/company/supCompanyAduditDialog.vue
@@ -307,7 +307,8 @@
           </el-col>
           <el-col :span="8">
             <el-form-item prop="status">
-              <el-select v-model="currentAudit.status" style="width: 100%">
+              <el-select v-model="currentAudit.status" :disabled="confirmStatus == 1 || confirmStatus == 2"
+                         style="width: 100%">
                 <el-option label="失效" :value=1></el-option>
                 <el-option label="有效" :value=0></el-option>
               </el-select>
@@ -321,7 +322,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item prop="confirmStatus">
-              <el-select v-model="confirmStatus" style="width: 100%">
+              <el-select v-model="confirmStatus" :disabled="currentAudit.status ==1" style="width: 100%">
                 <el-option label="符合" :value="1"></el-option>
                 <el-option label="不符合" :value="2"></el-option>
                 <el-option label="未确认" :value="6"></el-option>
@@ -820,6 +821,8 @@ export default {
         this.passAuditCert();
       } else if (this.confirmStatus == 2) {
         this.rejectAuditCert();
+      } else if (this.confirmStatus == 6) {
+        this.cancel();
       }
     },
     cancel() {
diff --git a/src/views/purchase/purApply/purApplyProducts.vue b/src/views/purchase/purApply/purApplyProducts.vue
index 715ac28..2f0fc58 100644
--- a/src/views/purchase/purApply/purApplyProducts.vue
+++ b/src/views/purchase/purApply/purApplyProducts.vue
@@ -254,7 +254,7 @@
                 </el-row>
                 <el-row >
                     <el-col :span="12" class="el-col">
-                      <el-form-item label="最小包装单元内包含使用单元数量" prop="zxxsbzbhsydysl">
+                      <el-form-item label="使用单元数量" prop="zxxsbzbhsydysl">
                         <el-input style="width: 90%" :disabled="!checked" size="small" splaceholder="请输入内容" v-model="editQuery.zxxsbzbhsydysl"></el-input>
                       </el-form-item>
                     </el-col>
diff --git a/src/views/purchase/purApply/purUdiRlDetailDialog.vue b/src/views/purchase/purApply/purUdiRlDetailDialog.vue
index 6440dbd..a08cae7 100644
--- a/src/views/purchase/purApply/purUdiRlDetailDialog.vue
+++ b/src/views/purchase/purApply/purUdiRlDetailDialog.vue
@@ -177,7 +177,7 @@
         </el-row>
         <el-row >
           <el-col :span="12" class="el-col">
-            <el-form-item label="最小包装单元内包含使用单元数量" prop="zxxsbzbhsydysl">
+            <el-form-item label="使用单元数量" prop="zxxsbzbhsydysl">
               <el-input style="width: 90%" :disabled="!checked" size="small" splaceholder="请输入内容" v-model="editQuery.zxxsbzbhsydysl"></el-input>
             </el-form-item>
           </el-col>
diff --git a/src/views/supplier/company/SelectDIDetailDialog.vue b/src/views/supplier/company/SelectDIDetailDialog.vue
index 2e23491..a242443 100644
--- a/src/views/supplier/company/SelectDIDetailDialog.vue
+++ b/src/views/supplier/company/SelectDIDetailDialog.vue
@@ -35,7 +35,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: 65%"
diff --git a/src/views/supplier/company/basicCompanyProducts.vue b/src/views/supplier/company/basicCompanyProducts.vue
index 84e6bf4..7a3afe7 100644
--- a/src/views/supplier/company/basicCompanyProducts.vue
+++ b/src/views/supplier/company/basicCompanyProducts.vue
@@ -65,7 +65,7 @@
           <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
           <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
           <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
-          <el-button type="primary" icon="el-icon-bottom-right" @click="selectProduct()">选入产品</el-button>
+          <el-button type="primary" icon="el-icon-bottom-right" @click="selectProduct()">选入</el-button>
         </el-button-group>
       </div>
       <el-divider style="margin: 15px"></el-divider>
@@ -95,32 +95,36 @@
                        @click.native.stop="handleModifyClick(scope.row)">编辑
             </el-button>
             <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"
-                        >
+            >
                 <span class="el-dropdown-link">
                   <i class="el-icon-d-arrow-right el-icon--right"></i>更多
                 </span>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="handleDetailClick" v-if=" scope.row.lockStatus!=3" >详情</el-dropdown-item>
-                <el-dropdown-item command="sumitLockStatus" v-if="isSpCombine"  :disabled="scope.row.lockStatus===3">提交审核</el-dropdown-item>
+                <el-dropdown-item command="handleDetailClick" v-if=" scope.row.lockStatus!=3">详情</el-dropdown-item>
+                <el-dropdown-item command="sumitLockStatus" v-if="isSpCombine" :disabled="scope.row.lockStatus===3">
+                  提交审核
+                </el-dropdown-item>
                 <el-dropdown-item command="splitSelectUdi" v-if="isSpCombine" type="text" size="small"
-                                  :disabled="scope.row.thirdId===scope.row.nameCode  || scope.row.thirdId==null || scope.row.nameCode==null || scope.row.lockStatus===3">拆分产品</el-dropdown-item>
+                                  :disabled="scope.row.thirdId===scope.row.nameCode  || scope.row.thirdId==null || scope.row.nameCode==null || scope.row.lockStatus===3">
+                  拆分产品
+                </el-dropdown-item>
                 <el-dropdown-item command="deleteCompanyProductRelevance">移除</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
 
 
-<!--            <el-button v-if=" scope.row.lockStatus!=3" type="text" size="small"-->
-<!--                       @click.native.stop="handleDetailClick(scope.row)">详情-->
-<!--            </el-button>-->
-<!--            <el-button v-if="isSpCombine" type="text" size="small" :disabled="scope.row.lockStatus===3"-->
-<!--                       @click.native.stop="sumitLockStatus(scope.row)">提交审核-->
-<!--            </el-button>-->
-<!--            <el-button v-if="isSpCombine" type="text" size="small" @click.native.stop="splitSelectUdi(scope.row)"-->
-<!--                       :disabled="scope.row.thirdId===scope.row.nameCode  || scope.row.thirdId==null || scope.row.nameCode==null || scope.row.lockStatus===3">-->
-<!--              拆分产品-->
-<!--            </el-button>-->
-<!--            <el-button type="text" size="small" @click.native.stop="deleteCompanyProductRelevance(scope.row)">移除-->
-<!--            </el-button>-->
+            <!--            <el-button v-if=" scope.row.lockStatus!=3" type="text" size="small"-->
+            <!--                       @click.native.stop="handleDetailClick(scope.row)">详情-->
+            <!--            </el-button>-->
+            <!--            <el-button v-if="isSpCombine" type="text" size="small" :disabled="scope.row.lockStatus===3"-->
+            <!--                       @click.native.stop="sumitLockStatus(scope.row)">提交审核-->
+            <!--            </el-button>-->
+            <!--            <el-button v-if="isSpCombine" type="text" size="small" @click.native.stop="splitSelectUdi(scope.row)"-->
+            <!--                       :disabled="scope.row.thirdId===scope.row.nameCode  || scope.row.thirdId==null || scope.row.nameCode==null || scope.row.lockStatus===3">-->
+            <!--              拆分产品-->
+            <!--            </el-button>-->
+            <!--            <el-button type="text" size="small" @click.native.stop="deleteCompanyProductRelevance(scope.row)">移除-->
+            <!--            </el-button>-->
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/supplier/company/basicCompanyProductsImport.vue b/src/views/supplier/company/basicCompanyProductsImport.vue
index 1e9093f..405eda3 100644
--- a/src/views/supplier/company/basicCompanyProductsImport.vue
+++ b/src/views/supplier/company/basicCompanyProductsImport.vue
@@ -1,922 +1,963 @@
 <template>
-    <div>
-        <el-card>
-            <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/医保编码/商品条码" clearable="true"></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="6">
-                    <el-form-item label="产品通用名:">
-                        <el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="产品通用名" clearable="true"></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="6">
-                    <el-form-item label="规格型号:">
-                        <el-input v-model="filterQuery.ggxh" style="width: 90%" placeholder="规格型号" clearable="true"></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="6">
-                  <el-form-item label="生产企业:">
-                    <el-input v-model="filterQuery.ylqxzcrbarmc" style="width: 90%" placeholder="生产企业/注册备案人" clearable="true"></el-input>
-                  </el-form-item>
-                  </el-col>
-                </el-row>
-                <el-row>
-                  <el-col :span="6">
-                    <el-form-item label="配送企业:">
-                        <el-input v-model="filterQuery.supName" style="width: 90%" placeholder="配送企业" clearable="true"></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="6">
-                    <el-form-item label="第三方产品编码:">
-                        <el-input v-model="filterQuery.thrPiId" style="width: 90%" placeholder="第三方产品编码" clearable="true"></el-input>
-                    </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="el-icon-refresh" @click="onReset">重置</el-button>
-              <el-button type="primary" icon="el-icon-search" @click="submitSearch">查询</el-button>
-              <el-button type="primary" icon="el-icon-upload" @click="selectExport">选中导入</el-button>
-            </el-button-group>
-          </div>
-
-          <el-divider style="margin: 15px"></el-divider>
-
-
-            <el-table v-loading="loading" :data="list" style="width: 100%" ref="diList" border highlight-current-row :header-cell-class-name="cellClass" @current-change="handleSelectionChange">
-                <el-table-column label width="45">
-                    <template slot-scope="scope">
-                        <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
-                    </template>
-                </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="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 width="200" label="操作">
-                    <template slot-scope="scope">
-                        <el-button type="text" size="small" @click.native.stop="handleModifyClick(scope.row)">详情</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-
-            <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>
-
-              <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="cpmctymc" show-overflow-tooltip></el-table-column>
-                <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
-                <el-table-column label="包装层级" prop="bzcj" show-overflow-tooltip></el-table-column>
-              </el-table>
-
-              <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-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-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入产品标识" v-model="editQuery.nameCode"></el-input>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-
-                <el-row>
-                  <el-col :span="12" class="el-col">
-                    <el-form-item label="规格型号" prop="ggxh">
-                      <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.ggxh"></el-input>
-                    </el-form-item>
-                  </el-col>
-
-                  <el-col :span="12" class="el-col">
-                    <el-form-item label="器械类别" prop="qxlb">
-                      <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入器械类别" v-model="editQuery.qxlb"></el-input>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-
-                <el-row>
-                  <el-col :span="12" class="el-col">
-                    <el-form-item label="产品类别" prop="cplb">
-                      <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入产品类别" v-model="editQuery.cplb"></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="12" class="el-col">
-                    <el-form-item label="分类编码" prop="flbm">
-                      <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入分类编码" v-model="editQuery.flbm"></el-input>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-
-                <el-row>
-                  <el-col :span="12" class="el-col">
-                    <el-form-item label="商品条码" prop="sptm">
-                      <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入商品条码" v-model="editQuery.sptm"></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="12" class="el-col">
-                    <el-form-item label="医保编码" prop="ybbm">
-                      <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入医保编码" v-model="editQuery.ybbm"></el-input>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-
-                <el-row>
-                  <el-col :span="12" class="el-col">
-                    <el-form-item label="医疗器械注册人" prop="ylqxzcrbarmc">
-                      <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入医疗器械注册人" v-model="editQuery.ylqxzcrbarmc"></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="12" class="el-col">
-                    <el-form-item label="注册人英文名称" prop="ylqxzcrbarywmc">
-                      <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入注册人英文名称" v-model="editQuery.ylqxzcrbarywmc"></el-input>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-
-                <el-row>
-                  <el-col :span="12" class="el-col">
-                    <el-form-item label="统一社会信用号" prop="tyshxydm">
-                      <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入统一社会信用号" v-model="editQuery.tyshxydm"></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="12" class="el-col">
-                    <el-form-item label="注册证/备案号" prop="zczbhhzbapzbh">
-                      <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入注册证/备案号" v-model="editQuery.zczbhhzbapzbh"></el-input>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-
-                <el-row>
-                  <el-col :span="12" class="el-col">
-                    <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>
-                  </el-col>
-
-                  <el-col :span="12" class="el-col">
-                    <el-form-item label="包装级别" prop="packLevel">
-                      <el-input style="width: 90%" size="small" splaceholder="请输入包装级别" :disabled="true" v-model="editQuery.packLevel"></el-input>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-
-                <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" :disabled="true"></el-input>
-                    </el-form-item>
-                  </el-col>
-
-                  <el-col :span="12" class="el-col">
-                    <el-form-item label="包含下级包装数量" prop="bhxjsl">
-                      <el-input style="width: 90%" size="small" splaceholder="请输入包含下级包装数量" :disabled="true" v-model="editQuery.bhxjsl"></el-input>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-
-                <el-row>
-                  <el-col :span="12" class="el-col">
-                    <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>
-                  </el-col>
-
-                  <el-col :span="12" class="el-col">
-                    <el-form-item label="包含最小销售包装数量" prop="bhzxxsbzsl">
-                      <el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入包含最小销售包装数量" v-model="editQuery.bhzxxsbzsl"></el-input>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-
-                <el-row>
-                  <el-col :span="12" class="el-col">
-                    <el-form-item label="是否包含批号" prop="scbssfbhph">
-                      <el-input style="width: 90%" :disabled="true" size="small"  v-model="editQuery.scbssfbhph"></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="12" class="el-col">
-                    <el-form-item label="是否包含序列号" prop="scbssfbhxlh">
-                      <el-input style="width: 90%" :disabled="true" size="small" v-model="editQuery.scbssfbhxlh" splaceholder="请输入内容"></el-input>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-
-                <el-row>
-                  <el-col :span="12" class="el-col">
-                    <el-form-item label="是否包含生产日期" prop="scbssfbhscrq">
-                      <el-input style="width: 90%" :disabled="true" size="small" v-model="editQuery.scbssfbhscrq"></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="12" class="el-col">
-                    <el-form-item label="是否包含失效日期" prop="scbssfbhsxrq">
-                      <el-input style="width: 90%" :disabled="true" v-model="editQuery.scbssfbhsxrq" ></el-input>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-
-                <el-row>
-                  <el-col :span="12" class="el-col">
-                    <el-form-item label="产品描述" prop="cpms">
-                      <el-input style="width: 90%" :disabled="true" size="small"  v-model="editQuery.cpms"></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="12" class="el-col">
-                    <el-form-item label="计量单位" prop="measname">
-                      <el-input style="width: 90%" size="small"  :disabled="true" splaceholder="请输入内容" v-model="editQuery.measname"></el-input>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-                <el-row >
-                  <el-col :span="12" class="el-col">
-                    <el-form-item label="最小包装单元内包含使用单元数量" prop="zxxsbzbhsydysl">
-                      <el-input style="width: 90%" :disabled="!checked" size="small" splaceholder="请输入内容" v-model="editQuery.zxxsbzbhsydysl"></el-input>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-              </el-form>
-
-            </el-dialog>
-
-          <pagination
-            v-show="total>0"
-            :total="total"
-            :limit.sync="filterQuery.limit"
-            :page.sync="filterQuery.page"
-            @pagination="handleCurrentChange"
-          ></pagination>
-
-        </el-card>
-        <el-card class="el-card">
-            <el-form :model="repEditQuery" ref="editQuery" border label-width="100px">
-                <el-row :gutter="20" class="el-row" type="flex">
-                    <H3 style="margin-left: 10px;margin-bottom: 15px">{{ replTitle }}</H3>
-                </el-row>
-                <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 15px">
-                    <el-col :span="12" class="el-col">
-                        <div class="text item">
-                            <div class="itemTag">
-                                <span>商品条码:&nbsp;</span>
-                            </div>
-                            <el-input
-                                style="width: 65%"
-                                size="small"
-                                splaceholder="请输入内容"
-                                v-model="repEditQuery.sptm"
-                            ></el-input>
-                        </div>
-                    </el-col>
-                    <el-col :span="12" class="el-col">
-                        <div class="text item">
-                            <div class="itemTag">
-                                <span>医保编码:&nbsp;</span>
-                            </div>
-                            <el-input
-                                style="width: 65%"
-                                size="small"
-                                splaceholder="请输入内容"
-                                v-model="repEditQuery.ybbm"
-                            ></el-input>
-                        </div>
-                    </el-col>
-                </el-row>
-
-                <el-row :gutter="20" class="el-row" type="flex">
-                    <el-col :span="12" class="el-col">
-                        <div class="text item">
-                            <div class="itemTag">
-                                <span>计量单位:&nbsp;</span>
-                            </div>
-                            <el-input
-                                style="width: 65%"
-                                size="small"
-                                splaceholder="请输入内容"
-                                v-model="repEditQuery.measname"
-                            ></el-input>
-                        </div>
-                    </el-col>
-                    <el-col :span="12" class="el-col">
-                        <div class="text item">
-                            <div class="itemTag">
-                                <span>生产厂家:&nbsp;</span>
-                            </div>
-                            <el-input
-                                style="width: 65%"
-                                size="small"
-                                v-model="repEditQuery.manufactory"
-                                splaceholder="请输入内容"
-                            ></el-input>
-                        </div>
-                    </el-col>
-                </el-row>
-
-                <el-row :gutter="20" class="el-row" type="flex">
-
-                    <el-col :span="12" class="el-col">
-                        <div class="text item">
-                            <div class="itemTag">
-                                <span>商品名称:&nbsp;</span>
-                            </div>
-                            <el-input
-                                style="width: 65%"
-                                size="small"
-                                splaceholder="请输入内容"
-                                v-model="repEditQuery.spmc"
-                            ></el-input>
-                        </div>
-                    </el-col>
-
-                    <el-col :span="12" class="el-col">
-                        <div class="text item">
-                            <div class="itemTag">
-                                <span>产品描述:&nbsp;</span>
-                            </div>
-                            <el-input
-                                style="width: 65%"
-                                size="small"
-                                splaceholder="请输入内容"
-                                v-model="repEditQuery.cpms"
-                            ></el-input>
-                        </div>
-                    </el-col>
-                </el-row>
-                <el-row :gutter="20" class="el-row" type="flex">
-                    <el-col :span="12" class="el-col">
-                        <div class="text item">
-                            <div class="itemTag">
-                                <span>产品价格:&nbsp;</span>
-                            </div>
-                            <el-input
-                                style="width: 65%"
-                                size="small"
-                                splaceholder="请输入内容"
-                                type='number'
-                                step="0.01"
-                                v-model="repEditQuery.price"
-                            ></el-input>
-                        </div>
-                    </el-col>
-
-                </el-row>
-
-
-                <el-row :gutter="20" class="el-row" type="flex">
-
-                    <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable1">
-                        <div class="text item">
-                            <div class="itemTag">
-                                <span>{{ productRemarkSet.remarkTitle1 }}:&nbsp;</span>
-                            </div>
-                            <el-input
-                                style="width: 65%"
-                                size="small"
-                                splaceholder="请输入内容"
-                                v-model="repEditQuery.basicPrductRemak1"
-                            ></el-input>
-                        </div>
-                    </el-col>
-
-                    <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable2">
-                        <div class="text item">
-                            <div class="itemTag">
-                                <span>{{ productRemarkSet.remarkTitle2 }}:&nbsp;</span>
-                            </div>
-                            <el-input
-                                style="width: 65%"
-                                size="small"
-                                splaceholder="请输入内容"
-                                v-model="repEditQuery.basicPrductRemak2"
-                            ></el-input>
-                        </div>
-                    </el-col>
-                </el-row>
-
-                <el-row :gutter="20" class="el-row" type="flex">
-
-                    <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable3">
-                        <div class="text item">
-                            <div class="itemTag">
-                                <span>{{ productRemarkSet.remarkTitle3 }}:&nbsp;</span>
-                            </div>
-                            <el-input
-                                style="width: 65%"
-                                size="small"
-                                splaceholder="请输入内容"
-                                v-model="repEditQuery.basicPrductRemak3"
-                            ></el-input>
-                        </div>
-                    </el-col>
-
-                    <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable4">
-                        <div class="text item">
-                            <div class="itemTag">
-                                <span>{{ productRemarkSet.remarkTitle4 }}:&nbsp;</span>
-                            </div>
-                            <el-input
-                                style="width: 65%"
-                                size="small"
-                                splaceholder="请输入内容"
-                                v-model="repEditQuery.basicPrductRemak4"
-                            ></el-input>
-                        </div>
-                    </el-col>
-                </el-row>
-
-                <el-row :gutter="20" class="el-row" type="flex">
-
-                    <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable5">
-                        <div class="text item">
-                            <div class="itemTag">
-                                <span>{{ productRemarkSet.remarkTitle5 }}:&nbsp;</span>
-                            </div>
-                            <el-input
-                                style="width: 65%"
-                                size="small"
-                                splaceholder="请输入内容"
-                                v-model="repEditQuery.basicPrductRemak5"
-                            ></el-input>
-                        </div>
-                    </el-col>
-
-                    <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable6">
-                        <div class="text item">
-                            <div class="itemTag">
-                                <span>{{ productRemarkSet.remarkTitle6 }}:&nbsp;</span>
-                            </div>
-                            <el-input
-                                style="width: 65%"
-                                size="small"
-                                splaceholder="请输入内容"
-                                v-model="repEditQuery.basicPrductRemak6"
-                            ></el-input>
-                        </div>
-                    </el-col>
-                </el-row>
-
-                <el-row :gutter="20" class="el-row" type="flex">
-
-                    <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable7">
-                        <div class="text item">
-                            <div class="itemTag">
-                                <span>{{ productRemarkSet.remarkTitle7 }}:&nbsp;</span>
-                            </div>
-                            <el-input
-                                style="width: 65%"
-                                size="small"
-                                splaceholder="请输入内容"
-                                v-model="repEditQuery.basicPrductRemak7"
-                            ></el-input>
-                        </div>
-                    </el-col>
-
-                    <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable8">
-                        <div class="text item">
-                            <div class="itemTag">
-                                <span>{{ productRemarkSet.remarkTitle8 }}:&nbsp;</span>
-                            </div>
-                            <el-input
-                                style="width: 65%"
-                                size="small"
-                                splaceholder="请输入内容"
-                                v-model="repEditQuery.basicPrductRemak8"
-                            ></el-input>
-                        </div>
-                    </el-col>
-                </el-row>
-            </el-form>
-        </el-card>
-    </div>
+  <div>
+    <el-card>
+      <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/医保编码/商品条码"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="产品通用名:">
+              <el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="产品通用名"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="规格型号:">
+              <el-input v-model="filterQuery.ggxh" style="width: 90%" placeholder="规格型号" clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="生产企业:">
+              <el-input v-model="filterQuery.ylqxzcrbarmc" style="width: 90%" placeholder="生产企业/注册备案人"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="配送企业:">
+              <el-input v-model="filterQuery.supName" style="width: 90%" placeholder="配送企业" clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="第三方产品编码:">
+              <el-input v-model="filterQuery.thrPiId" style="width: 90%" placeholder="第三方产品编码"
+                        clearable="true"></el-input>
+            </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="el-icon-refresh" @click="onReset">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="submitSearch">查询</el-button>
+          <el-button type="primary" icon="el-icon-upload" @click="selectExport">选中导入</el-button>
+        </el-button-group>
+      </div>
+
+      <el-divider style="margin: 15px"></el-divider>
+
+
+      <el-table v-loading="loading" :data="list" style="width: 100%" ref="diList" border highlight-current-row
+                :header-cell-class-name="cellClass" @current-change="handleSelectionChange">
+        <el-table-column label width="45">
+          <template slot-scope="scope">
+            <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
+          </template>
+        </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="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 width="200" label="操作">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.native.stop="handleModifyClick(scope.row)">详情</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <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>
+
+        <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="cpmctymc" show-overflow-tooltip></el-table-column>
+          <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
+          <el-table-column label="包装层级" prop="bzcj" show-overflow-tooltip></el-table-column>
+        </el-table>
+
+        <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-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-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入产品标识"
+                          v-model="editQuery.nameCode"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="12" class="el-col">
+              <el-form-item label="规格型号" prop="ggxh">
+                <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容"
+                          v-model="editQuery.ggxh"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12" class="el-col">
+              <el-form-item label="器械类别" prop="qxlb">
+                <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入器械类别"
+                          v-model="editQuery.qxlb"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="12" class="el-col">
+              <el-form-item label="产品类别" prop="cplb">
+                <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入产品类别"
+                          v-model="editQuery.cplb"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" class="el-col">
+              <el-form-item label="分类编码" prop="flbm">
+                <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入分类编码"
+                          v-model="editQuery.flbm"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="12" class="el-col">
+              <el-form-item label="商品条码" prop="sptm">
+                <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入商品条码"
+                          v-model="editQuery.sptm"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" class="el-col">
+              <el-form-item label="医保编码" prop="ybbm">
+                <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入医保编码"
+                          v-model="editQuery.ybbm"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="12" class="el-col">
+              <el-form-item label="医疗器械注册人" prop="ylqxzcrbarmc">
+                <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入医疗器械注册人"
+                          v-model="editQuery.ylqxzcrbarmc"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" class="el-col">
+              <el-form-item label="注册人英文名称" prop="ylqxzcrbarywmc">
+                <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入注册人英文名称"
+                          v-model="editQuery.ylqxzcrbarywmc"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="12" class="el-col">
+              <el-form-item label="统一社会信用号" prop="tyshxydm">
+                <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入统一社会信用号"
+                          v-model="editQuery.tyshxydm"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" class="el-col">
+              <el-form-item label="注册证/备案号" prop="zczbhhzbapzbh">
+                <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入注册证/备案号"
+                          v-model="editQuery.zczbhhzbapzbh"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="12" class="el-col">
+              <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>
+            </el-col>
+
+            <el-col :span="12" class="el-col">
+              <el-form-item label="包装级别" prop="packLevel">
+                <el-input style="width: 90%" size="small" splaceholder="请输入包装级别" :disabled="true"
+                          v-model="editQuery.packLevel"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <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"
+                          :disabled="true"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12" class="el-col">
+              <el-form-item label="包含下级包装数量" prop="bhxjsl">
+                <el-input style="width: 90%" size="small" splaceholder="请输入包含下级包装数量" :disabled="true"
+                          v-model="editQuery.bhxjsl"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="12" class="el-col">
+              <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>
+            </el-col>
+
+            <el-col :span="12" class="el-col">
+              <el-form-item label="包含最小销售包装数量" prop="bhzxxsbzsl">
+                <el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入包含最小销售包装数量"
+                          v-model="editQuery.bhzxxsbzsl"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="12" class="el-col">
+              <el-form-item label="是否包含批号" prop="scbssfbhph">
+                <el-input style="width: 90%" :disabled="true" size="small" v-model="editQuery.scbssfbhph"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" class="el-col">
+              <el-form-item label="是否包含序列号" prop="scbssfbhxlh">
+                <el-input style="width: 90%" :disabled="true" size="small" v-model="editQuery.scbssfbhxlh"
+                          splaceholder="请输入内容"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="12" class="el-col">
+              <el-form-item label="是否包含生产日期" prop="scbssfbhscrq">
+                <el-input style="width: 90%" :disabled="true" size="small" v-model="editQuery.scbssfbhscrq"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" class="el-col">
+              <el-form-item label="是否包含失效日期" prop="scbssfbhsxrq">
+                <el-input style="width: 90%" :disabled="true" v-model="editQuery.scbssfbhsxrq"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="12" class="el-col">
+              <el-form-item label="产品描述" prop="cpms">
+                <el-input style="width: 90%" :disabled="true" size="small" v-model="editQuery.cpms"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" class="el-col">
+              <el-form-item label="计量单位" prop="measname">
+                <el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入内容"
+                          v-model="editQuery.measname"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12" class="el-col">
+              <el-form-item label="最小包装单元内包含使用单元数量" prop="zxxsbzbhsydysl">
+                <el-input style="width: 90%" :disabled="!checked" size="small" splaceholder="请输入内容"
+                          v-model="editQuery.zxxsbzbhsydysl"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+
+      </el-dialog>
+
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :limit.sync="filterQuery.limit"
+        :page.sync="filterQuery.page"
+        @pagination="handleCurrentChange"
+      ></pagination>
+
+    </el-card>
+    <el-card class="el-card">
+      <el-form :model="repEditQuery" ref="editQuery" border label-width="100px">
+        <el-row :gutter="20" class="el-row" type="flex">
+          <H3 style="margin-left: 10px;margin-bottom: 15px">{{ replTitle }}</H3>
+        </el-row>
+        <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 15px">
+          <el-col :span="12" class="el-col">
+            <div class="text item">
+              <div class="itemTag">
+                <span>商品条码:&nbsp;</span>
+              </div>
+              <el-input
+                style="width: 65%"
+                size="small"
+                splaceholder="请输入内容"
+                v-model="repEditQuery.sptm"
+              ></el-input>
+            </div>
+          </el-col>
+          <el-col :span="12" class="el-col">
+            <div class="text item">
+              <div class="itemTag">
+                <span>医保编码:&nbsp;</span>
+              </div>
+              <el-input
+                style="width: 65%"
+                size="small"
+                splaceholder="请输入内容"
+                v-model="repEditQuery.ybbm"
+              ></el-input>
+            </div>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20" class="el-row" type="flex">
+          <el-col :span="12" class="el-col">
+            <div class="text item">
+              <div class="itemTag">
+                <span>计量单位:&nbsp;</span>
+              </div>
+              <el-input
+                style="width: 65%"
+                size="small"
+                splaceholder="请输入内容"
+                v-model="repEditQuery.measname"
+              ></el-input>
+            </div>
+          </el-col>
+          <el-col :span="12" class="el-col">
+            <div class="text item">
+              <div class="itemTag">
+                <span>生产厂家:&nbsp;</span>
+              </div>
+              <el-input
+                style="width: 65%"
+                size="small"
+                v-model="repEditQuery.manufactory"
+                splaceholder="请输入内容"
+              ></el-input>
+            </div>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20" class="el-row" type="flex">
+
+          <el-col :span="12" class="el-col">
+            <div class="text item">
+              <div class="itemTag">
+                <span>商品名称:&nbsp;</span>
+              </div>
+              <el-input
+                style="width: 65%"
+                size="small"
+                splaceholder="请输入内容"
+                v-model="repEditQuery.spmc"
+              ></el-input>
+            </div>
+          </el-col>
+
+          <el-col :span="12" class="el-col">
+            <div class="text item">
+              <div class="itemTag">
+                <span>产品描述:&nbsp;</span>
+              </div>
+              <el-input
+                style="width: 65%"
+                size="small"
+                splaceholder="请输入内容"
+                v-model="repEditQuery.cpms"
+              ></el-input>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20" class="el-row" type="flex">
+          <el-col :span="12" class="el-col">
+            <div class="text item">
+              <div class="itemTag">
+                <span>产品价格:&nbsp;</span>
+              </div>
+              <el-input
+                style="width: 65%"
+                size="small"
+                splaceholder="请输入内容"
+                type='number'
+                step="0.01"
+                v-model="repEditQuery.price"
+              ></el-input>
+            </div>
+          </el-col>
+
+        </el-row>
+
+
+        <el-row :gutter="20" class="el-row" type="flex">
+
+          <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable1">
+            <div class="text item">
+              <div class="itemTag">
+                <span>{{ productRemarkSet.remarkTitle1 }}:&nbsp;</span>
+              </div>
+              <el-input
+                style="width: 65%"
+                size="small"
+                splaceholder="请输入内容"
+                v-model="repEditQuery.basicPrductRemak1"
+              ></el-input>
+            </div>
+          </el-col>
+
+          <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable2">
+            <div class="text item">
+              <div class="itemTag">
+                <span>{{ productRemarkSet.remarkTitle2 }}:&nbsp;</span>
+              </div>
+              <el-input
+                style="width: 65%"
+                size="small"
+                splaceholder="请输入内容"
+                v-model="repEditQuery.basicPrductRemak2"
+              ></el-input>
+            </div>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20" class="el-row" type="flex">
+
+          <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable3">
+            <div class="text item">
+              <div class="itemTag">
+                <span>{{ productRemarkSet.remarkTitle3 }}:&nbsp;</span>
+              </div>
+              <el-input
+                style="width: 65%"
+                size="small"
+                splaceholder="请输入内容"
+                v-model="repEditQuery.basicPrductRemak3"
+              ></el-input>
+            </div>
+          </el-col>
+
+          <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable4">
+            <div class="text item">
+              <div class="itemTag">
+                <span>{{ productRemarkSet.remarkTitle4 }}:&nbsp;</span>
+              </div>
+              <el-input
+                style="width: 65%"
+                size="small"
+                splaceholder="请输入内容"
+                v-model="repEditQuery.basicPrductRemak4"
+              ></el-input>
+            </div>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20" class="el-row" type="flex">
+
+          <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable5">
+            <div class="text item">
+              <div class="itemTag">
+                <span>{{ productRemarkSet.remarkTitle5 }}:&nbsp;</span>
+              </div>
+              <el-input
+                style="width: 65%"
+                size="small"
+                splaceholder="请输入内容"
+                v-model="repEditQuery.basicPrductRemak5"
+              ></el-input>
+            </div>
+          </el-col>
+
+          <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable6">
+            <div class="text item">
+              <div class="itemTag">
+                <span>{{ productRemarkSet.remarkTitle6 }}:&nbsp;</span>
+              </div>
+              <el-input
+                style="width: 65%"
+                size="small"
+                splaceholder="请输入内容"
+                v-model="repEditQuery.basicPrductRemak6"
+              ></el-input>
+            </div>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20" class="el-row" type="flex">
+
+          <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable7">
+            <div class="text item">
+              <div class="itemTag">
+                <span>{{ productRemarkSet.remarkTitle7 }}:&nbsp;</span>
+              </div>
+              <el-input
+                style="width: 65%"
+                size="small"
+                splaceholder="请输入内容"
+                v-model="repEditQuery.basicPrductRemak7"
+              ></el-input>
+            </div>
+          </el-col>
+
+          <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable8">
+            <div class="text item">
+              <div class="itemTag">
+                <span>{{ productRemarkSet.remarkTitle8 }}:&nbsp;</span>
+              </div>
+              <el-input
+                style="width: 65%"
+                size="small"
+                splaceholder="请输入内容"
+                v-model="repEditQuery.basicPrductRemak8"
+              ></el-input>
+            </div>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
+  </div>
 </template>
 
 <script>
-import { updateErpProduct, thirdSysDetail, getSmUdiInfos } from "../../../api/basic/udiRelevance";
+import {updateErpProduct, thirdSysDetail, getSmUdiInfos} from "../../../api/basic/udiRelevance";
 import {udiUpload} from "../../../api/thrsys/smp"
 import {finProductSet, selectSysParamByKey} from "../../../api/param/systemParamConfig";
 import {filterByUuid} from "../../../api/basic/udiInfo";
-import { insertCompanyProductRelevance, insertFilter } from "../../../api/basic/companyProductRelevance";
+import {insertCompanyProductRelevance, insertFilter} from "../../../api/basic/companyProductRelevance";
 import store from "../../../store";
+import {isBlank} from "@/utils/strUtil";
 
 export default {
-    name: "UdIInfoSelect",
-    props: {
-        selectType: {
-            type: Object,
-            required: true,
-        },
-        closeSelDialog: {
-            type: Function,
-            required: true,
-        },
+  name: "UdIInfoSelect",
+  props: {
+    selectType: {
+      type: Object,
+      required: true,
     },
-    data() {
-        return {
-            showSearch: true,
-            radioCheck: null,
-            filterQuery: {
-                customerId: null,
-                ylqxzcrbarmc: "",
-                supName: null,
-                cpmctymc: "",
-                nameCode: "",
-                page: 1,
-                limit: 10,
-                addType: 1,
-                isDisable: false,
-
-            },
-
-
-            postQuery: {
-                price:null,
-                customerId: null,
-                uuids: [],
-                rlIds: [],
-                supplementRequest: null,
-            },
-            loading: false,
-            editQuery: null,
-            repEditQuery: {},
-            relevanceEdit: {
-                id: null,
-                thirdId: "",
-                isUseDy: false,
-            },
-
-            replTitle: "产品信息补齐:",
-            isImport: false,
-            isImportUdi: false,
-            isUploadSmp: false,
-            isImportFile: false,
-            uploadFileUrl: null,
-            checked: false,
-            list: [],
-            detailList: [],
-            sysList: [],
-            total: 0,
-            thirdNo: "",
-            uuid: "111",
-            thirdId: null,
-            relId: "",
-            thisData: {
-                nameCode: null,
-                cpmctymc: null,
-                ggxh: null
-            },
-            currentRow: null,
-            multipleSelection: [],
-            editDialogVisible: false,
-            selectUdiDialogVisible: false,
-            selectErpDialogVisible: false,
-            selectLocalVisible: false,
-            productRemarkSet: {},
-            supplementRequest: null,
-        };
+    closeSelDialog: {
+      type: Function,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      showSearch: true,
+      radioCheck: null,
+      filterQuery: {
+        customerId: null,
+        ylqxzcrbarmc: "",
+        supName: null,
+        cpmctymc: "",
+        nameCode: "",
+        page: 1,
+        limit: 10,
+        addType: 1,
+        isDisable: false,
+
+      },
+
+
+      postQuery: {
+        price: null,
+        customerId: null,
+        uuids: [],
+        rlIds: [],
+        supplementRequest: null,
+      },
+      loading: false,
+      editQuery: null,
+      repEditQuery: {},
+      relevanceEdit: {
+        id: null,
+        thirdId: "",
+        isUseDy: false,
+      },
+
+      replTitle: "产品信息补齐:",
+      isImport: false,
+      isImportUdi: false,
+      isUploadSmp: false,
+      isImportFile: false,
+      uploadFileUrl: null,
+      checked: false,
+      list: [],
+      detailList: [],
+      sysList: [],
+      total: 0,
+      thirdNo: "",
+      uuid: "111",
+      thirdId: null,
+      relId: "",
+      thisData: {
+        nameCode: null,
+        cpmctymc: null,
+        ggxh: null
+      },
+      currentRow: null,
+      multipleSelection: [],
+      editDialogVisible: false,
+      selectUdiDialogVisible: false,
+      selectErpDialogVisible: false,
+      selectLocalVisible: false,
+      productRemarkSet: {},
+      supplementRequest: null,
+    };
+  },
+
+  methods: {
+    onReset() {
+      this.radioCheck = null;
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        customerId: null,
+        ylqxzcrbarmc: "",
+        supName: null,
+        cpmctymc: "",
+        nameCode: "",
+        page: 1,
+        limit: 10,
+        addType: 1,
+      };
+      this.getList();
     },
 
-    methods: {
-        onReset() {
-            this.radioCheck = null;
-            this.$router.push({
-                path: "",
-            });
-            this.filterQuery = {
-                customerId: null,
-                ylqxzcrbarmc: "",
-                supName: null,
-                cpmctymc: "",
-                nameCode: "",
-                page: 1,
-                limit: 10,
-                addType: 1,
-            };
-            this.getList();
-        },
-
-
-        submitSearch() {
-            this.filterQuery.page = 1;
-            this.getList();
-        },
-        getList() {
-            this.loading = true;
-            this.filterQuery.customerId = store.getters.customerId;
-            getSmUdiInfos(this.filterQuery)
-                .then((response) => {
-                    this.loading = false;
-                    this.list = response.data.list || [];
-                    this.total = response.data.total || 0;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                    this.total = 0;
-                });
-        },
-
-        getDetailList(detailQuery) {
-            this.loading = true;
-            filterByUuid(detailQuery)
-                .then((response) => {
-                    this.loading = false;
-                    this.detailList = response.data || [];
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.detailList = [];
-                });
-        },
-        hideSearch() {
-          this.showSearch = !this.showSearch;
-        },
-        handleDetail(row) {
-            this.editQuery = row;
-        },
-
-        combine() {
-            this.combineQuery.productUuid = this.currentRow.uuid;
-            this.combineQuery.customerId = store.getters.customerId;
-            insertCompanyProductRelevance(this.combineQuery).then(response => {
-                this.loading = false;
-                if (response.code === 20000) {
-                    this.$message.success("添加成功");
-                    this.closeDialog(true);
-                } else {
-                    this.$message.error(response.message);
-                }
-            });
-        },
-
-        cellClass(row) {
-            if (row.columnIndex === 0) {
-                return 'disabledCheck'
-            }
-        },
-        selectExport() {
-            var selectData = this.multipleSelection;
-            if (selectData == null || selectData.length == 0) {
-                this.$message.warning("请先选入产品！");
-                return;
-            }
-            if (this.repEditQuery.price < 0) {
-                this.$message.error("产品价格不能小于0元！");
-                return;
-            }
-            this.postQuery.rlIds.splice(0);
-            this.postQuery.rlIds.push(selectData.id);
-            this.postQuery.price=this.repEditQuery.price;
-            this.allExport();
-
-        },
-        allExport() {
-            this.postQuery.customerId = store.getters.customerId;
-            this.postQuery.supplementRequest = this.repEditQuery;
-            insertFilter(this.postQuery).then(response => {
-                this.loading = false;
-                if (response.code == 20000) {
-                    this.$message.success(response.data);
-                    this.$emit("closeSelDialog", true);
-                    this.closeSelDialog();
-                } else {
-                    this.$message.error(response.message);
-                }
-            });
-        },
-
-        intentDetail() {
-            this.isImportUdi = false;
-            this.selectUdiDialogVisible = true;
-        },
-
-        intentImportErp(val) {
-            this.uuid = val.uuid;
-            this.relId = val.id;
-            this.isImport = true;
-            this.thisData = val;
-            this.selectErpDialogVisible = true;
-        },
-        uploadSMP() {
-            var selectData = this.multipleSelection;
-            selectData.forEach((obj) => {
-                this.postQuery.uuids.push(obj.uuid);
-            });
-            this.allUploadSMP();
-        },
-
-        allUploadSMP() {
-            udiUpload(this.postQuery)
-                .then((response) => {
-                    if (response.code == 20000) {
-                        this.$message({
-                            type: "success",
-                            message: "上传成功！",
-                        });
-                    } else {
-                        this.$message({
-                            type: "error",
-                            message: response.message,
-                        });
-                    }
-                    this.$emit("cancelDialog", true);
-                })
-                .catch(() => {
-                    this.$message({
-                        type: "error",
-                        message: "上传失败",
-                    });
-                    this.$emit("cancelDialog", true);
-                });
-        },
-        handleSelectionChange(selection) {
-            this.radioCheck = selection.id;
-            this.curSelectDi = selection;
-            if (selection.length > 1) {
-                this.$refs.diList.clearSelection();
-                this.$refs.diList.toggleRowSelection(selection.pop());
-            }
-
-            this.multipleSelection = selection
-            this.currentRow = selection;
-            this.replTitle = "(" + this.currentRow.cpmctymc + ")" + "产品信息补齐:";
-        },
-        handleErpChange(val) {
-            this.currentRow = val;
-        },
-        handleCurrentChange(val) {
-            this.filterQuery.page = val.page;
-            this.getList();
-        },
-        handleModifyClick(row) {
-            this.editDialogVisible = true;
-            this.editQuery = row;
-            this.relevanceEdit = {
-                id: row.id,
-                thirdId: row.thirdId,
-                isUseDy: row.isUseDy,
-            };
-
-            let ttquery = {
-                id: row.id,
-                page: 1,
-                limit: 10,
-            };
-
-            this.getDetailList(ttquery);
-            this.getThirdSysDetail();
-        },
-        closeUdi(val) {
-            this.selectUdiDialogVisible = false;
-            this.selectErpDialogVisible = false;
-            this.selectLocalVisible = false;
-            if (val) {
-                this.getList();
-            }
-        },
-        getThirdSysDetail() {
-            let query = {
-                id: this.relevanceEdit.id,
-            };
-
-            thirdSysDetail(query)
-                .then((response) => {
-                    this.loading = false;
-                    this.sysList = response.data.list || [];
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.sysList = [];
-                });
-        },
-        checkSelectable(row) {
-            return !row.isSelect;
-        },
-        uploadErpProduct() {
-            updateErpProduct()
-                .then((response) => {
-                    if (response.code == 20000) {
-                        this.$message({
-                            type: "success",
-                            message: response.data,
-                        });
-                        this.$emit("closeDialog", true);
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                })
-                .catch(() => {
-                });
-        },
-
-        closeDialog() {
-            this.selectErpDialogVisible = false;
-            this.selectLocalVisible = false;
-        },
-
-        selectSysParam() {
-            let query = {
-                paramKey: "smp_isUploadProuct",
-            };
-            selectSysParamByKey(query).then((response) => {
-                if (response.code == 20000) {
-                    if (response.data.paramValue == "1") {
-                        this.isUploadSmp = true;
-                    }
-                }
-            });
-            let query1 = {
-                paramKey: "upload_pi_file_enabled",
-            };
-            selectSysParamByKey(query1).then((response) => {
-                if (response.code == 20000) {
-                    if (response.data.paramValue == "1") {
-                        this.isImportFile = true;
-                    }
-                }
+
+    submitSearch() {
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    getList() {
+      this.loading = true;
+      this.filterQuery.customerId = store.getters.customerId;
+      getSmUdiInfos(this.filterQuery)
+        .then((response) => {
+          this.loading = false;
+          this.list = response.data.list || [];
+          this.total = response.data.total || 0;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+
+    getDetailList(detailQuery) {
+      this.loading = true;
+      filterByUuid(detailQuery)
+        .then((response) => {
+          this.loading = false;
+          this.detailList = response.data || [];
+        })
+        .catch(() => {
+          this.loading = false;
+          this.detailList = [];
+        });
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    handleDetail(row) {
+      this.editQuery = row;
+    },
+
+    combine() {
+      this.combineQuery.productUuid = this.currentRow.uuid;
+      this.combineQuery.customerId = store.getters.customerId;
+      insertCompanyProductRelevance(this.combineQuery).then(response => {
+        this.loading = false;
+        if (response.code === 20000) {
+          this.$message.success("添加成功");
+          this.closeDialog(true);
+        } else {
+          this.$message.error(response.message);
+        }
+      });
+    },
+
+    cellClass(row) {
+      if (row.columnIndex === 0) {
+        return 'disabledCheck'
+      }
+    },
+    selectExport() {
+      var selectData = this.multipleSelection;
+      if (selectData == null || selectData.length == 0) {
+        this.$message.warning("请先选入产品！");
+        return;
+      }
+      if (this.repEditQuery.price < 0) {
+        this.$message.error("产品价格不能小于0元！");
+        return;
+      }
+      this.postQuery.rlIds.splice(0);
+      this.postQuery.rlIds.push(selectData.id);
+      this.postQuery.price = this.repEditQuery.price;
+      this.allExport();
+
+    },
+    allExport() {
+      this.postQuery.customerId = store.getters.customerId;
+      this.postQuery.supplementRequest = this.repEditQuery;
+      insertFilter(this.postQuery).then(response => {
+        this.loading = false;
+        if (response.code == 20000) {
+          this.$message.success(response.data);
+          this.$emit("closeSelDialog", true);
+          this.closeSelDialog();
+        } else {
+          this.$message.error(response.message);
+        }
+      });
+    },
+
+    intentDetail() {
+      this.isImportUdi = false;
+      this.selectUdiDialogVisible = true;
+    },
+
+    intentImportErp(val) {
+      this.uuid = val.uuid;
+      this.relId = val.id;
+      this.isImport = true;
+      this.thisData = val;
+      this.selectErpDialogVisible = true;
+    },
+    uploadSMP() {
+      var selectData = this.multipleSelection;
+      selectData.forEach((obj) => {
+        this.postQuery.uuids.push(obj.uuid);
+      });
+      this.allUploadSMP();
+    },
+
+    allUploadSMP() {
+      udiUpload(this.postQuery)
+        .then((response) => {
+          if (response.code == 20000) {
+            this.$message({
+              type: "success",
+              message: "上传成功！",
             });
-            let query2 = {
-                paramKey: "upload_pi_file_url",
-            };
-            selectSysParamByKey(query2).then((response) => {
-                if (response.code == 20000) {
-                    this.uploadFileUrl = response.data.paramValue;
-                }
+          } else {
+            this.$message({
+              type: "error",
+              message: response.message,
             });
-        },
-        findBasicProductSet() {
-            finProductSet().then((response) => {
-                if (response.code == 20000) {
-                    this.productRemarkSet = response.data;
-                } else {
-                    //出错了
-                }
+          }
+          this.$emit("cancelDialog", true);
+        })
+        .catch(() => {
+          this.$message({
+            type: "error",
+            message: "上传失败",
+          });
+          this.$emit("cancelDialog", true);
+        });
+    },
+    handleSelectionChange(selection) {
+      this.radioCheck = selection.id;
+      this.curSelectDi = selection;
+      if (selection.length > 1) {
+        this.$refs.diList.clearSelection();
+        this.$refs.diList.toggleRowSelection(selection.pop());
+      }
+
+      this.multipleSelection = selection
+      this.currentRow = selection;
+      this.replTitle = "(" + this.currentRow.cpmctymc + ")" + "产品信息补齐:";
+      this.repEditQuery.sptm = this.currentRow.sptm;
+      this.repEditQuery.ybbm = this.currentRow.ybbm;
+      this.repEditQuery.measname = this.currentRow.measname;
+      this.repEditQuery.manufactory = this.currentRow.manufactory;
+      this.repEditQuery.spmc = this.currentRow.spmc;
+      this.repEditQuery.cpms = this.currentRow.cpms;
+
+      if (isBlank(this.relevanceEdit.cpms)) {
+        this.repEditQuery.cpms =this.currentRow.cpmctymc+this.currentRow.ggxh
+      }
+
+    },
+    handleErpChange(val) {
+      this.currentRow = val;
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val.page;
+      this.getList();
+    },
+    handleModifyClick(row) {
+      this.editDialogVisible = true;
+      this.editQuery = row;
+      this.relevanceEdit = {
+        id: row.id,
+        thirdId: row.thirdId,
+        isUseDy: row.isUseDy,
+      };
+
+      let ttquery = {
+        id: row.id,
+        page: 1,
+        limit: 10,
+      };
+
+      this.getDetailList(ttquery);
+      this.getThirdSysDetail();
+    },
+    closeUdi(val) {
+      this.selectUdiDialogVisible = false;
+      this.selectErpDialogVisible = false;
+      this.selectLocalVisible = false;
+      if (val) {
+        this.getList();
+      }
+    },
+    getThirdSysDetail() {
+      let query = {
+        id: this.relevanceEdit.id,
+      };
+
+      thirdSysDetail(query)
+        .then((response) => {
+          this.loading = false;
+          this.sysList = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+          this.sysList = [];
+        });
+    },
+    checkSelectable(row) {
+      return !row.isSelect;
+    },
+    uploadErpProduct() {
+      updateErpProduct()
+        .then((response) => {
+          if (response.code == 20000) {
+            this.$message({
+              type: "success",
+              message: response.data,
             });
-        },
+            this.$emit("closeDialog", true);
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+        });
     },
-    mounted() {
+
+    closeDialog() {
+      this.selectErpDialogVisible = false;
+      this.selectLocalVisible = false;
     },
-    components: {},
-    created() {
-        this.selectSysParam();
-        this.findBasicProductSet();
 
+    selectSysParam() {
+      let query = {
+        paramKey: "smp_isUploadProuct",
+      };
+      selectSysParamByKey(query).then((response) => {
+        if (response.code == 20000) {
+          if (response.data.paramValue == "1") {
+            this.isUploadSmp = true;
+          }
+        }
+      });
+      let query1 = {
+        paramKey: "upload_pi_file_enabled",
+      };
+      selectSysParamByKey(query1).then((response) => {
+        if (response.code == 20000) {
+          if (response.data.paramValue == "1") {
+            this.isImportFile = true;
+          }
+        }
+      });
+      let query2 = {
+        paramKey: "upload_pi_file_url",
+      };
+      selectSysParamByKey(query2).then((response) => {
+        if (response.code == 20000) {
+          this.uploadFileUrl = response.data.paramValue;
+        }
+      });
+    },
+    findBasicProductSet() {
+      finProductSet().then((response) => {
+        if (response.code == 20000) {
+          this.productRemarkSet = response.data;
+        } else {
+          //出错了
+        }
+      });
     },
+  },
+  mounted() {
+  },
+  components: {},
+  created() {
+    this.selectSysParam();
+    this.findBasicProductSet();
+
+  },
 };
 </script>
 <style scoped>
 
 .el-table .disabledCheck .cell .el-checkbox .el-checkbox__input {
-    display: none !important;
+  display: none !important;
 }
 
 .itemTag {
-    float: left;
-    text-align: left;
-    margin-top: 10px;
-    width: 25%;
+  float: left;
+  text-align: left;
+  margin-top: 10px;
+  width: 25%;
 }
 
 .query-form-item {
-    display: block !important;
-    margin-right: 10px;
-    margin-bottom: 5px;
+  display: block !important;
+  margin-right: 10px;
+  margin-bottom: 5px;
 }
 
 .text {
-    font-size: 13px;
-    font-family: "Microsoft YaHei";
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
 }
 
 .el-row {
-    display: flex;
-    flex-wrap: wrap;
-    margin-bottom: 6px;
+  display: flex;
+  flex-wrap: wrap;
+  margin-bottom: 6px;
 }
 
 .el-col {
-    border-radius: 4px;
-    flex-wrap: wrap;
+  border-radius: 4px;
+  flex-wrap: wrap;
 }
+
 .el-form-item--mini.el-form-item {
-   margin-bottom: 9px;
- }
+  margin-bottom: 9px;
+}
 
 </style>
diff --git a/src/views/supplier/company/basicCompanyproductDetail.vue b/src/views/supplier/company/basicCompanyproductDetail.vue
index 13a4fe2..86c7e08 100644
--- a/src/views/supplier/company/basicCompanyproductDetail.vue
+++ b/src/views/supplier/company/basicCompanyproductDetail.vue
@@ -169,7 +169,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: 65%"
diff --git a/src/views/supplier/company/basicProductEdit.vue b/src/views/supplier/company/basicProductEdit.vue
index a88bfe0..bec39b4 100644
--- a/src/views/supplier/company/basicProductEdit.vue
+++ b/src/views/supplier/company/basicProductEdit.vue
@@ -376,7 +376,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: 65%"
diff --git a/src/views/supplier/products/supProductsAddDi.vue b/src/views/supplier/products/supProductsAddDi.vue
index f41a3e2..7de00bc 100644
--- a/src/views/supplier/products/supProductsAddDi.vue
+++ b/src/views/supplier/products/supProductsAddDi.vue
@@ -46,8 +46,8 @@
           <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
           <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
           <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
-          <el-button type="primary" icon="el-icon-plus" @click="addDiProductVisible=true">选入</el-button>
-          <el-button type="primary" icon="el-icon-plus" @click="addProductVisible=true">新增</el-button>
+          <el-button type="primary" icon="el-icon-plus" @click="addDiProductVisible=true">选入DI信息</el-button>
+          <el-button type="primary" icon="el-icon-plus" @click="addProductVisible=true">添加院内字典</el-button>
         </el-button-group>
       </div>
       <el-divider style="margin: 15px"></el-divider>