diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue
index f344f400..f49e310c 100644
--- a/src/views/basic/product/product.vue
+++ b/src/views/basic/product/product.vue
@@ -180,40 +180,12 @@
             <el-card>
               <el-table :data="sysList" style="width: 100%;   margin-bottom: 8px" key="2" border>
                 <el-table-column label="序号" type="index"></el-table-column>
-                <el-table-column
-                  label="系统名称"
-                  prop="sysName"
-                  show-overflow-tooltip
-                ></el-table-column>
-                <el-table-column
-                  label="产品编码"
-                  prop="thirdId"
-                  show-overflow-tooltip
-                ></el-table-column>
-                <el-table-column
-                  label="产品名称"
-                  prop="thirdName"
-                  show-overflow-tooltip
-                ></el-table-column>
+                <el-table-column label="系统名称" prop="sysName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="产品编码" prop="thirdId" show-overflow-tooltip></el-table-column>
+                <el-table-column label="产品名称" prop="thirdName" show-overflow-tooltip></el-table-column>
                 <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
                 <el-table-column label="注册/备案凭证号" prop="registerNo" show-overflow-tooltip></el-table-column>
                 <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
-
-                <el-table-column label="操作">
-                  <template slot-scope="scope">
-                    <el-button
-                      type="text"
-                      @click="addSelectErp(scope.row)"
-                      :disabled="scope.row.thirdId==editQuery.nameCode"
-                    >关联
-                    </el-button
-                    >
-                    <el-button type="text" @click.native.stop="removeErp(scope.row)"
-                               :disabled="editQuery.flbm==null || scope.row.thirdId==null || scope.row.thirdId==''"
-                    >解绑
-                    </el-button>
-                  </template>
-                </el-table-column>
               </el-table>
             </el-card>
             <el-card>
@@ -223,49 +195,12 @@
                         margin-bottom: 8px">
                 <span>产品标识:</span>
               </div>
-              <div style=" float: right;
-                        text-align: right;
-                        margin-bottom: 8px;">
-                <el-button type="primary" size="mini" icon="search" @click="removeDi" v-if="productType!=1"
-                           style="text-align:right"
-                >解绑DI器械信息
-                </el-button>
-              </div>
-              <el-table
-                v-loading="loading"
-                :data="detailList"
-                style="width: 100%; "
-                border
-                key="3"
-                highlight-current-row
-                @current-change="handleDetail"
-              >
-                <el-table-column
-                  label="产品标识"
-                  prop="nameCode"
-                  show-overflow-tooltip
-                ></el-table-column>
-
-                <el-table-column
-                  label="产品通用名"
-                  prop="cpmctymc"
-                  show-overflow-tooltip
-                ></el-table-column>
-                <el-table-column
-                  label="包装级别"
-                  prop="packLevel"
-                  show-overflow-tooltip
-                ></el-table-column>
-                <el-table-column
-                  label="包装层级"
-                  prop="packUnit"
-                  show-overflow-tooltip
-                ></el-table-column>
-                <el-table-column label="操作" width="180px">
-                  <template slot-scope="scope">
-                    <el-button type="text" @click.native.stop="singleDiEdit">编辑</el-button>
-                  </template>
-                </el-table-column>
+
+              <el-table v-loading="loading" :data="detailList" style="width: 100%; " border key="3" highlight-current-row @current-change="handleDetail">
+                <el-table-column label="产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
+                <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+                <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
+                <el-table-column label="包装层级" prop="packUnit" show-overflow-tooltip></el-table-column>
               </el-table>
             </el-card>
             <el-card>
@@ -1038,7 +973,13 @@
           >
             <product-edit
               :editQuery="editFormat"
+              :relevanceEdit="relevanceEdit"
               :productRemarkSet="productRemarkSet"
+              :uuid="uuid"
+              :relId="relId"
+              :thisData="thisData"
+              :productType="productType"
+              @closePre="closeUdi"
             ></product-edit>
 
             <div style="text-align: center;margin-top: 12px">
