From 9b510d18aa43fdac858237b38676854734875067 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Mon, 16 Jan 2023 17:23:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=97=E6=9D=90=E5=AD=97=E5=85=B8=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=EF=BC=8C=E9=80=89=E5=85=A5=EF=BC=8C=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/basic/product/udiRelevance.js         |   9 +
 ...lectErpUdi.vue => UdiInfoSelectErpUdi.vue} | 534 +++++++--------
 .../basic/product/UdiInfoSelectLocalUdi.vue   | 632 ++++++++----------
 ...InfoRelevance.vue => UdiInfoSelectRel.vue} | 444 ++++++------
 src/views/basic/product/product.vue           |  93 ++-
 src/views/basic/product/productEdit.vue       |  42 +-
 src/views/basic/product/productSingleEdit.vue |  64 ++
 7 files changed, 947 insertions(+), 871 deletions(-)
 rename src/views/basic/product/{UdiInfoselectErpUdi.vue => UdiInfoSelectErpUdi.vue} (51%)
 rename src/views/basic/product/{UdiInfoRelevance.vue => UdiInfoSelectRel.vue} (56%)
 create mode 100644 src/views/basic/product/productSingleEdit.vue

diff --git a/src/api/basic/product/udiRelevance.js b/src/api/basic/product/udiRelevance.js
index d564b3ae..e74c7e3c 100644
--- a/src/api/basic/product/udiRelevance.js
+++ b/src/api/basic/product/udiRelevance.js
@@ -51,6 +51,15 @@ export function updatetUdiInfos(query) {
 }
 
 