@@ -1646,7 +1587,6 @@ export default {
         });
     },
     closeUdi(val) {
-      debugger
       this.selectUdiDialogVisible = false;
       this.selectErpDialogVisible = false;
       this.selectLocalVisible = false;
@@ -1682,6 +1622,18 @@ export default {
       this.editSingleDiDialogVisible = true;
     },
     diEdit(row) {
+      this.uuid = row.uuid;
+      this.relId = row.id;
+      this.isImport = false;
+      this.thisData = row;
+      this.pId = row.id;
+      this.relevanceEdit = {
+        id: row.id,
+        isUseDy: row.isUseDy,
+        isDisable: row.isDisable,
+        isLock: row.isLock,
+        isAdavence: row.isAdavence,
+      };
       this.editFormat = JSON.parse(JSON.stringify(row));
       this.editDiDialogVisible = true;
     },
diff --git a/src/views/basic/product/productEdit.vue b/src/views/basic/product/productEdit.vue
index e9b79919..60736e1f 100644
--- a/src/views/basic/product/productEdit.vue
+++ b/src/views/basic/product/productEdit.vue
@@ -7,10 +7,50 @@
       border
       label-width="120px"
     >
-      <el-row type="flex" class="edit-row">
+        <el-card>
+          <el-table :data="sysList" style="width: 100%;   margin-bottom: 8px" key="2" border>
+            <el-table-column label="序号" type="index"></el-table-column>
+            <el-table-column label="系统名称" prop="sysName" show-overflow-tooltip></el-table-column>
+            <el-table-column label="产品编码" prop="thirdId" show-overflow-tooltip></el-table-column>
+            <el-table-column label="产品名称" prop="thirdName" show-overflow-tooltip></el-table-column>
+            <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
+            <el-table-column label="注册/备案凭证号" prop="registerNo" show-overflow-tooltip></el-table-column>
+            <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
+            <el-table-column label="操作">
+              <template slot-scope="scope">
+                <el-button type="text" @click="addSelectErp(scope.row)" :disabled="scope.row.thirdId==editQuery.nameCode">关联</el-button>
+                <el-button type="text" @click.native.stop="removeErp(scope.row)" :disabled="editQuery.flbm==null || scope.row.thirdId==null || scope.row.thirdId==''">解绑
+                </el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-card>
+        <el-card>
+          <div style=" float: left;
+                        text-align: left;
+                        font-weight: bold;
+                        margin-bottom: 8px">
+            <span>产品标识:</span>
+          </div>
+          <div style=" float: right;
+                        text-align: right;
+                        margin-bottom: 8px;">
+            <el-button type="primary" size="mini" icon="search" @click="removeDi" v-if="productType!=1" style="text-align:right">解绑DI器械信息</el-button>
+          </div>
+          <el-table v-loading="loading" :data="detailList" style="width: 100%; " border key="3" highlight-current-row @current-change="handleDetail">
+            <el-table-column label="产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
+            <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+            <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
+            <el-table-column label="包装层级" prop="packUnit" show-overflow-tooltip></el-table-column>
+            <el-table-column label="操作" width="180px">
+              <template slot-scope="scope">
+                <el-button type="text" @click.native.stop="singleDiEdit">编辑</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-card>
 
-      </el-row>
-      <el-row type="flex" class="edit-row">
+      <el-row type="flex" class="edit-row" style="margin-top: 20px">
         <el-col :span="12">
           <el-form-item label="计量单位:">
             <el-input
@@ -221,12 +261,59 @@
       </el-row>
       <el-divider></el-divider>
     </el-form>
+
+    <el-dialog
+      title="耗材字典-从指定系统添加器械信息"
+      :visible.sync="selectErpDialogVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="85%"
+      append-to-body
+      v-if="selectErpDialogVisible"
+    >
+      <selectErp
+        :closeDialog="closeDialog"
+        :uuid="uuid"
+        :relId="relId"
+        :isImport="isImport"
+        :data="thisData"
+        :defaultSys="defaultSys"
+        @closeUdi="closeUdi"
+        :supEnable="false"
+      ></selectErp>
+    </el-dialog>
+    <el-dialog
+      title="耗材字典-编辑"
+      :visible.sync="editSingleDiDialogVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="45%"
+      v-if="editSingleDiDialogVisible"
+      append-to-body
+    >
+      <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>
   </div>
 </template>
 
 <script>
-import {disableUdi} from "@/api/basic/product/udiRelevance";
+import {disableUdi, removeDiRl, removeRl, thirdSysDetail, updatetSingleUdiInfo} from "@/api/basic/product/udiRelevance";
 import {isBlank} from "@/utils/strUtil";
+import {filterByUuid} from "@/api/basic/product/udiInfo";
+import ProductSingleEdit from "@/views/basic/product/productSingleEdit";
+import selectErp from "./udiInfoselectErpUdi";
+
 
 export default {
   name: "productEdit",
@@ -235,22 +322,67 @@ export default {
       type: Object,
       required: true,
     },
+    uuid: {
+      type: Object,
+      required: true,
+    },
+    relId: {
+      type: Object,
+      required: true,
+    },
+    thisData: {
+      type: Object,
+      required: true,
+    },
     productRemarkSet: {
       type: Object,
       required: true,
     },
-
-
+    relevanceEdit: {
+      type: Object,
+      required: true,
+    },
+    productType: {
+      type: Object,
+      required: true,
+    },
+    closePre: {
+      type: Function,
+      required: true,
+    },
   },
 
   data() {
     return {
       isUseDyCheck: false,
       useNumEnable: true,
+      sysList: [],
+      detailList: [],
+      defaultSys: null,
+      isImport:false,
+      selectErpDialogVisible: false,  //选入ERP产品
+      editSingleDiDialogVisible: false,
+      editSingleFormat: {
+        uuid: null,
+        relId: null,
+        sptm: null,
+        packUnit: null,
+        measname: null,
+        nameCode: null
+      },
     }
   },
+  components: {
+    selectErp,
+    ProductSingleEdit
+  },
   created() {
     this.useMutiChange(true)
+    this.getThirdSysDetail();
+    let ttquery={
+      id:this.relevanceEdit.id
+    }
+    this.getDetailList(ttquery);
   },
   methods: {
     diableChange() {
@@ -270,7 +402,97 @@ export default {
           this.detailList = [];
         });
     },
-
+    addSelectErp(row) {
+      this.defaultSys = row.sysId;
+      this.isImport = false;
+      this.selectErpDialogVisible = true;
+    },
+    removeDi() {
+      this.$confirm("此操作将解除该绑定DI器械信息, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          let query = {
+            relId: this.editQuery.id,
+          };
+          removeDiRl(query)
+            .then((response) => {
+              if (response.code == 20000) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功！",
+                });
+                this.editDialogVisible = false;
+                this.getList();
+                this.cancelDialog();
+              } else {
+                this.$message.error(response.message);
+              }
+            })
+            .catch(() => {
+            });
+        })
+        .catch(() => {
+        });
+    },
+    cancelDialog() {
+      this.editSingleDiDialogVisible = false;
+    },
+    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.editSingleFormat.nameCode = temp.nameCode;
+      this.editSingleDiDialogVisible = true;
+    },
+    onAddSingleSubmit() {
+      updatetSingleUdiInfo(this.editSingleFormat)
+        .then((response) => {
+          if (response.code == 20000) {
+            this.$emit("closePre", true);
+            this.editSingleDiDialogVisible = false;
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+          this.cancelDialog();
+        });
+    },
+    removeErp(row) {
+      this.$confirm("此操作将解除该绑定产品信息, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          let query = {
+            relId: this.relId,
+            thirdSys: row.sysId
+          };
+          removeRl(query)
+            .then((response) => {
+              if (response.code == 20000) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功！",
+                });
+                this.getThirdSysDetail();
+              } else {
+                this.$message.error(response.message);
+              }
+            })
+            .catch(() => {
+            });
+        })
+        .catch(() => {
+        });
+    },
     useDyCheckChange(val) {
       this.editQuery.useNum = 0;
     },