+export function updatetSingleUdiInfo(query) {
+  return axios({
+    url: "/udi/udirel/update/di",
+    method: "post",
+    data: query
+  });
+}
+
+
 export function checkExitUdi(query) {
   return axios({
     url: "/udi/udirel/check/udi",
diff --git a/src/views/basic/product/UdiInfoselectErpUdi.vue b/src/views/basic/product/UdiInfoSelectErpUdi.vue
similarity index 51%
rename from src/views/basic/product/UdiInfoselectErpUdi.vue
rename to src/views/basic/product/UdiInfoSelectErpUdi.vue
index 996d8d99..ded05d9e 100644
--- a/src/views/basic/product/UdiInfoselectErpUdi.vue
+++ b/src/views/basic/product/UdiInfoSelectErpUdi.vue
@@ -2,88 +2,102 @@
   <div>
     <el-card class="el-card">
       <div>
-        <el-form :inline="true" :model="erpQuery" style="display: flex;" size="mini">
+        <el-form :model="erpQuery" size="mini" label-width="125px" v-show="showSearch">
           <el-row>
-            <el-form-item class="query-form-item">
-              <el-input
-                v-model="erpQuery.code"
-                placeholder="产品编码/商品条码/医保编码" clearable="true"
-                @keyup.enter.native="keyupErp_submit($event)"
-              ></el-input>
-            </el-form-item>
-            <el-form-item class="query-form-item">
-              <el-input
-                v-model="erpQuery.name"
-                placeholder="产品名称" clearable="true"
-                @keyup.enter.native="keyup_submit($event)"
-              ></el-input>
-            </el-form-item>
-            <el-form-item class="query-form-item">
-              <el-input
-                v-model="erpQuery.spec"
-                placeholder="规格型号" clearable="true"
-                @keyup.enter.native="keyupErp_submit($event)"
-              ></el-input>
-            </el-form-item>
-            <el-form-item class="query-form-item">
-              <el-input
-                v-model="erpQuery.registerNo" clearable="true"
-                placeholder="注册/备案凭证号"
-                @keyup.enter.native="keyup_submit($event)"
-              ></el-input>
-            </el-form-item>
-            <el-form-item class="query-form-item">
-              <el-input
-                v-model="erpQuery.manufactory" clearable="true"
-                placeholder="生产厂家"
-                @keyup.enter.native="keyup_submit($event)"
-              ></el-input>
-            </el-form-item>
-            <el-form-item class="query-form-item">
-              <el-input
-                v-model="erpQuery.supName" clearable="true"
-                placeholder="配送企业"
-                @keyup.enter.native="keyup_submit($event)"
-              ></el-input>
-            </el-form-item>
-
-            <el-form-item class="query-form-item">
-              <el-select v-model="thirdSysFk" placeholder="请设置主系统" disabled="isImport">
-                <el-option
-                  v-for="item in thirdSys"
-                  :key="item.value"
-                  :label="item.thirdName"
-                  :value="item.thirdId">
-                  <span style="float: left">{{ item.thirdName }}</span>
-                  <span
-                    style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>
-                </el-option>
-              </el-select>
-            </el-form-item>
-
-
-            <el-form-item style="display: flex">
-              <el-button-group>
-                <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-                <el-button type="primary" icon="search" @click="searchErpList">查询</el-button>
-                <el-button type="primary" icon="search" @click="combine" :loading="combineLoading"
-                >选入
-                </el-button
-                >
-                <el-button type="primary" icon="search" @click="combineAll"
-                           v-if="isImport  &&  !supEnable"
-                >结果全部选入
-                </el-button
-                >
-              </el-button-group>
-            </el-form-item>
+            <el-col :span="6">
+              <el-form-item class="query-form-item" label="产品编码:">
+                <el-input
+                  v-model="erpQuery.code"
+                  placeholder="产品编码/商品条码/医保编码" clearable="true"
+                  @keyup.enter.native="keyupErp_submit($event)"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item class="query-form-item" label="产品名称:">
+                <el-input
+                  v-model="erpQuery.name"
+                  placeholder="产品名称" clearable="true"
+                  @keyup.enter.native="keyup_submit($event)"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item class="query-form-item" label="规格型号:">
+                <el-input
+                  v-model="erpQuery.spec"
+                  placeholder="规格型号" clearable="true"
+                  @keyup.enter.native="keyupErp_submit($event)"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item class="query-form-item" label="注册/备案凭证号:">
+                <el-input
+                  v-model="erpQuery.registerNo" clearable="true"
+                  placeholder="注册/备案凭证号"
+                  @keyup.enter.native="keyup_submit($event)"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item class="query-form-item" label="生产厂家:">
+                <el-input
+                  v-model="erpQuery.manufactory" clearable="true"
+                  placeholder="生产厂家"
+                  @keyup.enter.native="keyup_submit($event)"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item class="query-form-item" label="配送企业:">
+                <el-input
+                  v-model="erpQuery.supName" clearable="true"
+                  placeholder="配送企业"
+                  @keyup.enter.native="keyup_submit($event)"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item class="query-form-item" label="外部系统:">
+                <el-select v-model="thirdSysFk" placeholder="请设置主系统" disabled="isImport">
+                  <el-option
+                    v-for="item in thirdSys"
+                    :key="item.value"
+                    :label="item.thirdName"
+                    :value="item.thirdId">
+                    <span style="float: left">{{ item.thirdName }}</span>
+                    <span
+                      style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
           </el-row>
         </el-form>
+
+        <div class="top-right-btn">
+          <el-button-group>
+            <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="searchErpList">查询</el-button>
+            <el-button type="primary" icon="el-icon-bottom-left" @click="combine" :loading="combineLoading">选入
+            </el-button>
+            <el-button type="primary" icon="el-icon-plus" @click="combineAll" v-if="isImport  &&  !supEnable">结果全部选入
+            </el-button>
+          </el-button-group>
+        </div>
+        <el-divider style="margin: 15px"></el-divider>
+
+
         <el-table
           :data="erpList"
           style="width: 100%"
           highlight-current-row="true"
           v-loading="erpLloading"
+          border
           @current-change="handleErpChange"
           @selection-change="handleSelectionChange"
         >
@@ -93,213 +107,170 @@
             width="55"
           ></el-table-column>
           <el-table-column label="序号" type="index"></el-table-column>
-          <el-table-column label="产品编码" prop="code"></el-table-column>
-          <el-table-column label="产品名称" prop="name"></el-table-column>
-          <el-table-column label="计量单位" prop="measname"></el-table-column>
-          <el-table-column label="规格型号" prop="spec"></el-table-column>
-          <el-table-column label="注册/备案凭证号" prop="registerNo"></el-table-column>
-          <el-table-column label="生产厂家" prop="manufactory"></el-table-column>
-          <el-table-column label="配送企业" prop="supName"></el-table-column>
+          <el-table-column label="产品编码" prop="code" show-overflow-tooltip></el-table-column>
+          <el-table-column label="产品名称" prop="name" show-overflow-tooltip></el-table-column>
+          <el-table-column label="计量单位" prop="measname" show-overflow-tooltip></el-table-column>
+          <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
+          <el-table-column label="注册/备案凭证号" prop="registerNo" show-overflow-tooltip></el-table-column>
+          <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
+          <el-table-column label="配送企业" prop="supName" show-overflow-tooltip></el-table-column>
         </el-table>
-        <el-pagination
-          :page-size="erpQuery.limit"
-          @current-change="handleErpPageChange"
-          layout="prev, pager, next"
+        <pagination
+          v-show="pageTotal>0"
           :total="pageTotal"
-          :current-page="erpQuery.page"
-        ></el-pagination>
+          :page.sync="erpQuery.page"
+          :limit.sync="erpQuery.limit"
+          @pagination="getErpList"
+        />
       </div>
     </el-card>
 
     <el-card class="el-card" v-if="!isImport">
-      <div v-if="!isImport" style="margin-bottom: 20px">
-        <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="请输入内容"
-                :disabled="true"
-                v-model="data.cpmctymc"
-              ></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%"
-                :disabled="true"
-                size="small"
-                splaceholder="请输入内容"
-                v-model="data.nameCode"
-              ></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%"
-                :disabled="true"
-                size="small"
-                splaceholder="请输入内容"
-                v-model="data.ggxh"
-              ></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%"
-                :disabled="true"
-                size="small"
-                splaceholder="ylqxzcrbarmc"
-                v-model="data.ylqxzcrbarmc"
-              ></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%"
-                :disabled="true"
-                size="small"
-                splaceholder="请输入内容"
-                v-model="data.ylqxzcrbarywmc"
-              ></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%"
-                :disabled="true"
-                size="small"
-                splaceholder="请输入内容"
-                v-model="data.qxlb"
-              ></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%"
-                :disabled="true"
-                size="small"
-                splaceholder="请输入内容"
-                v-model="data.cplb"
-              ></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%"
-                :disabled="true"
-                size="small"
-                splaceholder="请输入内容"
-                v-model="data.flbm"
-              ></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%"
-                :disabled="true"
-                size="small"
-                splaceholder="请输入内容"
-                v-model="data.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%"
-                :disabled="true"
-                size="small"
-                splaceholder="请输入内容"
-                v-model="data.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%"
-                :disabled="true"
-                size="small"
-                splaceholder="请输入内容"
-                v-model="data.tyshxydm"
-              ></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%"
-                :disabled="true"
-                size="small"
-                splaceholder="请输入内容"
-                v-model="data.zczbhhzbapzbh"
-              ></el-input>
-            </div>
-          </el-col>
-        </el-row>
+      <div v-if="!isImport" style="margin-bottom: 10px;margin-top: 10px">
+        <el-form label-width="120px">
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品名称:" class="query-form-item">
+                <el-input
+                  style="width: 80%"
+                  splaceholder="请输入内容"
+                  :disabled="true"
+                  v-model="data.cpmctymc"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品标识:" class="query-form-item">
+                <el-input
+                  style="width: 80%"
+                  :disabled="true"
+                  splaceholder="请输入内容"
+                  v-model="data.nameCode"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="规格型号:" class="query-form-item">
+                <el-input
+                  style="width: 80%"
+                  :disabled="true"
+                  size="small"
+                  splaceholder="请输入内容"
+                  v-model="data.ggxh"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="医疗器械注册人:" class="query-form-item">
+                <el-input
+                  style="width: 80%"
+                  :disabled="true"
+                  size="small"
+                  splaceholder="ylqxzcrbarmc"
+                  v-model="data.ylqxzcrbarmc"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="注册人英文名称:" class="query-form-item">
+                <el-input
+                  style="width: 80%"
+                  :disabled="true"
+                  size="small"
+                  splaceholder="请输入内容"
+                  v-model="data.ylqxzcrbarywmc"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="器械类别:" class="query-form-item">
+                <el-input
+                  style="width: 80%"
+                  :disabled="true"
+                  size="small"
+                  splaceholder="请输入内容"
+                  v-model="data.qxlb"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品类别:" class="query-form-item">
+                <el-input
+                  style="width: 80%"
+                  :disabled="true"
+                  size="small"
+                  splaceholder="请输入内容"
+                  v-model="data.cplb"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="分类编码:" class="query-form-item">
+                <el-input
+                  style="width: 80%"
+                  :disabled="true"
+                  size="small"
+                  splaceholder="请输入内容"
+                  v-model="data.flbm"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="商品条码:" class="query-form-item">
+                <el-input
+                  style="width: 80%"
+                  :disabled="true"
+                  size="small"
+                  splaceholder="请输入内容"
+                  v-model="data.sptm"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="医保编码:" class="query-form-item">
+                <el-input
+                  style="width: 80%"
+                  :disabled="true"
+                  size="small"
+                  splaceholder="请输入内容"
+                  v-model="data.ybbm"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="统一社会信用号:" class="query-form-item">
+                <el-input
+                  style="width: 80%"
+                  :disabled="true"
+                  size="small"
+                  splaceholder="请输入内容"
+                  v-model="data.tyshxydm"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="注册证/备案号:" class="query-form-item">
+                <el-input
+                  style="width: 80%"
+                  :disabled="true"
+                  size="small"
+                  splaceholder="请输入内容"
+                  v-model="data.zczbhhzbapzbh"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
       </div>
     </el-card>
   </div>
@@ -394,6 +365,7 @@ export default {
       multipleUdiSelection: [],
       thirdSys: [],
       thirdSysFk: null,
+      showSearch: true,
     };
   },
   methods: {
@@ -434,7 +406,9 @@ export default {
       this.erpQuery.page = val;
       this.getErpList();
     },
-
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
     searchErpList() {
       this.erpQuery.page = 1;
       this.getErpList();
@@ -680,4 +654,12 @@ div /deep/ .el-table .warning-row {
 div /deep/ .el-table .success-row {
   background: #ffffff;
 }
+
+
+.query-form-item {
+  display: block !important;
+  margin-right: 10px;
+  margin-bottom: 5px;
+}
+
 </style>
diff --git a/src/views/basic/product/UdiInfoSelectLocalUdi.vue b/src/views/basic/product/UdiInfoSelectLocalUdi.vue
index 6e941d72..32a6b31c 100644
--- a/src/views/basic/product/UdiInfoSelectLocalUdi.vue
+++ b/src/views/basic/product/UdiInfoSelectLocalUdi.vue
@@ -2,7 +2,7 @@
   <div>
     <el-card class="el-card">
       <div>
-        <el-form :model="unionQuery" size="mini" label-width="125px">
+        <el-form :model="unionQuery" size="mini" label-width="125px" v-show="showSearch">
           <el-row>
             <el-col :span="18">
               <el-form-item class="query-form-item" label="UDI码:">
@@ -17,30 +17,30 @@
             <el-col :span="6">
               <el-form-item label="销售单元产品标识:" class="query-form-item">
                 <el-input
-                    v-model="unionQuery.nameCode" clearable="true"
-                    placeholder="请输入完整DI"
-                    @keyup.enter.native="keyup_submit($event)"
+                  v-model="unionQuery.nameCode" clearable="true"
+                  placeholder="请输入完整DI"
+                  @keyup.enter.native="keyup_submit($event)"
                 ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="医疗器械注册人:" class="query-form-item">
                 <el-select
-                    v-model="unionQuery.ylqxzcrbarmc"
-                    filterable
-                    remote
-                    clearable="true"
-                    style="width: 100%"
-                    reserve-keyword
-                    placeholder="医疗器械注册人"
-                    :remote-method="findMethod"
-                    :loading="loading"
+                  v-model="unionQuery.ylqxzcrbarmc"
+                  filterable
+                  remote
+                  clearable="true"
+                  style="width: 100%"
+                  reserve-keyword
+                  placeholder="医疗器械注册人"
+                  :remote-method="findMethod"
+                  :loading="loading"
                 >
                   <el-option
-                      v-for="item in fromOptions"
-                      :key="item.ylqxzcrbarmc"
-                      :label="item.ylqxzcrbarmc"
-                      :value="item.ylqxzcrbarmc"
+                    v-for="item in fromOptions"
+                    :key="item.ylqxzcrbarmc"
+                    :label="item.ylqxzcrbarmc"
+                    :value="item.ylqxzcrbarmc"
                   >
                     <span style="float: left">{{ item.ylqxzcrbarmc }}</span>
                   </el-option>
@@ -50,112 +50,99 @@
             <el-col :span="6">
               <el-form-item label="器械通用名称:" class="query-form-item">
                 <el-input
-                    :disabled="unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''"
-                    v-model="unionQuery.cpmctymc" clearable="true"
-                    placeholder="器械通用名称"
+                  :disabled="unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''"
+                  v-model="unionQuery.cpmctymc" clearable="true"
+                  placeholder="器械通用名称"
                 ></el-input>
               </el-form-item>
             </el-col>
-
-
           </el-row>
-
           <el-row>
             <el-col :span="6">
               <el-form-item label="规格型号:" class="query-form-item">
                 <el-input
-                    v-model="unionQuery.ggxh" clearable="true"
-                    :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && (unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''))"
-                    placeholder="规格型号"
+                  v-model="unionQuery.ggxh" clearable="true"
+                  :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && (unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''))"
+                  placeholder="规格型号"
                 ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="注册证/备案号:" class="query-form-item">
                 <el-input
-                    v-model="unionQuery.zczbhhzbapzbh" clearable="true"
-                    :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && (unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''))"
-                    placeholder="注册证/备案号"
+                  v-model="unionQuery.zczbhhzbapzbh" clearable="true"
+                  :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && (unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''))"
+                  placeholder="注册证/备案号"
                 ></el-input>
               </el-form-item>
             </el-col>
-
-
-            <el-form-item>
-              <el-button-group>
-                <el-button
-                    type="primary"
-                    icon="el-icon-refresh"
-                    @click="onReset"
-                ></el-button>
-                <el-button type="primary" icon="search" @click="searchList" size="mini"
-                >查询
-                </el-button
-                >
-                <el-button type="primary" size="mini" icon="search" @click="checkCombine"
-                           :loading="combineLoading"
-                >选入
-                </el-button
-                >
-                <!--                                <el-button type="primary" size="mini" icon="search" @click="combineUdiAll"-->
-                <!--                                           v-if="relId==null"-->
-                <!--                                >结果全部选入-->
-                <!--                                </el-button-->
-                <!--                                >-->
-              </el-button-group>
-            </el-form-item>
           </el-row>
         </el-form>
+        <div class="top-right-btn">
+          <el-button-group>
+            <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="searchList">查询</el-button>
+            <el-button type="primary" icon="el-icon-bottom-left" @click="checkCombine"
+                       :loading="combineLoading"
+            >选入
+            </el-button
+            >
+          </el-button-group>
+        </div>
+        <el-divider style="margin: 15px"></el-divider>
+
 
         <el-table
-            :data="udidlList"
-            style="width: 100%"
-            v-loading="loading"
-            highlight-current-row="true"
-            :row-class-name="tableRowClassName"
-            @current-change="handleErpChange"
-            @selection-change="handleSelectionUdiChange"
+          :data="udidlList"
+          style="width: 100%"
+          border
+          v-loading="loading"
+          highlight-current-row="true"
+          :row-class-name="tableRowClassName"
+          @current-change="handleErpChange"
+          @selection-change="handleSelectionUdiChange"
         >
 
           <el-table-column
-              v-if="relId==null"
-              type="selection"
-              :selectable="checkSelectable"
-              width="55"
+            v-if="relId==null"
+            type="selection"
+            :selectable="checkSelectable"
+            width="55"
           ></el-table-column>
           <el-table-column label="序号" type="index"></el-table-column>
           <el-table-column
-              label="产品标识"
-              prop="nameCode"
-              show-overflow-tooltip
+            label="产品标识"
+            prop="nameCode"
+            show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-              label="产品名称"
-              prop="cpmctymc"
-              show-overflow-tooltip
+            label="产品名称"
+            prop="cpmctymc"
+            show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-              label="规格型号"
-              prop="ggxh"
-              show-overflow-tooltip
+            label="规格型号"
+            prop="ggxh"
+            show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-              label="医疗器械注册人"
-              prop="ylqxzcrbarmc"
-              show-overflow-tooltip
+            label="医疗器械注册人"
+            prop="ylqxzcrbarmc"
+            show-overflow-tooltip
           ></el-table-column>
           <el-table-column
-              label="注册证编号"
-              prop="zczbhhzbapzbh"
-              show-overflow-tooltip
+            label="注册证编号"
+            prop="zczbhhzbapzbh"
+            show-overflow-tooltip
           ></el-table-column>
 
           <el-table-column label="操作" fixed="right">
             <template slot-scope="scope">
               <el-button
-                  type="text"
-                  size="small"
-                  @click="diDetail(scope.row)"
+                type="text"
+                size="small"
+                @click="diDetail(scope.row)"
               >详情
               </el-button
               >
@@ -163,218 +150,179 @@
           </el-table-column>
 
         </el-table>
-        <el-pagination
-            :page-size="unionQuery.limit"
-            @current-change="handleCurrentChange"
-            layout="prev, pager, next"
-            :total="total"
-            :current-page="unionQuery.page"
-        ></el-pagination>
-
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="unionQuery.page"
+          :limit.sync="unionQuery.limit"
+          @pagination="getList"
+        />
       </div>
     </el-card>
     <el-card class="el-card" v-if="isImport">
       <div>
-        <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: 60%"
+        <el-form label-width="120px">
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品名称:" class="query-form-item">
+                <el-input
+                  style="width: 80%"
                   size="small"
                   splaceholder="请输入内容"
                   :disabled="true"
                   v-model="data.cpmctymc"
-              ></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: 60%"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品标识:" class="query-form-item">
+                <el-input
+                  style="width: 80%"
                   :disabled="true"
                   size="small"
                   splaceholder="请输入内容"
                   v-model="data.nameCode"
-              ></el-input>
-            </div>
-          </el-col>
-
-
-        </el-row>
-
+                ></el-input>
+              </el-form-item>
+            </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: 60%"
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="规格型号:" class="query-form-item">
+                <el-input
+                  style="width: 80%"
                   :disabled="true"
                   size="small"
                   splaceholder="请输入内容"
                   v-model="data.ggxh"
-              ></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: 60%"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="医疗器械注册人:" class="query-form-item">
+                <el-input
+                  style="width: 80%"
                   :disabled="true"
                   size="small"
                   splaceholder="ylqxzcrbarmc"
                   v-model="data.ylqxzcrbarmc"
-              ></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: 60%"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="注册人英文名称:" class="query-form-item">
+                <el-input
+                  style="width: 80%"
                   :disabled="true"
                   size="small"
                   splaceholder="请输入内容"
                   v-model="data.ylqxzcrbarywmc"
-              ></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: 60%"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="器械类别:" class="query-form-item">
+                <el-input
+                  style="width: 80%"
                   :disabled="true"
                   size="small"
                   splaceholder="请输入内容"
                   v-model="data.qxlb"
-              ></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: 60%"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="产品类别:" class="query-form-item">
+                <el-input
+                  style="width: 80%"
                   :disabled="true"
                   size="small"
                   splaceholder="请输入内容"
                   v-model="data.cplb"
-              ></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: 60%"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="分类编码:" class="query-form-item">
+                <el-input
+                  style="width: 80%"
                   :disabled="true"
                   size="small"
                   splaceholder="请输入内容"
                   v-model="data.flbm"
-              ></el-input>
-            </div>
-          </el-col>
-
-        </el-row>
+                ></el-input>
+              </el-form-item>
+            </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: 60%"
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="商品条码:" class="query-form-item">
+                <el-input
+                  style="width: 80%"
                   :disabled="true"
                   size="small"
                   splaceholder="请输入内容"
                   v-model="data.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: 60%"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="医保编码:" class="query-form-item">
+                <el-input
+                  style="width: 80%"
                   :disabled="true"
                   size="small"
                   splaceholder="请输入内容"
                   v-model="data.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: 60%"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="统一社会信用号:" class="query-form-item">
+                <el-input
+                  style="width: 80%"
                   :disabled="true"
                   size="small"
                   splaceholder="请输入内容"
                   v-model="data.tyshxydm"
-              ></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: 60%"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="注册证/备案号:" class="query-form-item">
+                <el-input
+                  style="width: 80%"
                   :disabled="true"
                   size="small"
                   splaceholder="请输入内容"
                   v-model="data.zczbhhzbapzbh"
-              ></el-input>
-            </div>
-          </el-col>
-        </el-row>
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
       </div>
     </el-card>
     <el-dialog
-        title="器械信息详情"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        :visible.sync="selectDialog"
-        width="65%"
-        append-to-body
-        v-if="selectDialog"
+      title="器械信息详情"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :visible.sync="selectDialog"
+      width="65%"
+      append-to-body
+      v-if="selectDialog"
     >
       <selectDiDetail :editQuery="diDetails"
       ></selectDiDetail>
@@ -442,8 +390,8 @@ export default {
       checked: true,
       udidlList: [],
       erpList: [],
-      pageTotal: 1,
-      total: 1,
+      pageTotal: 0,
+      total: 0,
       currentRow: null,
       fromOptions: [],
       loading: false,
@@ -451,6 +399,7 @@ export default {
       multipleUdiSelection: [],
       selectDialog: false,
       diDetails: null,
+      showSearch: true,
     };
   },
   methods: {
@@ -470,8 +419,7 @@ export default {
         zczbhhzbapzbh: "",
         isCheck: 1
       },
-          this.actDateRange = [];
-      // this.getList();
+        this.actDateRange = [];
     },
 
     searchList() {
@@ -481,64 +429,39 @@ export default {
 
     getList() {
       if (
-          this.unionQuery.udiCode == "" &&
-          this.unionQuery.nameCode == "" &&
-          this.unionQuery.cpmctymc == "" &&
-          this.unionQuery.ylqxzcrbarmc == "" &&
-          this.unionQuery.ggxh == "" &&
-          this.unionQuery.zczbhhzbapzbh == ""
+        this.unionQuery.udiCode == "" &&
+        this.unionQuery.nameCode == "" &&
+        this.unionQuery.cpmctymc == "" &&
+        this.unionQuery.ylqxzcrbarmc == "" &&
+        this.unionQuery.ggxh == "" &&
+        this.unionQuery.zczbhhzbapzbh == ""
       ) {
         this.$message.warning("请输入查询条件");
         return;
       }
       this.loading = true;
-      // this.unionQuery.page = 1;
       getUdiInfos(this.unionQuery)
-          .then((response) => {
-            this.loading = false;
-            if (response.code == 20000) {
-              this.udidlList = response.data.list || [];
-              this.total = response.data.total || 0;
-            } else {
-              this.$message.error(response.message);
-            }
-
-
-          })
-          .catch(() => {
-            this.loading = false;
-            this.udidlList = [];
-            this.total = 0;
-          });
+        .then((response) => {
+          this.loading = false;
+          if (response.code == 20000) {
+            this.udidlList = response.data.list || [];
+            this.total = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+          this.udidlList = [];
+          this.total = 0;
+        });
     },
 
-    combineUdiAll() {
-      this.$confirm("此操作将在后台自动下载所有查询结果, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-          .then(() => {
-            combineAllUdi(this.unionQuery)
-                .then((response) => {
-                  this.loading = false;
-                  if (response.code == 20000) {
-                    this.$message.success(response.data);
-                    this.$emit("closeUdi", true);
-                  } else {
-                    this.$message.error(response.message);
-                  }
-                })
-                .catch(() => {
-                });
-          })
-          .catch(() => {
-          });
-
 
+    hideSearch() {
+      this.showSearch = !this.showSearch;
     },
 
-
     keyup_submit(event) {
       this.unionQuery.page = 1;
       this.getList();
@@ -550,7 +473,6 @@ export default {
     },
 
     diDetail(row) {
-
       this.diDetails = row;
       this.selectDialog = true;
     },
@@ -597,51 +519,51 @@ export default {
       }
       this.combineLoading = true;
       checkExitUdi(this.combineQuery)
-          .then((response) => {
-            this.combineLoading = false;
-            if (response.code == 20000) {
-              this.combine();
-              // combineUdi(this.combineQuery)
-              //     .then((response) => {
-              //         this.combineLoading = false;
-              //         if (response.code == 20000) {
-              //             this.$emit("closeUdi", true);
-              //         } else {
-              //             this.$emit("closeUdi", false);
-              //         }
-              //     })
-              //     .catch(() => {
-              //         this.combineLoading = false;
-              //         this.$emit("closeUdi", false);
-              //     });
-            } else if (response.code == 499) {
-              this.$confirm(response.message, {type: "warning"})
-                  .then(_ => {
-                    this.combine();
-                    // combineUdi(this.combineQuery)
-                    //     .then((response) => {
-                    //         this.combineLoading = false;
-                    //         if (response.code == 20000) {
-                    //             this.$emit("closeUdi", true);
-                    //         } else {
-                    //             this.$emit("closeUdi", false);
-                    //         }
-                    //     })
-                    //     .catch(() => {
-                    //         this.combineLoading = false;
-                    //         this.$emit("closeUdi", false);
-                    //     });
-                  })
-                  .catch(_ => {
-
-                    this.combineQuery.keys = [];
-                  });
-            }
-          })
-          .catch(() => {
-            this.combineLoading = false;
-            this.$emit("closeUdi", false);
-          });
+        .then((response) => {
+          this.combineLoading = false;
+          if (response.code == 20000) {
+            this.combine();
+            // combineUdi(this.combineQuery)
+            //     .then((response) => {
+            //         this.combineLoading = false;
+            //         if (response.code == 20000) {
+            //             this.$emit("closeUdi", true);
+            //         } else {
+            //             this.$emit("closeUdi", false);
+            //         }
+            //     })
+            //     .catch(() => {
+            //         this.combineLoading = false;
+            //         this.$emit("closeUdi", false);
+            //     });
+          } else if (response.code == 499) {
+            this.$confirm(response.message, {type: "warning"})
+              .then(_ => {
+                this.combine();
+                // combineUdi(this.combineQuery)
+                //     .then((response) => {
+                //         this.combineLoading = false;
+                //         if (response.code == 20000) {
+                //             this.$emit("closeUdi", true);
+                //         } else {
+                //             this.$emit("closeUdi", false);
+                //         }
+                //     })
+                //     .catch(() => {
+                //         this.combineLoading = false;
+                //         this.$emit("closeUdi", false);
+                //     });
+              })
+              .catch(_ => {
+
+                this.combineQuery.keys = [];
+              });
+          }
+        })
+        .catch(() => {
+          this.combineLoading = false;
+          this.$emit("closeUdi", false);
+        });
 
 
     },
@@ -653,20 +575,20 @@ export default {
         this.combineQuery.erpName = this.data.thirdName;
       }
       combineUdi(this.combineQuery)
-          .then((response) => {
-            this.combineLoading = false;
-            if (response.code == 20000) {
-              this.$emit("closeUdi", true);
-            } else {
-              this.$message.error(response.message);
-              this.$emit("closeUdi", false);
-            }
-          })
-          .catch(() => {
-            this.combineLoading = false;
-
+        .then((response) => {
+          this.combineLoading = false;
+          if (response.code == 20000) {
+            this.$emit("closeUdi", true);
+          } else {
+            this.$message.error(response.message);
             this.$emit("closeUdi", false);
-          });
+          }
+        })
+        .catch(() => {
+          this.combineLoading = false;
+
+          this.$emit("closeUdi", false);
+        });
     },
 
     handleSelectionUdiChange(val) {
@@ -679,14 +601,14 @@ export default {
         limit: 10,
       };
       filterCompany(cQuery)
-          .then((response) => {
-            this.loading = false;
-            this.fromOptions = response.data || [];
-          })
-          .catch(() => {
-            this.loading = false;
-            this.fromOptions = [];
-          });
+        .then((response) => {
+          this.loading = false;
+          this.fromOptions = response.data || [];
+        })
+        .catch(() => {
+          this.loading = false;
+          this.fromOptions = [];
+        });
     },
   },
   components: {
diff --git a/src/views/basic/product/UdiInfoRelevance.vue b/src/views/basic/product/UdiInfoSelectRel.vue
similarity index 56%
rename from src/views/basic/product/UdiInfoRelevance.vue
rename to src/views/basic/product/UdiInfoSelectRel.vue
index 6662072a..8742eaca 100644
--- a/src/views/basic/product/UdiInfoRelevance.vue
+++ b/src/views/basic/product/UdiInfoSelectRel.vue
@@ -1,188 +1,205 @@
 <template>
   <div>
     <div style="display: flex;  width: 100%;">
-      <!--<el-checkbox v-model="checked" class="checkitemTag"-->
-      <!--&gt;是否关联第三方产品信息-->
-      <!--</el-checkbox-->
-      <!--&gt;-->
       <span class="checkitemTag"></span>
       <el-button
-        style="margin-right: 20px;float: right"
+        style="margin-right: 20px;margin-top:-15px;float: right"
         type="primary"
         size="mini"
-        icon="search"
+        icon="el-icon-bottom-left"
         @click="combine"
-      >选入
+      >关联选入
       </el-button
       >
     </div>
-
     <el-card class="el-card" v-if="checked">
       <div>
-        <el-form :inline="true" :model="erpQuery" size="mini">
+        <el-form :model="erpQuery" size="mini" label-width="125px" v-show="showThrSearch">
           <el-row>
-            <el-form-item class="query-form-item">
-              <el-input
-                v-model="erpQuery.code"
-                placeholder="产品编码/商品条码/医保编码"
-                clearable="true"
-                @keyup.enter.native="keyupErp_submit($event)"
-              ></el-input>
-            </el-form-item>
-            <el-form-item class="query-form-item">
-              <el-input v-model="erpQuery.name"
-                        clearable="true"
-                        placeholder="产品名称"></el-input>
-            </el-form-item>
-            <el-form-item class="query-form-item">
-              <el-input v-model="erpQuery.registerNo"
-                        clearable="true"
-                        placeholder="注册/备案凭证号"></el-input>
-            </el-form-item>
-            <el-form-item class="query-form-item">
-              <el-input v-model="erpQuery.manufactory"
-                        clearable="true"
-                        placeholder="生产厂家"></el-input>
-            </el-form-item>
+            <el-col :span="6">
+              <el-form-item class="query-form-item" label="产品编码:">
+                <el-input
+                  v-model="erpQuery.code"
+                  placeholder="产品编码/商品条码/医保编码"
+                  clearable="true"
+                  @keyup.enter.native="keyupErp_submit($event)"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item class="query-form-item" label="产品名称:">
+                <el-input v-model="erpQuery.name"
+                          clearable="true"
+                          placeholder="产品名称"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item class="query-form-item" label="注册/备案凭证号:">
+                <el-input v-model="erpQuery.registerNo"
+                          clearable="true"
+                          placeholder="注册/备案凭证号"></el-input>
+              </el-form-item>
+            </el-col>
           </el-row>
 
           <el-row>
-            <el-form-item class="query-form-item">
-              <el-input
-                v-model="erpQuery.spec"
-                clearable="true"
-                placeholder="规格型号"
-              ></el-input>
-            </el-form-item>
-            <el-form-item class="query-form-item">
-              <el-select v-model="thirdSysFk" placeholder="请选择第三方系统" disabled="true">
-                <el-option
-                  v-for="item in thirdSys"
-                  :key="item.value"
-                  :label="item.thirdName"
-
-                  :value="item.thirdId">
-                  <span style="float: left">{{ item.thirdName }}</span>
-                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>
-                </el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item style="display: flex">
-              <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-              <el-button type="primary" icon="search" @click="searchErpList">查询</el-button>
-            </el-form-item>
+            <el-col :span="6">
+              <el-form-item class="query-form-item" label="生产厂家:">
+                <el-input v-model="erpQuery.manufactory"
+                          clearable="true"
+                          placeholder="生产厂家"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item class="query-form-item" label="规格型号:">
+                <el-input
+                  v-model="erpQuery.spec"
+                  clearable="true"
+                  placeholder="规格型号"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item class="query-form-item" label="第三方系统:">
+                <el-select v-model="thirdSysFk" placeholder="请选择第三方系统" disabled="true" style="width: 100%">
+                  <el-option
+                    v-for="item in thirdSys"
+                    :key="item.value"
+                    :label="item.thirdName"
+                    :value="item.thirdId">
+                    <span style="float: left">{{ item.thirdName }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
           </el-row>
         </el-form>
+        <div class="top-right-btn">
+          <el-button-group>
+            <el-button icon="el-icon-view" type="primary" @click="hideThrSearch">显示/隐藏搜索栏</el-button>
+            <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+            <el-button type="primary" icon="el-icon-search" @click="searchErpList">查询</el-button>
+          </el-button-group>
+        </div>
+        <el-divider style="margin: 15px"></el-divider>
 
         <el-table
           :data="erpList"
+          border
           style="width: 100%"
           highlight-current-row="true"
           v-loading="erpLloading"
-
           @current-change="handleErpChange"
         >
-          <!--                     :row-class-name="tableRowClassName"-->
           <el-table-column label="序号" type="index"></el-table-column>
           <el-table-column label="产品编码" prop="code"></el-table-column>
-          <el-table-column label="产品名称" prop="name"></el-table-column>
-          <el-table-column label="计量单位" prop="measname"></el-table-column>
-          <el-table-column label="规格型号" prop="spec"></el-table-column>
-          <el-table-column label="注册/备案凭证号" prop="registerNo"></el-table-column>
-          <el-table-column label="生产厂家" prop="manufactory"></el-table-column>
+          <el-table-column label="产品名称" prop="name" show-overflow-tooltip></el-table-column>
+          <el-table-column label="计量单位" prop="measname" show-overflow-tooltip></el-table-column>
+          <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
+          <el-table-column label="注册/备案凭证号" prop="registerNo" show-overflow-tooltip></el-table-column>
+          <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
         </el-table>
-        <el-pagination
-          :page-size="erpQuery.limit"
-          @current-change="handleErpPageChange"
-          layout="prev, pager, next"
+        <pagination
+          v-show="pageTotal>0"
           :total="pageTotal"
-          :curret-page="erpQuery.page"
-        ></el-pagination>
+          :page.sync="erpQuery.page"
+          :limit.sync="erpQuery.limit"
+          @pagination="getErpList"
+        />
       </div>
     </el-card>
 
     <el-card class="el-card">
       <div>
-        <el-form :inline="true" :model="unionQuery" size="mini">
+        <el-form :model="unionQuery" size="mini" label-width="125px" v-show="showDiSearch">
           <el-row>
-            <el-form-item class="query-form-item">
-              <el-input
-                v-model="unionQuery.nameCode"
-                size="mini"
-                placeholder="请输入完整DI"
-                clearable="true"
-                @keyup.enter.native="keyup_submit($event)"
-              ></el-input>
-            </el-form-item>
-            <el-form-item class="query-form-item">
-              <el-select
-                v-model="unionQuery.ylqxzcrbarmc"
-                filterable
-                remote
-                clearable="true"
-                reserve-keyword
-                placeholder="医疗器械注册人"
-                :remote-method="findMethod"
-                :loading="loading"
-              >
-                <el-option
-                  v-for="item in fromOptions"
-                  :key="item.ylqxzcrbarmc"
-                  :label="item.ylqxzcrbarmc"
-                  :value="item.ylqxzcrbarmc"
+            <el-col :span="6">
+              <el-form-item class="query-form-item" label="DI编码:">
+                <el-input
+                  v-model="unionQuery.nameCode"
+                  size="mini"
+                  placeholder="请输入完整DI"
+                  clearable="true"
+                  @keyup.enter.native="keyup_submit($event)"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item class="query-form-item" label="医疗器械注册人:">
+                <el-select
+                  v-model="unionQuery.ylqxzcrbarmc"
+                  filterable
+                  remote
+                  clearable="true"
+                  style="width: 100%"
+                  reserve-keyword
+                  placeholder="医疗器械注册人"
+                  :remote-method="findMethod"
+                  :loading="loading"
                 >
-                  <span style="float: left">{{ item.ylqxzcrbarmc }}</span>
-                </el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item class="query-form-item">
-              <el-input
-                :disabled="unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''"
-                v-model="unionQuery.cpmctymc"
-                size="mini"
-                clearable="true"
-                placeholder="器械通用名称"
-              ></el-input>
-            </el-form-item>
-
-
+                  <el-option
+                    v-for="item in fromOptions"
+                    :key="item.ylqxzcrbarmc"
+                    :label="item.ylqxzcrbarmc"
+                    :value="item.ylqxzcrbarmc"
+                  >
+                    <span style="float: left">{{ item.ylqxzcrbarmc }}</span>
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item class="query-form-item" label="器械通用名称:">
+                <el-input
+                  :disabled="unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''"
+                  v-model="unionQuery.cpmctymc"
+                  size="mini"
+                  clearable="true"
+                  placeholder="器械通用名称"
+                ></el-input>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row>
-            <el-form-item class="query-form-item">
-              <el-input
-                v-model="unionQuery.ggxh"
-                placeholder="规格型号"
-                clearable="true"
-                size="mini"
-                :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && (unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''))"
-              ></el-input>
-            </el-form-item>
-            <el-form-item class="query-form-item">
-              <el-input
-                v-model="unionQuery.zczbhhzbapzbh"
-                clearable="true"
-                :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && (unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''))"
-                placeholder="注册/备案凭证号"
-                size="mini"
-              ></el-input>
-            </el-form-item>
-
-            <el-form-item class="query-form-item">
-              <el-button-group>
-                <el-button type="primary" icon="search" @click="serchList" size="mini"
-                >查询
-                </el-button
-                >
-              </el-button-group>
-            </el-form-item>
+            <el-col :span="6">
+              <el-form-item class="query-form-item" label="规格型号:">
+                <el-input
+                  v-model="unionQuery.ggxh"
+                  placeholder="规格型号"
+                  clearable="true"
+                  size="mini"
+                  :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && (unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''))"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item class="query-form-item" label="注册/备案凭证号:">
+                <el-input
+                  v-model="unionQuery.zczbhhzbapzbh"
+                  clearable="true"
+                  :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && (unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''))"
+                  placeholder="注册/备案凭证号"
+                  size="mini"
+                ></el-input>
+              </el-form-item>
+            </el-col>
           </el-row>