@@ -281,6 +503,32 @@ export default {
         this.editQuery.useNum = 0;
       }
     },
+    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 = [];
+        });
+    },
+    getDetailList(detailQuery) {
+      this.loading = true;
+      filterByUuid(detailQuery)
+        .then((response) => {
+          this.loading = false;
+          this.detailList = response.data || [];
+        })
+        .catch(() => {
+          this.loading = false;
+          this.detailList = [];
+        });
+    },
     useMutiChange(val) {
       if (val) {
         this.useNumEnable = false;
@@ -295,6 +543,13 @@ export default {
         this.editQuery.useNum = 0;
       }
     },
+    closeDialog() {
+      this.selectErpDialogVisible = false;
+    },
+    closeUdi(val) {
+      this.selectErpDialogVisible=false;
+      this.getThirdSysDetail();
+    },
 
   }
 }
diff --git a/src/views/basic/product/udiInfoselectErpUdi.vue b/src/views/basic/product/udiInfoselectErpUdi.vue
index 937cca5b..76f86b89 100644
--- a/src/views/basic/product/udiInfoselectErpUdi.vue
+++ b/src/views/basic/product/udiInfoselectErpUdi.vue
@@ -1,54 +1,43 @@
 <template>
     <div>
         <el-card class="el-card">
-            <div>
-                <el-form :inline="true" :model="erpQuery" style="display: flex;" size="mini">
+                <el-form  :model="erpQuery" label-width="120px" 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-col :span="6">
+                        <el-form-item label="物品编码:">
+                            <el-input v-model="erpQuery.code"style="width: 90%" placeholder="请输入产品编码/商品条码/医保编码" clearable="true" @keyup.enter.native="keyupErp_submit($event)"></el-input>
                         </el-form-item>
-                        <el-form-item class="query-form-item">
-                            <el-input
-                                v-model="erpQuery.name"
-                                placeholder="产品名称" clearable="true"
-                                @keyup.enter.native="keyup_submit($event)"
-                            ></el-input>
+                      </el-col>
+                      <el-col :span="6">
+                        <el-form-item label="产品名称:">
+                            <el-input v-model="erpQuery.name" style="width: 90%" placeholder="请输入产品名称" clearable="true" @keyup.enter.native="keyup_submit($event)"></el-input>
                         </el-form-item>
-                        <el-form-item class="query-form-item">
-                            <el-input
-                                v-model="erpQuery.spec"
-                                placeholder="规格型号" clearable="true"
-                                @keyup.enter.native="keyupErp_submit($event)"
-                            ></el-input>
+                      </el-col>
+                      <el-col :span="6">
+                        <el-form-item label="规格型号:">
+                            <el-input v-model="erpQuery.spec" style="width: 90%" placeholder="请输入规格型号" clearable="true" @keyup.enter.native="keyupErp_submit($event)"></el-input>
                         </el-form-item>
-                        <el-form-item class="query-form-item">
-                            <el-input
-                                v-model="erpQuery.registerNo" clearable="true"
-                                placeholder="注册/备案凭证号"
-                                @keyup.enter.native="keyup_submit($event)"
-                            ></el-input>
+                      </el-col>
+                      <el-col :span="6">
+                        <el-form-item label="注册/备案凭证号:">
+                            <el-input v-model="erpQuery.registerNo" style="width: 90%" clearable="true" placeholder="请输入注册/备案凭证号" @keyup.enter.native="keyup_submit($event)"></el-input>
                         </el-form-item>
-                        <el-form-item class="query-form-item">
-                            <el-input
-                                v-model="erpQuery.manufactory" clearable="true"
-                                placeholder="生产厂家"
-                                @keyup.enter.native="keyup_submit($event)"
-                            ></el-input>
+                      </el-col>
+                    </el-row>
+                  <el-row>
+                      <el-col :span="6">
+                        <el-form-item label="生产厂家:">
+                            <el-input v-model="erpQuery.manufactory" style="width: 90%" clearable="true" placeholder="请输入生产厂家" @keyup.enter.native="keyup_submit($event)"></el-input>
                         </el-form-item>
-                        <el-form-item class="query-form-item">
-                            <el-input
-                                v-model="erpQuery.supName" clearable="true"
-                                placeholder="配送企业"
-                                @keyup.enter.native="keyup_submit($event)"
-                            ></el-input>
+                      </el-col>
+                      <el-col :span="6">
+                        <el-form-item label="配送企业:">
+                            <el-input v-model="erpQuery.supName" style="width: 90%" clearable="true" placeholder="请输入配送企业" @keyup.enter.native="keyup_submit($event)"></el-input>
                         </el-form-item>
-
-                        <el-form-item class="query-form-item">
-                            <el-select v-model="thirdSysFk" placeholder="请设置主系统" disabled="isImport">
+                      </el-col>
+                      <el-col :span="6">
+                        <el-form-item label="外部系统:">
+                            <el-select v-model="thirdSysFk" style="width: 90%" placeholder="请设置主系统" disabled="isImport">
                                 <el-option
                                     v-for="item in thirdSys"
                                     :key="item.value"
@@ -60,38 +49,25 @@
                                 </el-option>
                             </el-select>
                         </el-form-item>
+                      </el-col>
+                  </el-row>
+                </el-form>
 
 
-                        <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-row>
-                </el-form>
-                <el-table
-                    :data="erpList"
-                    style="width: 100%"
-                    highlight-current-row="true"
-                    v-loading="erpLloading"
-                    @current-change="handleErpChange"
-                    @selection-change="handleSelectionChange"
-                >
-                    <el-table-column
-                        v-if="isImport"
-                        type="selection"
-                        width="55"
-                    ></el-table-column>
+          <div class="top-right-btn">
+            <el-button-group style="display:flex;">
+              <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+              <el-button type="primary" icon="search" @click="searchErpList">查询</el-button>
+              <el-button type="primary" icon="search" @click="combine" :loading="combineLoading">选入</el-button>
+              <el-button type="primary" icon="search" @click="combineAll" v-if="isImport  &&  !supEnable">结果全部选入</el-button>
+            </el-button-group>
+          </div>
+
+          <el-divider style="margin: 15px"></el-divider>
+
+                <el-table :data="erpList" style="width: 100%" highlight-current-row="true"  border
+                          v-loading="erpLloading" @current-change="handleErpChange" @selection-change="handleSelectionChange">
+                    <el-table-column v-if="isImport" type="selection" width="55"></el-table-column>
                     <el-table-column label="序号" type="index"></el-table-column>
                     <el-table-column label="产品编码" prop="code"></el-table-column>
                     <el-table-column label="产品名称" prop="name"></el-table-column>