-
         </el-form>
+        <div class="top-right-btn">
+          <el-button-group>
+            <el-button icon="el-icon-view" type="primary" @click="hideDiSearch">显示/隐藏搜索栏</el-button>
+            <el-button type="primary" icon="el-icon-refresh" @click="onDiReset">重置</el-button>
+            <el-button type="primary" icon="el-icon-search" @click="serchList">查询</el-button>
+          </el-button-group>
+        </div>
+        <el-divider style="margin: 15px"></el-divider>
 
         <el-table
           :data="udidlList"
           style="width: 100%"
           @row-click="intentDetail"
+          border
           v-loading="loading"
           :row-class-name="tableRowClassName"
           @selection-change="handleSelectionUdiChange"
@@ -231,13 +248,14 @@
             </template>
           </el-table-column>
         </el-table>
-        <el-pagination
-          :page-size="unionQuery.limit"
-          @current-change="handleCurrentChange"
-          layout="prev, pager, next"
+
+        <pagination
+          v-show="total>0"
           :total="total"
-          :current-page="unionQuery.page"
-        ></el-pagination>
+          :page.sync="unionQuery.page"
+          :limit.sync="unionQuery.limit"
+          @pagination="getList"
+        />
       </div>
     </el-card>
 
@@ -275,6 +293,9 @@ export default {
 
   data() {
     return {
+
+      //第三方产品信息：
+      showThrSearch: true,
       erpQuery: {
         code: null,
         name: "",
@@ -285,6 +306,22 @@ export default {
         page: 1,
         limit: 10,
       },
+      thirdSys: [],
+      thirdSysFk: null,
+      fromOptions: [],
+      checked: true,
+      udidlList: [],
+      erpList: [],
+      pageTotal: 0,
+      total: 0,
+      currentRow: null,
+      loading: false,
+      erpLloading: false,
+      multipleUdiSelection: [],
+
+
+      //DI器械信息
+      showDiSearch: true,
       unionQuery: {
         page: 1,
         limit: 20,
@@ -295,6 +332,11 @@ export default {
         zczbhhzbapzbh: "",
         isCheck: 1
       },
+      diDetails: null,
+      selectDialog: false,
+
+
+      //关联选入
       combineQuery: {
         thirdId: "",
         keys: [],
@@ -304,23 +346,13 @@ export default {
         erpName: null,
         measname: null,
       },
-      fromOptions: [],
-      checked: true,
-      udidlList: [],
-      erpList: [],
-      pageTotal: 1,
-      total: 1,
-      currentRow: null,
-      loading: false,
-      erpLloading: false,
-      multipleUdiSelection: [],
-      thirdSys: [],
-      thirdSysFk: null,
-      diDetails: null,
-      selectDialog: false,
     };
   },
   methods: {
+    //第三方产品信息：
+    hideThrSearch() {
+      this.showThrSearch = !this.showThrSearch;
+    },
     onReset() {
       this.$router.push({
         path: "",
@@ -337,6 +369,64 @@ export default {
       };
       this.getErpList();
     },
+    searchErpList() {
+      this.erpQuery.page = 1;
+      this.getErpList();
+    },
+    handleErpPageChange(val) {
+      this.erpQuery.page = val;
+      this.getErpList();
+    },
+    getErpList() {
+      this.erplLoading = true;
+      this.erpQuery.thirdSys = this.thirdSysFk;
+      getInvbasdoc(this.erpQuery)
+        .then((response) => {
+          this.erplLoading = false;
+          if (response.code == 20000) {
+            this.erpList = response.data.list || [];
+            this.pageTotal = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
+            this.erpList = [];
+            this.pageTotal = 0;
+          }
+
+        })
+        .catch(() => {
+          this.erplLoading = false;
+          this.erpList = [];
+          this.pageTotal = 0;
+        });
+    },
+    keyupErp_submit(event) {
+      this.erpQuery.page = 1;
+      this.getErpList();
+      event.target.select();
+    },
+
+
+    //DI器械信息
+    hideDiSearch() {
+      this.showDiSearch = !this.showDiSearch;
+    },
+    onDiReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.unionQuery = {
+        page: 1,
+        limit: 20,
+        nameCode: "",
+        cpmctymc: "",
+        ylqxzcrbarmc: null,
+        ggxh: "",
+        zczbhhzbapzbh: "",
+        isCheck: 1
+      };
+      this.getErpList();
+    },
+
     serchList() {
       this.unionQuery.page = 1;
       this.getList();
@@ -384,49 +474,13 @@ export default {
     handleErpChange(val) {
       console.log(val);
       this.currentRow = val;
-      // this.unionQuery.cpmctymc = this.currentRow.name;
-      // this.unionQuery.zczbhhzbapzbh = this.currentRow.registerNo;
-      // this.unionQuery.ggxh = this.currentRow.spec;
     },
     diDetail(row) {
       this.diDetails = row;
       this.selectDialog = true;
     },
-    searchErpList() {
-      this.erpQuery.page = 1;
-      this.getErpList();
-    },
-    handleErpPageChange(val) {
-      this.erpQuery.page = val;
-      this.getErpList();
-    },
-    getErpList() {
-      this.erplLoading = true;
-      this.erpQuery.thirdSys = this.thirdSysFk;
-      getInvbasdoc(this.erpQuery)
-        .then((response) => {
-          this.erplLoading = false;
-          if (response.code == 20000) {
-            this.erpList = response.data.list || [];
-            this.pageTotal = response.data.total || 0;
-          } else {
-            this.$message.error(response.message);
-            this.erpList = [];
-            this.pageTotal = 0;
-          }
 
-        })
-        .catch(() => {
-          this.erplLoading = false;
-          this.erpList = [];
-          this.pageTotal = 0;
-        });
-    },
-    keyupErp_submit(event) {
-      this.erpQuery.page = 1;
-      this.getErpList();
-      event.target.select();
-    },
+
     intentBack() {
       this.$router.go(-1);
     },
diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue
index 6a10541f..ff86a08a 100644
--- a/src/views/basic/product/product.vue
+++ b/src/views/basic/product/product.vue
@@ -142,8 +142,16 @@
               type="text"
               size="small"
               @click.native.stop="handleModifyClick(scope.row)"
+            >详情
+            </el-button>
+
+            <el-button
+              type="text"
+              size="small"
+              @click.native.stop="diEdit(scope.row)"
             >编辑
             </el-button>
+
             <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)"
             >删除
             </el-button>
@@ -244,7 +252,7 @@
             ></el-table-column>
             <el-table-column label="操作" width="180px">
               <template slot-scope="scope">
-                <el-button type="text" @click.native.stop="diEdit">编辑</el-button>
+                <el-button type="text" @click.native.stop="singleDiEdit">编辑</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -1019,13 +1027,11 @@
         width="60%"
         v-if="editDiDialogVisible"
       >
-
         <product-edit
-          :editQuery="editQuery"
+          :editQuery="editFormat"
           :productRemarkSet="productRemarkSet"
         ></product-edit>
 
-
         <div style="text-align: center;margin-top: 12px">
           <el-button type="primary" size="small" icon="search" @click="onAddSubmit(false)"
           >提交
@@ -1035,9 +1041,31 @@
           </el-button>
         </div>
       </el-dialog>
+      <el-dialog
+        title="耗材字典-编辑"
+        :visible.sync="editSingleDiDialogVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        width="45%"
+        v-if="editSingleDiDialogVisible"
+      >
+        <product-single-edit
+          :editQuery="editSingleFormat"
+        ></product-single-edit>
+
+        <div style="text-align: center;margin-top: 12px">
+          <el-button type="primary" size="small" icon="search" @click="onAddSingleSubmit(false)"
+          >提交
+          </el-button>
+          <el-button type="primary" size="small" icon="search" @click="cancelDialog"
+          >取消
+          </el-button>
+        </div>
+      </el-dialog>
+
 
       <el-dialog
-        title="关联添加器械信息"
+        title="耗材字典-关联添加器械信息"
         :visible.sync="selectUdiDialogVisible"
         :close-on-click-modal="false"
         :close-on-press-escape="false"
@@ -1047,7 +1075,7 @@
         <selectUdi @closeUdi="closeUdi" :isImportUdi="isImportUdi"></selectUdi>
       </el-dialog>
       <el-dialog
-        title="从指定系统添加器械字典"
+        title="耗材字典-从指定系统添加器械信息"
         :visible.sync="selectErpDialogVisible"
         :close-on-click-modal="false"
         :close-on-press-escape="false"
@@ -1066,7 +1094,7 @@
         ></selectErp>
       </el-dialog>
       <el-dialog
-        title="添加DI器械信息"
+        title="耗材字典-添加DI器械信息"
         :visible.sync="selectLocalVisible"
         :close-on-click-modal="false"
         :close-on-press-escape="false"
@@ -1083,7 +1111,7 @@
         ></selectLocalUdi>
       </el-dialog>
       <el-dialog
-        title="选择DI版本"
+        title="耗材字典-选择DI版本"
         :visible.sync="selectVersionVisible"
         :close-on-click-modal="false"
         :close-on-press-escape="false"
@@ -1114,6 +1142,7 @@ import {
   getUdiInfos,
   deletetUdiInfos,
   updatetUdiInfos,
+  updatetSingleUdiInfo,
   updateErpProduct,
   uploadSmp,
   thirdSysDetail,
@@ -1122,11 +1151,12 @@ import {
 import {selectSysParamByKey, finProductSet} from "@/api/param/systemParamConfig";
 import {filterByUuid} from "@/api/basic/product/udiInfo";
 
-import selectUdi from "./UdiInfoRelevance.vue";
-import selectErp from "./UdiInfoselectErpUdi";
+import selectUdi from "./UdiInfoSelectRel.vue";
+import selectErp from "./UdiInfoSelectErpUdi";
 import selectLocalUdi from "./UdiInfoSelectLocalUdi";
 import selectUdiVersion from "./UdiinfoSelectVersion";
 import ProductEdit from "@/views/basic/product/productEdit";
+import ProductSingleEdit from "@/views/basic/product/productSingleEdit";
 
 
 export default {
@@ -1151,6 +1181,14 @@ export default {
       showSearch: true,
       productType: null,
       editQuery: null,
+      editFormat: {},
+      editSingleFormat: {
+        uuid: null,
+        relId: null,
+        sptm: null,
+        packUnit: null,
+        measname: null,
+      },
       pId: 0,
       productRemarkSet: {},
       relevanceEdit: {
@@ -1191,6 +1229,7 @@ export default {
       multipleSelection: [],
       editDialogVisible: false,       //详情
       editDiDialogVisible: false,
+      editSingleDiDialogVisible: false,
       selectUdiDialogVisible: false,  //关联选入
       selectErpDialogVisible: false,  //选入ERP产品
       selectVersionVisible: false,
@@ -1359,7 +1398,7 @@ export default {
                 });
                 this.getList();
                 this.cancelDialog();
-                this.getThirdSysDetail()();
+                this.getThirdSysDetail();
               } else {
                 this.$message.error(response.message);
               }
@@ -1476,6 +1515,7 @@ export default {
 
     cancelDialog() {
       this.editDiDialogVisible = false;
+      this.editSingleDiDialogVisible = false;
       this.getList();
     },
     handleCurrentChange(val) {
@@ -1559,11 +1599,19 @@ export default {
         });
 
     },
-    diEdit() {
+    singleDiEdit() {
+      let temp = JSON.parse(JSON.stringify(this.editQuery));
+      this.editSingleFormat.uuid = temp.uuid;
+      this.editSingleFormat.id = temp.id;
+      this.editSingleFormat.sptm = temp.sptm;
+      this.editSingleFormat.packUnit = temp.packUnit;
+      this.editSingleFormat.measname = temp.measname;
+      this.editSingleDiDialogVisible = true;
+    },
+    diEdit(row) {
+      this.editFormat = JSON.parse(JSON.stringify(row));
       this.editDiDialogVisible = true;
     },
-
-
     closeDialog() {
       this.selectErpDialogVisible = false;
       this.selectLocalVisible = false;
@@ -1587,6 +1635,22 @@ export default {
         });
     },
 
+    onAddSingleSubmit() {
+      updatetSingleUdiInfo(this.editSingleFormat)
+        .then((response) => {
+          if (response.code == 20000) {
+            this.getList();
+            this.cancelDialog();
+            this.editDialogVisible = false;
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+          this.cancelDialog();
+        });
+    },
+
 
     findBasicProductSet() {
       finProductSet().then((response) => {
@@ -1646,6 +1710,7 @@ export default {
   mounted() {
   },
   components: {
+    ProductSingleEdit,
     ProductEdit,
     selectUdi,
     selectErp,
diff --git a/src/views/basic/product/productEdit.vue b/src/views/basic/product/productEdit.vue
index 14c03b2a..c41d8c5f 100644
--- a/src/views/basic/product/productEdit.vue
+++ b/src/views/basic/product/productEdit.vue
@@ -1,6 +1,5 @@
 <template>
   <div>
-
     <el-form
       :model="editQuery"
       :rules="rules"
@@ -9,26 +8,7 @@
       label-width="120px"
     >
       <el-row type="flex" class="edit-row">
-        <el-col :span="12">
-          <el-form-item label="商品条码:">
-            <el-input
-              style="width: 80%"
-              size="small"
-              splaceholder="请输入内容"
-              v-model="editQuery.sptm"
-            ></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="医保编码:">
-            <el-input
-              style="width: 80%"
-              size="small"
-              splaceholder="请输入内容"
-              v-model="editQuery.ybbm"
-            ></el-input>
-          </el-form-item>
-        </el-col>
+
       </el-row>
       <el-row type="flex" class="edit-row">
         <el-col :span="12">
@@ -175,14 +155,13 @@
             ></el-input>
           </el-form-item>
         </el-col>
-
         <el-col :span="12">
-          <el-form-item label="包装单位:">
+          <el-form-item label="医保编码:">
             <el-input
               style="width: 80%"
               size="small"
               splaceholder="请输入内容"
-              v-model="editQuery.packUnit"
+              v-model="editQuery.ybbm"
             ></el-input>
           </el-form-item>
         </el-col>
@@ -190,23 +169,23 @@
       <el-row type="flex">
         <el-col :span="24">
           <div style="margin-bottom: 18px;margin-left: 25px">
-            <el-checkbox v-model="editQuery.isDisable" class=""
+            <el-checkbox v-model="editQuery.isDisable"
                          @change="diableChange"
                          style="width: 180px"
                          border
             >是否禁用
             </el-checkbox>
-            <el-checkbox v-model="editQuery.isAdavence" class=""
+            <el-checkbox v-model="editQuery.isAdavence"
                          border
                          style="width: 180px"
             >是否寄售
             </el-checkbox>
-            <el-checkbox v-model="editQuery.allowNoBatch" class=""
+            <el-checkbox v-model="editQuery.allowNoBatch"
                          border
                          style="width: 180px"
             >允许无批次号
             </el-checkbox>
-            <el-checkbox v-model="editQuery.allowNoExpire" class=""
+            <el-checkbox v-model="editQuery.allowNoExpire"
                          border
                          style="width: 180px"
             >允许无失效日期
@@ -218,19 +197,19 @@
         <el-col :span="24" class="el-col">
           <div style="margin-bottom: 18px;margin-left: 25px">
 
-            <el-checkbox v-model="editQuery.allowNoProduct" class=""
+            <el-checkbox v-model="editQuery.allowNoProduct"
                          border
                          style="width: 180px"
             >允许无生产日期
             </el-checkbox>
-            <el-checkbox v-model="checked" class=""
+            <el-checkbox v-model="checked"
                          :disabled="!isUseDyCheck  || editQuery.useMuti==true "
                          @change="useDyCheckChange"
                          style="width: 180px"
                          border
             >启用使用单元
             </el-checkbox>
-            <el-checkbox v-model="editQuery.useMuti" class=""
+            <el-checkbox v-model="editQuery.useMuti"
                          :disabled="checked"
                          @change="useMutiChange"
                          style="width: 180px"
@@ -266,6 +245,7 @@ export default {
   data() {
     return {
       isUseDyCheck: false,
+      useNumEnable: true,
     }
   },
 
diff --git a/src/views/basic/product/productSingleEdit.vue b/src/views/basic/product/productSingleEdit.vue
new file mode 100644
index 00000000..2dd30047
--- /dev/null
+++ b/src/views/basic/product/productSingleEdit.vue
@@ -0,0 +1,64 @@
+<template>
+  <div>
+    <el-form
+      :model="editQuery"
+      :rules="rules"
+      ref="editQuery"
+      border
+      label-width="120px"
+    >
+      <el-row>
+        <el-form-item label="商品条码:">
+          <el-input
+            style="width: 80%"
+            size="small"
+            splaceholder="请输入内容"
+            v-model="editQuery.sptm"
+          ></el-input>
+        </el-form-item>
+      </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-row>
+<!--      <el-row>-->
+      <!--        <el-form-item label="计量单位:">-->
+      <!--          <el-input-->
+      <!--            style="width: 80%"-->
+      <!--            size="small"-->
+      <!--            splaceholder="请输入内容"-->
+      <!--            v-model="editQuery.measname"-->
+      <!--          ></el-input>-->
+      <!--        </el-form-item>-->
+      <!--      </el-row>-->
+    </el-form>
+  </div>
+</template>
+<script>
+
+export default {
+  name: "productSingleEdit",
+  props: {
+    editQuery: {
+      type: Object,
+      required: true,
+    },
+  },
+
+  data() {
+    return {}
+  },
+
+  methods: {}
+}
+</script>
+
+<style scoped>
+
+</style>