@@ -101,206 +77,95 @@
                     <el-table-column label="生产厂家" prop="manufactory"></el-table-column>
                     <el-table-column label="配送企业" prop="supName"></el-table-column>
                 </el-table>
-                <el-pagination
-                    :page-size="erpQuery.limit"
-                    @current-change="handleErpPageChange"
-                    layout="prev, pager, next"
-                    :total="pageTotal"
-                    :current-page="erpQuery.page"
-                ></el-pagination>
-            </div>
+          <pagination
+            v-show="pageTotal>0"
+            :total="pageTotal"
+            :page.sync="erpQuery.page"
+            :limit.sync="erpQuery.limit"
+            @pagination="handleErpPageChange"
+          ></pagination>
         </el-card>
 
         <el-card class="el-card" v-if="!isImport">
-            <div v-if="!isImport" style="margin-bottom: 20px">
-                <el-row :gutter="20" class="el-row" type="flex">
+          <el-form  label-width="120px">
+                <el-row>
                     <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-form-item label="产品名称:">
+                            <el-input style="width: 90%" size="small" splaceholder="请输入内容" :disabled="true" v-model="data.cpmctymc"></el-input>
+                      </el-form-item>
                     </el-col>
                     <el-col :span="12" class="el-col">
-                        <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-form-item label="产品标识:">
+                            <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="data.nameCode"></el-input>
+                      </el-form-item>
                     </el-col>
-
-
                 </el-row>
-                <el-row :gutter="20" class="el-row" type="flex">
+
+                <el-row>
                     <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-form-item label="规格型号:">
+                            <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="data.ggxh"></el-input>
+                      </el-form-item>
                     </el-col>
                     <el-col :span="12" class="el-col">
-                        <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-form-item label="医疗器械注册人:">
+                            <el-input style="width: 90%" :disabled="true" size="small" splaceholder="ylqxzcrbarmc" v-model="data.ylqxzcrbarmc"></el-input>
+                      </el-form-item>
                     </el-col>
-
                 </el-row>
-                <el-row :gutter="20" class="el-row" type="flex">
 
+                <el-row>
                     <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-form-item label="注册人英文名称:">
+                            <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="data.ylqxzcrbarywmc"></el-input>
+                      </el-form-item>
                     </el-col>
                     <el-col :span="12" class="el-col">
-                        <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-form-item label="器械类别:">
+                            <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="data.qxlb"></el-input>
+                      </el-form-item>
                     </el-col>
                 </el-row>
-                <el-row :gutter="20" class="el-row" type="flex">
+
+                <el-row>
                     <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-form-item label="产品类别:">
+                            <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="data.cplb"></el-input>
+                      </el-form-item>
                     </el-col>
                     <el-col :span="12" class="el-col">
-                        <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-form-item label="分类编码:">
+                            <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="data.flbm"></el-input>
+                      </el-form-item>
                     </el-col>
-
                 </el-row>
-                <el-row :gutter="20" class="el-row" type="flex">
 
+                <el-row >
                     <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-form-item label="商品条码:">
+                            <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="data.sptm"></el-input>
+                      </el-form-item>
                     </el-col>
                     <el-col :span="12" class="el-col">
-                        <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-form-item label="医保编码:">
+                            <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="data.ybbm"></el-input>
+                      </el-form-item>
                     </el-col>
                 </el-row>
-                <el-row :gutter="20" class="el-row" type="flex">
 
+                <el-row>
                     <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-form-item label="统一社会信用号:">
+                            <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="data.tyshxydm"></el-input>
+                      </el-form-item>
                     </el-col>
                     <el-col :span="12" class="el-col">
-                        <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-form-item label="注册证/备案号:">
+                            <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="data.zczbhhzbapzbh"></el-input>
+                      </el-form-item>
                     </el-col>
                 </el-row>
-            </div>
+          </el-form>
         </el-card>
     </div>
 
@@ -355,6 +220,7 @@ export default {
 
     data() {
         return {
+          showSearch: true,
             erpQuery: {
                 code: null,
                 name: null,
@@ -430,8 +296,11 @@ export default {
             console.log(val);
             this.currentRow = val;
         },
+        hideSearch() {
+          this.showSearch = !this.showSearch;
+        },
         handleErpPageChange(val) {
-            this.erpQuery.page = val;
+            this.erpQuery.page = val.page;
             this.getErpList();
         },