diff --git a/public/config.json b/public/config.json
index 278f148..158cef8 100644
--- a/public/config.json
+++ b/public/config.json
@@ -1,6 +1,6 @@
 {
-    "BASE_URL": "http://192.168.1.20:9996",
-    "SERVER_IP": "http://192.168.1.20:9996",
+    "BASE_URL": "http://192.168.0.166:9996",
+    "SERVER_IP": "http://192.168.0.166:9996",
     "hosp_name": "福建省XX市医院"
 }
 
diff --git a/src/views/basic/BussinessType.vue b/src/views/basic/BussinessType.vue
index f15e131..b2729d0 100644
--- a/src/views/basic/BussinessType.vue
+++ b/src/views/basic/BussinessType.vue
@@ -203,6 +203,10 @@ export default {
                 checkBalacne: null,
                 secCheckBalacne: null,
                 secCheckCopy: null,
+
+                checkUdiwms: null,
+                secCheckUdiwms: null,
+
                 corpType: null,
                 storageCode: null,
                 supplementOrderType: null,
@@ -217,6 +221,8 @@ export default {
                 defaultInv: null,
                 defaultSubInv: null,
                 orderVisibleType: 0,
+                vailDispatch: false,
+                vailGroupBuy: 0,
             },
             enableMap: {
                 true: "是",
@@ -393,6 +399,10 @@ export default {
                 orderVisibleType: row.orderVisibleType,
                 checkCopy: row.checkCopy,
                 secCheckCopy: row.secCheckCopy,
+                checkUdiwms: row.checkUdiwms,
+                secCheckUdiwms: row.secCheckUdiwms,
+                vailDispatch: row.vailDispatch,
+                vailGroupBuy: row.vailGroupBuy
             };
             this.modifyDialogVisible = true;
         },
diff --git a/src/views/basic/BussinessTypeModify.vue b/src/views/basic/BussinessTypeModify.vue
index ca33ff8..87df050 100644
--- a/src/views/basic/BussinessTypeModify.vue
+++ b/src/views/basic/BussinessTypeModify.vue
@@ -212,8 +212,6 @@
                         <el-option label="批次号" :value=0></el-option>
                         <el-option label="条码清单" :value=1></el-option>
                     </el-select>
-
-
                 </div>
             </el-col>
         </el-row>
@@ -221,18 +219,35 @@
 
         <el-row :gutter="20" class="el-row" type="flex">
             <el-col :span="24" class="el-col">
-                <div class="text item" >
+                <div class="text item">
                     <el-checkbox v-model="inputQuery.ullageFill" :disabled="!inputQuery.changeEnable">单据默认自动补单
                     </el-checkbox>
                     <el-checkbox v-model="inputQuery.scanPreIn" :disabled="inputQuery.corpType!='2'">出库时必须校验预验收库存
                     </el-checkbox>
-                    <el-checkbox v-model="inputQuery.vailInv" :disabled="inputQuery.mainAction=='WareHouseIn'">是否只允许有库存产品出库
+                    <el-checkbox v-model="inputQuery.vailInv" :disabled="inputQuery.mainAction=='WareHouseIn'">
+                        是否只允许有库存产品出库
                     </el-checkbox>
                     <el-checkbox v-model="inputQuery.codeFillCheck">采集UDI码时进行三期校验
                     </el-checkbox>
                 </div>
             </el-col>
         </el-row>
+        <el-row :gutter="20" class="el-row" type="flex">
+            <el-col :span="24" class="el-col">
+                <div class="text item">
+                    <el-checkbox v-model="inputQuery.vailDispatch">校验产品是否可配送
+                    </el-checkbox>
+
+                    <span style="margin-left: 15px">校验是否集采产品:</span>
+                    <el-select v-model="inputQuery.vailGroupBuy" style="margin-left: 5px"
+                               size="mini">
+                        <el-option label="无需校验" :value=0></el-option>
+                        <el-option label="只采集集采产品" :value=1></el-option>
+                        <el-option label="只采集非集采产品" :value=2></el-option>
+                    </el-select>
+                </div>
+            </el-col>
+        </el-row>
         <el-divider></el-divider>
         <el-row :gutter="20" class="el-row" type="flex">
             <el-col :span="4" class="el-col">
@@ -268,10 +283,12 @@
             </el-col>
             <el-col :span="4" class="el-col">
                 <div class="text item">
-                    <el-checkbox v-model="inputQuery.checkPc" :disabled="!inputQuery.checkEnable">UDI扫码通</el-checkbox>
+                    <el-checkbox v-model="inputQuery.checkPc" :disabled="!inputQuery.checkEnable">UDI扫码通
+                    </el-checkbox>
                 </div>
             </el-col>
 
+
         </el-row>
         <el-row :gutter="20" class="el-row" type="flex" style="margin-left: 15px">
             <el-col :span="4" class="el-col">
@@ -292,6 +309,12 @@
                     </el-checkbox>
                 </div>
             </el-col>
+            <el-col :span="4" class="el-col">
+                <div class="text item">
+                    <el-checkbox v-model="inputQuery.checkUdiwms" :disabled="!inputQuery.checkEnable">UDI管理系统
+                    </el-checkbox>
+                </div>
+            </el-col>
         </el-row>
 
         <el-divider></el-divider>
@@ -357,6 +380,12 @@
                     </el-checkbox>
                 </div>
             </el-col>
+            <el-col :span="4" class="el-col">
+                <div class="text item">
+                    <el-checkbox v-model="inputQuery.secCheckUdiwms" :disabled="!inputQuery.secCheckEnable">UDI管理系统
+                    </el-checkbox>
+                </div>
+            </el-col>
         </el-row>
         <el-divider></el-divider>
 
diff --git a/src/views/basic/UdiInfoManage.vue b/src/views/basic/UdiInfoManage.vue
index d46176c..a771b83 100644
--- a/src/views/basic/UdiInfoManage.vue
+++ b/src/views/basic/UdiInfoManage.vue
@@ -1,1005 +1,1026 @@
 <template>
-    <div>
+  <div>
+    <el-card>
+      <el-form :inline="true" :model="filterQuery" size="mini">
+        <el-row style="width: 1000px">
+          <el-form-item class="query-form-item">
+            <el-input v-model="filterQuery.udiCode"
+                      style="width: 600px"
+                      placeholder="请扫描或输入UDI码"
+                      clearable="true"
+                      @keyup.enter.native="keyup_submit($event)"></el-input>
+          </el-form-item>
+        </el-row>
+
+        <el-row>
+          <el-form-item class="query-form-item">
+            <el-input v-model="filterQuery.unionCode" placeholder="DI/医保编码/商品条码"
+                      clearable="true"></el-input>
+          </el-form-item>
+          <el-form-item class="query-form-item">
+            <el-input v-model="filterQuery.cpmctymc" placeholder="产品通用名" clearable="true"></el-input>
+          </el-form-item>
+          <el-form-item class="query-form-item">
+            <el-input v-model="filterQuery.ggxh" placeholder="规格型号" clearable="true"></el-input>
+          </el-form-item>
+
+
+          <el-form-item class="query-form-item">
+            <el-select v-model="filterQuery.filterType" placeholder="请选择过滤对照条件">
+              <el-option
+                  v-for="item in filterList"
+                  :key="item.filterType"
+                  :label="item.sysName"
+                  :value="item.filterType">
+                <span style="float: left">{{ item.sysName }}</span>
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-row>
+
+        <el-row>
+          <el-form-item class="query-form-item">
+            <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产企业/注册备案人"
+                      clearable="true"></el-input>
+          </el-form-item>
+          <el-form-item class="query-form-item">
+            <el-input v-model="filterQuery.thrPiId" placeholder="第三方产品编码" clearable="true"></el-input>
+          </el-form-item>
+          <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="submit">查询</el-button>
+
+              <el-button type="primary" icon="search" @click="intentImportUdi"
+                         :disabled="!configParms.basicProducts"
+              >添加DI信息
+              </el-button
+              >
+              <el-button type="primary" icon="search" @click="intentImportErp"
+                         :disabled="!configParms.basicProducts"
+              >添加产品信息
+              </el-button
+              >
+              <el-button type="primary" icon="search" @click="intentDetail"
+                         :disabled="!configParms.basicProducts"
+              >关联添加
+              </el-button>
+            </el-button-group>
+          </el-form-item>
+        </el-row>
+      </el-form>
+      <el-table
+          v-loading="loading"
+          :data="list"
+          style="width: 100%"
+          highlight-current-row
+          key="1"
+          @selection-change="handleSelectionChange"
+      >
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column
+            label="最小销售产品标识"
+            prop="nameCode"
+            width="140"
+            show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+            label="主系统产品编码"
+            prop="mainId"
+            show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+            label="生产企业"
+            prop="ylqxzcrbarmc"
+            show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+            label="产品通用名"
+            prop="cpmctymc"
+            show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+            label="规格型号"
+            prop="ggxh"
+            show-overflow-tooltip
+        ></el-table-column>
+
+        <el-table-column
+            label="注册/备案凭证"
+            prop="zczbhhzbapzbh"
+            show-overflow-tooltip
+        ></el-table-column>
+
+        <el-table-column
+            label="器械类别"
+            prop="qxlb"
+            show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+            label="是否集采"
+            prop="groupBuy"
+            show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <span>{{ enableMap[scope.row.groupBuy] }}</span>
+          </template>
+
+        </el-table-column>
+        <el-table-column width="200" label="操作" fixed="right">
+          <template slot-scope="scope">
+            <el-button
+                type="text"
+                size="small"
+                :disabled="scope.row.originUuid != null || !configParms.basicProducts"
+                @click.native.stop="intentSelectUdi(scope.row)"
+            >关联DI
+            </el-button>
+            <el-button
+                type="text"
+                size="small"
+                @click.native.stop="handleModifyClick(scope.row)" :disabled="!configParms.basicProducts"
+            >编辑
+            </el-button>
+            <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)"
+                       :disabled="!configParms.basicProducts"
+            >删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-dialog
+          title="产品信息编辑"
+          :visible.sync="editDialogVisible"
+          :close-on-click-modal="false"
+          :close-on-press-escape="false"
+          width="70%"
+          v-if="editDialogVisible"
+      >
         <el-card>
-            <el-form :inline="true" :model="filterQuery" size="mini">
-                <el-row style="width: 1000px">
-                    <el-form-item class="query-form-item">
-                        <el-input v-model="filterQuery.udiCode"
-                                  style="width: 600px"
-                                  placeholder="请扫描或输入UDI码"
-                                  clearable="true"
-                                  @keyup.enter.native="keyup_submit($event)"></el-input>
-                    </el-form-item>
+          <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="操作" fixed="right">
+              <template slot-scope="scope">
+                <el-button
+                    type="text"
+                    size="small"
+                    @click="addSelectErp(scope.row)"
+                    :disabled="scope.row.thirdId==editQuery.nameCode"
+                >关联
+                </el-button
+                >
+                <el-button type="text" size="small" @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="bzcj"
+                show-overflow-tooltip
+            ></el-table-column>
+          </el-table>
+        </el-card>
+
+        <el-card>
+          <el-form
+              :model="editQuery"
+              :rules="rules"
+              ref="editQuery"
+              border
+              label-width="100px"
+              style="margin-top: 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="请输入内容"
+                      v-model="editQuery.sptm"
+                  ></el-input>
+                </div>
+              </el-col>
+              <el-col :span="12" class="el-col">
+                <div class="text item">
+                  <div class="itemTag">
+                    <span>医保编码:&nbsp;</span>
+                  </div>
+                  <el-input
+                      style="width: 65%"
+                      size="small"
+                      splaceholder="请输入内容"
+                      v-model="editQuery.ybbm"
+                  ></el-input>
+                </div>
+              </el-col>
+            </el-row>
+
+            <el-row :gutter="20" class="el-row" type="flex">
+              <el-col :span="12" class="el-col">
+                <div class="text item">
+                  <div class="itemTag">
+                    <span>计量单位:&nbsp;</span>
+                  </div>
+                  <el-input
+                      style="width: 65%"
+                      size="small"
+                      splaceholder="请输入内容"
+                      v-model="editQuery.measname"
+                  ></el-input>
+                </div>
+              </el-col>
+              <el-col :span="12" class="el-col">
+                <div class="text item">
+                  <div class="itemTag">
+                    <span>生产厂家:&nbsp;</span>
+                  </div>
+                  <el-input
+                      style="width: 65%"
+                      size="small"
+                      v-model="editQuery.manufactory"
+                      splaceholder="请输入内容"
+                  ></el-input>
+                </div>
+              </el-col>
+            </el-row>
+
+            <el-row :gutter="20" class="el-row" type="flex">
+
+              <el-col :span="12" class="el-col">
+                <div class="text item">
+                  <div class="itemTag">
+                    <span>商品名称:&nbsp;</span>
+                  </div>
+                  <el-input
+                      style="width: 65%"
+                      size="small"
+                      splaceholder="请输入内容"
+                      v-model="editQuery.spmc"
+                  ></el-input>
+                </div>
+              </el-col>
+
+              <el-col :span="12" class="el-col">
+                <div class="text item">
+                  <div class="itemTag">
+                    <span>产品描述:&nbsp;</span>
+                  </div>
+                  <el-input
+                      style="width: 65%"
+                      size="small"
+                      splaceholder="请输入内容"
+                      v-model="editQuery.cpms"
+                  ></el-input>
+                </div>
+              </el-col>
+            </el-row>
+
+
+            <el-row :gutter="20" class="el-row" type="flex">
+
+              <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable1">
+                <div class="text item">
+                  <div class="itemTag">
+                    <span>{{ productRemarkSet.remarkTitle1 }}:&nbsp;</span>
+                  </div>
+                  <el-input
+                      style="width: 65%"
+                      size="small"
+                      splaceholder="请输入内容"
+                      v-model="editQuery.basicPrductRemak1"
+                  ></el-input>
+                </div>
+              </el-col>
+
+              <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable2">
+                <div class="text item">
+                  <div class="itemTag">
+                    <span>{{ productRemarkSet.remarkTitle2 }}:&nbsp;</span>
+                  </div>
+                  <el-input
+                      style="width: 65%"
+                      size="small"
+                      splaceholder="请输入内容"
+                      v-model="editQuery.basicPrductRemak2"
+                  ></el-input>
+                </div>
+              </el-col>
+            </el-row>
+
+            <el-row :gutter="20" class="el-row" type="flex">
+
+              <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable3">
+                <div class="text item">
+                  <div class="itemTag">
+                    <span>{{ productRemarkSet.remarkTitle3 }}:&nbsp;</span>
+                  </div>
+                  <el-input
+                      style="width: 65%"
+                      size="small"
+                      splaceholder="请输入内容"
+                      v-model="editQuery.basicPrductRemak3"
+                  ></el-input>
+                </div>
+              </el-col>
+
+              <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable4">
+                <div class="text item">
+                  <div class="itemTag">
+                    <span>{{ productRemarkSet.remarkTitle4 }}:&nbsp;</span>
+                  </div>
+                  <el-input
+                      style="width: 65%"
+                      size="small"
+                      splaceholder="请输入内容"
+                      v-model="editQuery.basicPrductRemak4"
+                  ></el-input>
+                </div>
+              </el-col>
+            </el-row>
+
+            <el-row :gutter="20" class="el-row" type="flex">
+
+              <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable5">
+                <div class="text item">
+                  <div class="itemTag">
+                    <span>{{ productRemarkSet.remarkTitle5 }}:&nbsp;</span>
+                  </div>
+                  <el-input
+                      style="width: 65%"
+                      size="small"
+                      splaceholder="请输入内容"
+                      v-model="editQuery.basicPrductRemak5"
+                  ></el-input>
+                </div>
+              </el-col>
+
+              <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable6">
+                <div class="text item">
+                  <div class="itemTag">
+                    <span>{{ productRemarkSet.remarkTitle6 }}:&nbsp;</span>
+                  </div>
+                  <el-input
+                      style="width: 65%"
+                      size="small"
+                      splaceholder="请输入内容"
+                      v-model="editQuery.basicPrductRemak6"
+                  ></el-input>
+                </div>
+              </el-col>
+            </el-row>
+
+            <el-row :gutter="20" class="el-row" type="flex">
+
+              <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable7">
+                <div class="text item">
+                  <div class="itemTag">
+                    <span>{{ productRemarkSet.remarkTitle7 }}:&nbsp;</span>
+                  </div>
+                  <el-input
+                      style="width: 65%"
+                      size="small"
+                      splaceholder="请输入内容"
+                      v-model="editQuery.basicPrductRemak7"
+                  ></el-input>
+                </div>
+              </el-col>
+
+              <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable8">
+                <div class="text item">
+                  <div class="itemTag">
+                    <span>{{ productRemarkSet.remarkTitle8 }}:&nbsp;</span>
+                  </div>
+                  <el-input
+                      style="width: 65%"
+                      size="small"
+                      splaceholder="请输入内容"
+                      v-model="editQuery.basicPrductRemak8"
+                  ></el-input>
+                </div>
+              </el-col>
+            </el-row>
+            <!--                        <el-row :gutter="20" class="el-row" type="flex">-->
+            <!--                            <el-col :span="12" class="el-col">-->
+            <!--                                <div class="text item">-->
+            <!--                                    <div class="itemTag">-->
+            <!--                                        <span>进口产品代理商:&nbsp;</span>-->
+            <!--                                    </div>-->
+            <!--                                    <el-input-->
+            <!--                                        style="width: 65%"-->
+            <!--                                        size="small"-->
+            <!--                                        splaceholder="请输入内容"-->
+            <!--                                        v-model="editQuery.cpdls"-->
+            <!--                                    ></el-input>-->
+            <!--                                </div>-->
+            <!--                            </el-col>-->
+            <!--                        </el-row>-->
+
+            <el-row :gutter="20" class="el-row" type="flex">
+              <el-col :span="24" class="el-col">
+                <div style="margin-top: 18px;margin-bottom: 18px">
+                  <el-checkbox v-model="checked" class=""
+                               :disabled="!isUseDyCheck"
+                  >以使用单元数量入库
+                  </el-checkbox>
+                  <el-checkbox v-model="editQuery.isDisable" class=""
+                               @change="diableChange"
+                  >是否禁用
+                  </el-checkbox>
+                  <el-checkbox v-model="editQuery.isAdavence" class=""
+                  >是否寄售
+                  </el-checkbox>
+                  <el-checkbox v-model="editQuery.allowNoBatch" class=""
+                  >允许无批次号
+                  </el-checkbox>
+                  <el-checkbox v-model="editQuery.allowNoExpire" class=""
+                  >允许无失效日期
+                  </el-checkbox>
+                  <el-checkbox v-model="editQuery.allowNoProduct" class=""
+                  >允许无生产日期
+                  </el-checkbox>
+                </div>
+              </el-col>
+            </el-row>
+
+            <el-row :gutter="20" class="el-row" type="flex">
+              <el-checkbox v-model="editQuery.dispatch"
+              >是否可配送
+              </el-checkbox>
+
+              <el-checkbox v-model="editQuery.groupBuy"
+                           @change="groupBuyChange"
+              >是否集采产品
+              </el-checkbox>
+
+            </el-row>
+
+            <el-divider></el-divider>
+
+            <el-collapse v-model="activeNames">
+              <el-collapse-item name="1">
+                <template slot="title">
+                  <p class="form-title">产品标识基本信息</p>
+                </template>
+                <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="productType==0"
+                          v-model="editQuery.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="productType==0"
+                          size="small"
+                          splaceholder="请输入内容"
+                          v-model="editQuery.zxxsbzbhsydysl"
+                      ></el-input>
+                    </div>
+                  </el-col>
+
                 </el-row>
 
-                <el-row>
-                    <el-form-item class="query-form-item">
-                        <el-input v-model="filterQuery.unionCode" placeholder="DI/医保编码/商品条码"
-                                  clearable="true"></el-input>
-                    </el-form-item>
-                    <el-form-item class="query-form-item">
-                        <el-input v-model="filterQuery.cpmctymc" placeholder="产品通用名" clearable="true"></el-input>
-                    </el-form-item>
-                    <el-form-item class="query-form-item">
-                        <el-input v-model="filterQuery.ggxh" placeholder="规格型号" clearable="true"></el-input>
-                    </el-form-item>
-
-
-                    <el-form-item class="query-form-item">
-                        <el-select v-model="filterQuery.filterType" placeholder="请选择过滤对照条件">
-                            <el-option
-                                v-for="item in filterList"
-                                :key="item.filterType"
-                                :label="item.sysName"
-                                :value="item.filterType">
-                                <span style="float: left">{{ item.sysName }}</span>
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
+                <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"
+                          :disabled="productType==0"
+                          splaceholder="请输入内容"
+                          v-model="editQuery.bhxjcpbm"
+
+                      ></el-input>
+                    </div>
+                  </el-col>
+
+                  <el-col :span="12" class="el-col">
+                    <div class="text item">
+                      <div class="itemTag">
+                        <span>包含最小销售包装数量:&nbsp;</span>
+                      </div>
+                      <el-input
+                          style="width: 65%"
+                          size="small"
+                          :disabled="productType==0"
+                          splaceholder="请输入内容"
+                          v-model="editQuery.bhzxxsbzsl"
+                      ></el-input>
+                    </div>
+                  </el-col>
                 </el-row>
+              </el-collapse-item>
+
+              <el-collapse-item name="2">
+                <template slot="title">
+                  <p class="form-title">产品基本信息</p>
+                </template>
+                <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="editQuery.nameCode"
+                      ></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="productType==0"
+                          size="small"
+                          splaceholder="请输入内容"
+                          v-model="editQuery.ggxh"
+                      ></el-input>
+                    </div>
+                  </el-col>
 
-                <el-row>
-                    <el-form-item class="query-form-item">
-                        <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产企业/注册备案人"
-                                  clearable="true"></el-input>
-                    </el-form-item>
-                    <el-form-item class="query-form-item">
-                        <el-input v-model="filterQuery.thrPiId" placeholder="第三方产品编码" clearable="true"></el-input>
-                    </el-form-item>
-                    <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="submit">查询</el-button>
-
-                            <el-button type="primary" icon="search" @click="intentImportUdi"
-                                       :disabled="!configParms.basicProducts"
-                            >添加DI信息
-                            </el-button
-                            >
-                            <el-button type="primary" icon="search" @click="intentImportErp"
-                                       :disabled="!configParms.basicProducts"
-                            >添加产品信息
-                            </el-button
-                            >
-                            <el-button type="primary" icon="search" @click="intentDetail"
-                                       :disabled="!configParms.basicProducts"
-                            >关联添加
-                            </el-button>
-                        </el-button-group>
-                    </el-form-item>
                 </el-row>
-            </el-form>
-            <el-table
-                v-loading="loading"
-                :data="list"
-                style="width: 100%"
-                highlight-current-row
-                key="1"
-                @selection-change="handleSelectionChange"
-            >
-                <el-table-column label="序号" type="index"></el-table-column>
-                <el-table-column
-                    label="最小销售产品标识"
-                    prop="nameCode"
-                    width="140"
-                    show-overflow-tooltip
-                ></el-table-column>
-                <el-table-column
-                    label="主系统产品编码"
-                    prop="mainId"
-                    show-overflow-tooltip
-                ></el-table-column>
-                <el-table-column
-                    label="生产企业"
-                    prop="ylqxzcrbarmc"
-                    show-overflow-tooltip
-                ></el-table-column>
-                <el-table-column
-                    label="产品通用名"
-                    prop="cpmctymc"
-                    show-overflow-tooltip
-                ></el-table-column>
-                <el-table-column
-                    label="规格型号"
-                    prop="ggxh"
-                    show-overflow-tooltip
-                ></el-table-column>
-
-                <el-table-column
-                    label="注册/备案凭证"
-                    prop="zczbhhzbapzbh"
-                    show-overflow-tooltip
-                ></el-table-column>
-
-                <el-table-column
-                    label="器械类别"
-                    prop="qxlb"
-                    show-overflow-tooltip
-                ></el-table-column>
-
-                <el-table-column width="200" label="操作" fixed="right">
-                    <template slot-scope="scope">
-                        <el-button
-                            type="text"
-                            size="small"
-                            :disabled="scope.row.originUuid != null || !configParms.basicProducts"
-                            @click.native.stop="intentSelectUdi(scope.row)"
-                        >关联DI
-                        </el-button>
-                        <el-button
-                            type="text"
-                            size="small"
-                            @click.native.stop="handleModifyClick(scope.row)" :disabled="!configParms.basicProducts"
-                        >编辑
-                        </el-button>
-                        <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)"
-                                   :disabled="!configParms.basicProducts"
-                        >删除
-                        </el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-            <el-dialog
-                title="产品信息编辑"
-                :visible.sync="editDialogVisible"
-                :close-on-click-modal="false"
-                :close-on-press-escape="false"
-                width="70%"
-                v-if="editDialogVisible"
-            >
-                <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="操作" fixed="right">
-                            <template slot-scope="scope">
-                                <el-button
-                                    type="text"
-                                    size="small"
-                                    @click="addSelectErp(scope.row)"
-                                    :disabled="scope.row.thirdId==editQuery.nameCode"
-                                >关联
-                                </el-button
-                                >
-                                <el-button type="text" size="small" @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>
+
+                <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="productType==0"
+                          size="small"
+                          splaceholder="请输入内容"
+                          v-model="editQuery.cplb"
+                      ></el-input>
                     </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
-                        >
+                  </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="productType==0"
+                          size="small"
+                          splaceholder="请输入内容"
+                          v-model="editQuery.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="productType==0"
+                          size="small"
+                          splaceholder="请输入内容"
+                          v-model="editQuery.qxlb"
+                      ></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="productType==0"
+                          size="small"
+                          splaceholder="请输入内容"
+                          v-model="editQuery.zczbhhzbapzbh"
+                      ></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="productType==0"
+                          size="small"
+                          splaceholder="ylqxzcrbarmc"
+                          v-model="editQuery.ylqxzcrbarmc"
+                      ></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="productType==0"
+                          size="small"
+                          splaceholder="请输入内容"
+                          v-model="editQuery.ylqxzcrbarywmc"
+                      ></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="productType==0"
+                          size="small"
+                          splaceholder="请输入内容"
+                          v-model="editQuery.tyshxydm"
+                      ></el-input>
+                    </div>
+                  </el-col>
+                </el-row>
+
+              </el-collapse-item>
+
+
+              <el-collapse-item name="3">
+                <template slot="title">
+                  <p class="form-title">生产标识基本信息</p>
+                </template>
+                <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="productType==0"
+                          size="small"
+                          splaceholder="请输入内容"
+                          v-model="editQuery.scbssfbhph"
+                      ></el-input>
                     </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="bzcj"
-                            show-overflow-tooltip
-                        ></el-table-column>
-                    </el-table>
-                </el-card>
-
-                <el-card>
-                    <el-form
-                        :model="editQuery"
-                        :rules="rules"
-                        ref="editQuery"
-                        border
-                        label-width="100px"
-                        style="margin-top: 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="请输入内容"
-                                        v-model="editQuery.sptm"
-                                    ></el-input>
-                                </div>
-                            </el-col>
-                            <el-col :span="12" class="el-col">
-                                <div class="text item">
-                                    <div class="itemTag">
-                                        <span>医保编码:&nbsp;</span>
-                                    </div>
-                                    <el-input
-                                        style="width: 65%"
-                                        size="small"
-                                        splaceholder="请输入内容"
-                                        v-model="editQuery.ybbm"
-                                    ></el-input>
-                                </div>
-                            </el-col>
-                        </el-row>
-
-                        <el-row :gutter="20" class="el-row" type="flex">
-                            <el-col :span="12" class="el-col">
-                                <div class="text item">
-                                    <div class="itemTag">
-                                        <span>计量单位:&nbsp;</span>
-                                    </div>
-                                    <el-input
-                                        style="width: 65%"
-                                        size="small"
-                                        splaceholder="请输入内容"
-                                        v-model="editQuery.measname"
-                                    ></el-input>
-                                </div>
-                            </el-col>
-                            <el-col :span="12" class="el-col">
-                                <div class="text item">
-                                    <div class="itemTag">
-                                        <span>生产厂家:&nbsp;</span>
-                                    </div>
-                                    <el-input
-                                        style="width: 65%"
-                                        size="small"
-                                        v-model="editQuery.manufactory"
-                                        splaceholder="请输入内容"
-                                    ></el-input>
-                                </div>
-                            </el-col>
-                        </el-row>
-
-                        <el-row :gutter="20" class="el-row" type="flex">
-
-                            <el-col :span="12" class="el-col">
-                                <div class="text item">
-                                    <div class="itemTag">
-                                        <span>商品名称:&nbsp;</span>
-                                    </div>
-                                    <el-input
-                                        style="width: 65%"
-                                        size="small"
-                                        splaceholder="请输入内容"
-                                        v-model="editQuery.spmc"
-                                    ></el-input>
-                                </div>
-                            </el-col>
-
-                            <el-col :span="12" class="el-col">
-                                <div class="text item">
-                                    <div class="itemTag">
-                                        <span>产品描述:&nbsp;</span>
-                                    </div>
-                                    <el-input
-                                        style="width: 65%"
-                                        size="small"
-                                        splaceholder="请输入内容"
-                                        v-model="editQuery.cpms"
-                                    ></el-input>
-                                </div>
-                            </el-col>
-                        </el-row>
-
-
-                        <el-row :gutter="20" class="el-row" type="flex">
-
-                            <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable1">
-                                <div class="text item">
-                                    <div class="itemTag">
-                                        <span>{{ productRemarkSet.remarkTitle1 }}:&nbsp;</span>
-                                    </div>
-                                    <el-input
-                                        style="width: 65%"
-                                        size="small"
-                                        splaceholder="请输入内容"
-                                        v-model="editQuery.basicPrductRemak1"
-                                    ></el-input>
-                                </div>
-                            </el-col>
-
-                            <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable2">
-                                <div class="text item">
-                                    <div class="itemTag">
-                                        <span>{{ productRemarkSet.remarkTitle2 }}:&nbsp;</span>
-                                    </div>
-                                    <el-input
-                                        style="width: 65%"
-                                        size="small"
-                                        splaceholder="请输入内容"
-                                        v-model="editQuery.basicPrductRemak2"
-                                    ></el-input>
-                                </div>
-                            </el-col>
-                        </el-row>
-
-                        <el-row :gutter="20" class="el-row" type="flex">
-
-                            <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable3">
-                                <div class="text item">
-                                    <div class="itemTag">
-                                        <span>{{ productRemarkSet.remarkTitle3 }}:&nbsp;</span>
-                                    </div>
-                                    <el-input
-                                        style="width: 65%"
-                                        size="small"
-                                        splaceholder="请输入内容"
-                                        v-model="editQuery.basicPrductRemak3"
-                                    ></el-input>
-                                </div>
-                            </el-col>
-
-                            <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable4">
-                                <div class="text item">
-                                    <div class="itemTag">
-                                        <span>{{ productRemarkSet.remarkTitle4 }}:&nbsp;</span>
-                                    </div>
-                                    <el-input
-                                        style="width: 65%"
-                                        size="small"
-                                        splaceholder="请输入内容"
-                                        v-model="editQuery.basicPrductRemak4"
-                                    ></el-input>
-                                </div>
-                            </el-col>
-                        </el-row>
-
-                        <el-row :gutter="20" class="el-row" type="flex">
-
-                            <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable5">
-                                <div class="text item">
-                                    <div class="itemTag">
-                                        <span>{{ productRemarkSet.remarkTitle5 }}:&nbsp;</span>
-                                    </div>
-                                    <el-input
-                                        style="width: 65%"
-                                        size="small"
-                                        splaceholder="请输入内容"
-                                        v-model="editQuery.basicPrductRemak5"
-                                    ></el-input>
-                                </div>
-                            </el-col>
-
-                            <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable6">
-                                <div class="text item">
-                                    <div class="itemTag">
-                                        <span>{{ productRemarkSet.remarkTitle6 }}:&nbsp;</span>
-                                    </div>
-                                    <el-input
-                                        style="width: 65%"
-                                        size="small"
-                                        splaceholder="请输入内容"
-                                        v-model="editQuery.basicPrductRemak6"
-                                    ></el-input>
-                                </div>
-                            </el-col>
-                        </el-row>
-
-                        <el-row :gutter="20" class="el-row" type="flex">
-
-                            <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable7">
-                                <div class="text item">
-                                    <div class="itemTag">
-                                        <span>{{ productRemarkSet.remarkTitle7 }}:&nbsp;</span>
-                                    </div>
-                                    <el-input
-                                        style="width: 65%"
-                                        size="small"
-                                        splaceholder="请输入内容"
-                                        v-model="editQuery.basicPrductRemak7"
-                                    ></el-input>
-                                </div>
-                            </el-col>
-
-                            <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable8">
-                                <div class="text item">
-                                    <div class="itemTag">
-                                        <span>{{ productRemarkSet.remarkTitle8 }}:&nbsp;</span>
-                                    </div>
-                                    <el-input
-                                        style="width: 65%"
-                                        size="small"
-                                        splaceholder="请输入内容"
-                                        v-model="editQuery.basicPrductRemak8"
-                                    ></el-input>
-                                </div>
-                            </el-col>
-                        </el-row>
-                        <!--                        <el-row :gutter="20" class="el-row" type="flex">-->
-                        <!--                            <el-col :span="12" class="el-col">-->
-                        <!--                                <div class="text item">-->
-                        <!--                                    <div class="itemTag">-->
-                        <!--                                        <span>进口产品代理商:&nbsp;</span>-->
-                        <!--                                    </div>-->
-                        <!--                                    <el-input-->
-                        <!--                                        style="width: 65%"-->
-                        <!--                                        size="small"-->
-                        <!--                                        splaceholder="请输入内容"-->
-                        <!--                                        v-model="editQuery.cpdls"-->
-                        <!--                                    ></el-input>-->
-                        <!--                                </div>-->
-                        <!--                            </el-col>-->
-                        <!--                        </el-row>-->
-
-                        <el-row :gutter="20" class="el-row" type="flex">
-                            <el-col :span="24" class="el-col">
-                                <div style="margin-top: 18px;margin-bottom: 18px">
-                                    <el-checkbox v-model="checked" class=""
-                                                 :disabled="!isUseDyCheck"
-                                    >以使用单元数量入库
-                                    </el-checkbox>
-                                    <el-checkbox v-model="editQuery.isDisable" class=""
-                                                 @change="diableChange"
-                                    >是否禁用
-                                    </el-checkbox>
-                                    <el-checkbox v-model="editQuery.isAdavence" class=""
-                                    >是否寄售
-                                    </el-checkbox>
-                                    <el-checkbox v-model="editQuery.allowNoBatch" class=""
-                                    >允许无批次号
-                                    </el-checkbox>
-                                    <el-checkbox v-model="editQuery.allowNoExpire" class=""
-                                    >允许无失效日期
-                                    </el-checkbox>
-                                    <el-checkbox v-model="editQuery.allowNoProduct" class=""
-                                    >允许无生产日期
-                                    </el-checkbox>
-                                </div>
-                            </el-col>
-                        </el-row>
-
-                        <el-divider></el-divider>
-
-                        <el-collapse v-model="activeNames">
-                            <el-collapse-item name="1">
-                                <template slot="title">
-                                    <p class="form-title">产品标识基本信息</p>
-                                </template>
-                                <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="productType==0"
-                                                v-model="editQuery.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="productType==0"
-                                                size="small"
-                                                splaceholder="请输入内容"
-                                                v-model="editQuery.zxxsbzbhsydysl"
-                                            ></el-input>
-                                        </div>
-                                    </el-col>
-
-                                </el-row>
-
-                                <el-row :gutter="20" class="el-row" type="flex">
-                                    <el-col :span="12" class="el-col">
-                                        <div class="text item">
-                                            <div class="itemTag">
-                                                <span>包含下级产品编码:&nbsp;</span>
-                                            </div>
-
-                                            <el-input
-                                                style="width: 65%"
-                                                size="small"
-                                                :disabled="productType==0"
-                                                splaceholder="请输入内容"
-                                                v-model="editQuery.bhxjcpbm"
-
-                                            ></el-input>
-                                        </div>
-                                    </el-col>
-
-                                    <el-col :span="12" class="el-col">
-                                        <div class="text item">
-                                            <div class="itemTag">
-                                                <span>包含最小销售包装数量:&nbsp;</span>
-                                            </div>
-                                            <el-input
-                                                style="width: 65%"
-                                                size="small"
-                                                :disabled="productType==0"
-                                                splaceholder="请输入内容"
-                                                v-model="editQuery.bhzxxsbzsl"
-                                            ></el-input>
-                                        </div>
-                                    </el-col>
-                                </el-row>
-                            </el-collapse-item>
-
-                            <el-collapse-item name="2">
-                                <template slot="title">
-                                    <p class="form-title">产品基本信息</p>
-                                </template>
-                                <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="editQuery.nameCode"
-                                            ></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="productType==0"
-                                                size="small"
-                                                splaceholder="请输入内容"
-                                                v-model="editQuery.ggxh"
-                                            ></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="productType==0"
-                                                size="small"
-                                                splaceholder="请输入内容"
-                                                v-model="editQuery.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="productType==0"
-                                                size="small"
-                                                splaceholder="请输入内容"
-                                                v-model="editQuery.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="productType==0"
-                                                size="small"
-                                                splaceholder="请输入内容"
-                                                v-model="editQuery.qxlb"
-                                            ></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="productType==0"
-                                                size="small"
-                                                splaceholder="请输入内容"
-                                                v-model="editQuery.zczbhhzbapzbh"
-                                            ></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="productType==0"
-                                                size="small"
-                                                splaceholder="ylqxzcrbarmc"
-                                                v-model="editQuery.ylqxzcrbarmc"
-                                            ></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="productType==0"
-                                                size="small"
-                                                splaceholder="请输入内容"
-                                                v-model="editQuery.ylqxzcrbarywmc"
-                                            ></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="productType==0"
-                                                size="small"
-                                                splaceholder="请输入内容"
-                                                v-model="editQuery.tyshxydm"
-                                            ></el-input>
-                                        </div>
-                                    </el-col>
-                                </el-row>
-
-                            </el-collapse-item>
-
-
-                            <el-collapse-item name="3">
-                                <template slot="title">
-                                    <p class="form-title">生产标识基本信息</p>
-                                </template>
-                                <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="productType==0"
-                                                size="small"
-                                                splaceholder="请输入内容"
-                                                v-model="editQuery.scbssfbhph"
-                                            ></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="productType==0"
-                                                size="small"
-                                                v-model="editQuery.scbssfbhxlh"
-                                                splaceholder="请输入内容"
-                                            ></el-input>
-                                        </div>
-                                    </el-col>
-                                </el-row>
-                                <el-row :gutter="20" class="el-row" type="flex">
-                                    <el-col :span="12" class="el-col">
-                                        <div class="text item">
-                                            <div class="itemTag">
-                                                <span>是否包含生产日期:&nbsp;</span>
-                                            </div>
-                                            <el-input
-                                                style="width: 65%"
-                                                :disabled="productType==0"
-                                                size="small"
-                                                splaceholder="请输入内容"
-                                                v-model="editQuery.scbssfbhscrq"
-                                            ></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="productType==0"
-                                                v-model="editQuery.scbssfbhsxrq"
-                                                size="small"
-                                                splaceholder="请输入内容"
-                                            ></el-input>
-                                        </div>
-                                    </el-col>
-                                </el-row>
-                            </el-collapse-item>
-
-                            <el-collapse-item name="4">
-                                <template slot="title">
-                                    <p class="form-title">包装标识信息</p>
-                                </template>
-                                <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="productType==0"
-                                                size="small"
-                                                splaceholder="请输入内容"
-                                                v-model="editQuery.sjcpbm"
-                                            ></el-input>
-                                        </div>
-                                    </el-col>
-
-                                    <el-col :span="12" class="el-col">
-                                        <div class="text item">
-                                            <div class="itemTag">
-                                                <span>包装级别:&nbsp;</span>
-                                            </div>
-                                            <el-input
-                                                style="width: 65%"
-                                                size="small"
-                                                splaceholder="请输入内容"
-                                                :disabled="productType==0"
-                                                v-model="editQuery.packLevel"
-                                            ></el-input>
-                                        </div>
-                                    </el-col>
-                                </el-row>
-                                <el-row :gutter="20" class="el-row" type="flex">
-                                    <el-col :span="12" class="el-col">
-                                        <div class="text item">
-                                            <div class="itemTag">
-                                                <span>包装单位/包装级别:&nbsp;</span>
-                                            </div>
-
-                                            <el-input
-                                                style="width: 65%"
-                                                size="small"
-                                                splaceholder="请输入内容"
-                                                v-model="editQuery.bzcj"
-                                                :disabled="productType==0"
-                                            ></el-input>
-                                        </div>
-                                    </el-col>
-
-                                    <el-col :span="12" class="el-col">
-                                        <div class="text item">
-                                            <div class="itemTag">
-                                                <span>包含下级包装数量:&nbsp;</span>
-                                            </div>
-                                            <el-input
-                                                style="width: 65%"
-                                                size="small"
-                                                splaceholder="请输入内容"
-                                                :disabled="productType==0"
-                                                v-model="editQuery.bhxjsl"
-                                            ></el-input>
-                                        </div>
-                                    </el-col>
-                                </el-row>
-                            </el-collapse-item>
-
-                            <el-collapse-item name="5">
-                                <template slot="title">
-                                    <p class="form-title">版本信息</p>
-                                </template>
-
-                                <el-row :gutter="20" class="el-row" type="flex">
-
-                                    <el-col :span="8" class="el-col">
-                                        <div class="text item">
-                                            <div class="itemTag">
-                                                <span>当前版本号:&nbsp;</span>
-                                            </div>
-                                            <el-input
-                                                style="width: 35%"
-                                                :disabled="true"
-                                                size="small"
-                                                splaceholder="请输入内容"
-                                                v-model="editQuery.versionNumber"
-                                            ></el-input>
-                                        </div>
-                                    </el-col>
-                                    <el-col :span="2" class="el-col">
-                                        <el-button type="text" size="small" @click.native.stop="selectVersion()"
-                                                   style="margin-left: 5%"
-                                        >切换版本
-                                        </el-button>
-                                    </el-col>
-                                    <el-col :span="2" class="el-col">
-                                        <el-button type="text" size="small" @click.native.stop="updateVersion()"
-                                                   :loading="updateLoading"
-                                                   style="margin-left: 5%"
-                                        >更新当前版本信息
-                                        </el-button>
-                                    </el-col>
-                                </el-row>
-
-                            </el-collapse-item>
-                        </el-collapse>
-                    </el-form>
-                </el-card>
-
-
-                <div style="text-align: center;margin-top: 10px">
-                    <el-button type="primary" size="small" icon="search" @click="onAddSubmit"
-                    >提交
+                  </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="productType==0"
+                          size="small"
+                          v-model="editQuery.scbssfbhxlh"
+                          splaceholder="请输入内容"
+                      ></el-input>
+                    </div>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="20" class="el-row" type="flex">
+                  <el-col :span="12" class="el-col">
+                    <div class="text item">
+                      <div class="itemTag">
+                        <span>是否包含生产日期:&nbsp;</span>
+                      </div>
+                      <el-input
+                          style="width: 65%"
+                          :disabled="productType==0"
+                          size="small"
+                          splaceholder="请输入内容"
+                          v-model="editQuery.scbssfbhscrq"
+                      ></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="productType==0"
+                          v-model="editQuery.scbssfbhsxrq"
+                          size="small"
+                          splaceholder="请输入内容"
+                      ></el-input>
+                    </div>
+                  </el-col>
+                </el-row>
+              </el-collapse-item>
+
+              <el-collapse-item name="4">
+                <template slot="title">
+                  <p class="form-title">包装标识信息</p>
+                </template>
+                <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="productType==0"
+                          size="small"
+                          splaceholder="请输入内容"
+                          v-model="editQuery.sjcpbm"
+                      ></el-input>
+                    </div>
+                  </el-col>
+
+                  <el-col :span="12" class="el-col">
+                    <div class="text item">
+                      <div class="itemTag">
+                        <span>包装级别:&nbsp;</span>
+                      </div>
+                      <el-input
+                          style="width: 65%"
+                          size="small"
+                          splaceholder="请输入内容"
+                          :disabled="productType==0"
+                          v-model="editQuery.packLevel"
+                      ></el-input>
+                    </div>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="20" class="el-row" type="flex">
+                  <el-col :span="12" class="el-col">
+                    <div class="text item">
+                      <div class="itemTag">
+                        <span>包装单位/包装级别:&nbsp;</span>
+                      </div>
+
+                      <el-input
+                          style="width: 65%"
+                          size="small"
+                          splaceholder="请输入内容"
+                          v-model="editQuery.bzcj"
+                          :disabled="productType==0"
+                      ></el-input>
+                    </div>
+                  </el-col>
+
+                  <el-col :span="12" class="el-col">
+                    <div class="text item">
+                      <div class="itemTag">
+                        <span>包含下级包装数量:&nbsp;</span>
+                      </div>
+                      <el-input
+                          style="width: 65%"
+                          size="small"
+                          splaceholder="请输入内容"
+                          :disabled="productType==0"
+                          v-model="editQuery.bhxjsl"
+                      ></el-input>
+                    </div>
+                  </el-col>
+                </el-row>
+              </el-collapse-item>
+
+              <el-collapse-item name="5">
+                <template slot="title">
+                  <p class="form-title">版本信息</p>
+                </template>
+
+                <el-row :gutter="20" class="el-row" type="flex">
+
+                  <el-col :span="8" class="el-col">
+                    <div class="text item">
+                      <div class="itemTag">
+                        <span>当前版本号:&nbsp;</span>
+                      </div>
+                      <el-input
+                          style="width: 35%"
+                          :disabled="true"
+                          size="small"
+                          splaceholder="请输入内容"
+                          v-model="editQuery.versionNumber"
+                      ></el-input>
+                    </div>
+                  </el-col>
+                  <el-col :span="2" class="el-col">
+                    <el-button type="text" size="small" @click.native.stop="selectVersion()"
+                               style="margin-left: 5%"
+                    >切换版本
                     </el-button>
-                    <el-button type="primary" size="small" icon="search" @click="cancelDialog"
-                    >取消
+                  </el-col>
+                  <el-col :span="2" class="el-col">
+                    <el-button type="text" size="small" @click.native.stop="updateVersion()"
+                               :loading="updateLoading"
+                               style="margin-left: 5%"
+                    >更新当前版本信息
                     </el-button>
-                </div>
-            </el-dialog>
-            <el-dialog
-                title="关联添加器械信息"
-                :visible.sync="selectUdiDialogVisible"
-                :close-on-click-modal="false"
-                :close-on-press-escape="false"
-                width="85%"
-                v-if="selectUdiDialogVisible"
-            >
-                <selectUdi @closeUdi="closeUdi" :isImportUdi="isImportUdi"></selectUdi>
-            </el-dialog>
-            <el-dialog
-                title="从指定系统添加器械字典"
-                :visible.sync="selectErpDialogVisible"
-                :close-on-click-modal="false"
-                :close-on-press-escape="false"
-                width="85%"
-                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="添加DI器械信息"
-                :visible.sync="selectLocalVisible"
-                :close-on-click-modal="false"
-                :close-on-press-escape="false"
-                width="85%"
-                v-if="selectLocalVisible"
-            >
-                <selectLocalUdi
-                    :closeDialog="closeDialog"
-                    :relId="relId"
-                    :isImportUdi="isImportUdi"
-                    :data="thisData"
-                    @closeUdi="closeUdi"
-                ></selectLocalUdi>
-            </el-dialog>
-
-
-            <el-dialog
-                title="选择DI版本"
-                :visible.sync="selectVersionVisible"
-                :close-on-click-modal="false"
-                :close-on-press-escape="false"
-                width="85%"
-                v-if="selectVersionVisible"
-            >
-                <selectUdiVersion
-                    :closeDialog="closeDialog"
-                    :relId="relId"
-                    :uuid="uuid"
-                    :originUuid="originUuid"
-                    @closeUdi="closeUdi"
-                ></selectUdiVersion>
-            </el-dialog>
-            <el-pagination
-                :page-size="filterQuery.limit"
-                @current-change="handleCurrentChange"
-                layout="prev, pager, next"
-                :total="total"
-                :current-page="filterQuery.page"
-            ></el-pagination>
+                  </el-col>
+                </el-row>
+
+              </el-collapse-item>
+            </el-collapse>
+          </el-form>
         </el-card>
-    </div>
+
+
+        <div style="text-align: center;margin-top: 10px">
+          <el-button type="primary" size="small" icon="search" @click="onAddSubmit"
+          >提交
+          </el-button>
+          <el-button type="primary" size="small" icon="search" @click="cancelDialog"
+          >取消
+          </el-button>
+        </div>
+      </el-dialog>
+      <el-dialog
+          title="关联添加器械信息"
+          :visible.sync="selectUdiDialogVisible"
+          :close-on-click-modal="false"
+          :close-on-press-escape="false"
+          width="85%"
+          v-if="selectUdiDialogVisible"
+      >
+        <selectUdi @closeUdi="closeUdi" :isImportUdi="isImportUdi"></selectUdi>
+      </el-dialog>
+      <el-dialog
+          title="从指定系统添加器械字典"
+          :visible.sync="selectErpDialogVisible"
+          :close-on-click-modal="false"
+          :close-on-press-escape="false"
+          width="85%"
+          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="添加DI器械信息"
+          :visible.sync="selectLocalVisible"
+          :close-on-click-modal="false"
+          :close-on-press-escape="false"
+          width="85%"
+          v-if="selectLocalVisible"
+      >
+        <selectLocalUdi
+            :closeDialog="closeDialog"
+            :relId="relId"
+            :isImportUdi="isImportUdi"
+            :data="thisData"
+            @closeUdi="closeUdi"
+        ></selectLocalUdi>
+      </el-dialog>
+
+
+      <el-dialog
+          title="选择DI版本"
+          :visible.sync="selectVersionVisible"
+          :close-on-click-modal="false"
+          :close-on-press-escape="false"
+          width="85%"
+          v-if="selectVersionVisible"
+      >
+        <selectUdiVersion
+            :closeDialog="closeDialog"
+            :relId="relId"
+            :uuid="uuid"
+            :originUuid="originUuid"
+            @closeUdi="closeUdi"
+        ></selectUdiVersion>
+      </el-dialog>
+      <el-pagination
+          :page-size="filterQuery.limit"
+          @current-change="handleCurrentChange"
+          layout="prev, pager, next"
+          :total="total"
+          :current-page="filterQuery.page"
+      ></el-pagination>
+    </el-card>
+  </div>
 </template>
 
 <script>
 import {
-    getUdiInfos,
-    deletetUdiInfos,
-    updatetUdiInfos,
-    updateErpProduct,
-    uploadSmp,
-    thirdSysDetail,
-    removeRl, sysFilter, spcombie, lockStatus, removeDiRl, disableUdi
+  getUdiInfos,
+  deletetUdiInfos,
+  updatetUdiInfos,
+  updateErpProduct,
+  uploadSmp,
+  thirdSysDetail,
+  removeRl, sysFilter, spcombie, lockStatus, removeDiRl, disableUdi
 } from "../../api/basic/udiRelevance";
 import {selectSysParamByKey, finProductSet} from "../../api/param/systemParamConfig";
 import {dlLastVersionByDi, filterByUuid} from "../../api/basic/udiInfo";
@@ -1011,637 +1032,650 @@ import selectUdiVersion from "./UdiinfoSelectVersion";
 import {findConfig} from "@/api/thrsys/spsSyncStatus";
 
 export default {
-    data() {
-        return {
-            filterQuery: {
-                lockStatus: null,
-                unionCode: null,
-                udiCode: null,
-                ylqxzcrbarmc: "",
-                cpmctymc: "",
-                nameCode: "",
-                ggxh: null,
-                page: 1,
-                limit: 20,
-                addType: 1,
-                thrPiId: null,
-                filterType: null,
-            },
-            productType: null,
-            editQuery: null,
-            productRemarkSet: {},
-            relevanceEdit: {
-                id: null,
-                thirdId: "",
-                isDisable: null,
-                isUseDy: false,
-                isLock: null,
-                isAdavence: null,
-                allowNoBatch: null,
-                allowNoExpire: null,
-                allowNoProduct: null,
-                cpdls: null,
-                pId: null,
-            },
-            pId: 0,
-            defaultSys: null,
-            isImport: false,
-            isImportUdi: false,
-            isUploadSmp: false,
-            isSpCombine: false,
-            isImportFile: false,
-            uploadFileUrl: null,
-            checked: false,
-            list: [],
-            detailList: [],
-            sysList: [],
-            filterList: [],
-            total: 0,
-            thirdNo: "",
-            uuid: "111",
-            originUuid: null,
-            thirdId: null,
-            relId: "",
-            thisData: {
-                nameCode: null,
-                cpmctymc: null,
-                ggxh: null
-            },
-            multipleSelection: [],
-            editDialogVisible: false,       //详情
-            selectUdiDialogVisible: false,  //关联选入
-            selectErpDialogVisible: false,  //选入ERP产品
-            selectVersionVisible: false,
-            selectLocalVisible: false,      //关联UDI
-            isUseDyCheck: false,
-            lockStatusMap: {1: "未提交", 2: "已提交", 3: "已锁定"},
-            configParms: {},
-            activeNames: ['1'],
-            updateLoading: false,
-        };
+  data() {
+    return {
+      filterQuery: {
+        lockStatus: null,
+        unionCode: null,
+        udiCode: null,
+        ylqxzcrbarmc: "",
+        cpmctymc: "",
+        nameCode: "",
+        ggxh: null,
+        page: 1,
+        limit: 20,
+        addType: 1,
+        thrPiId: null,
+        filterType: null,
+      },
+      productType: null,
+      editQuery: null,
+      productRemarkSet: {},
+      relevanceEdit: {
+        id: null,
+        thirdId: "",
+        isDisable: null,
+        isUseDy: false,
+        isLock: null,
+        isAdavence: null,
+        allowNoBatch: null,
+        allowNoExpire: null,
+        allowNoProduct: null,
+        cpdls: null,
+        pId: null,
+      },
+      pId: 0,
+      defaultSys: null,
+      isImport: false,
+      isImportUdi: false,
+      isUploadSmp: false,
+      isSpCombine: false,
+      isImportFile: false,
+      uploadFileUrl: null,
+      checked: false,
+      list: [],
+      detailList: [],
+      sysList: [],
+      filterList: [],
+      total: 0,
+      thirdNo: "",
+      uuid: "111",
+      originUuid: null,
+      thirdId: null,
+      relId: "",
+      thisData: {
+        nameCode: null,
+        cpmctymc: null,
+        ggxh: null
+      },
+      multipleSelection: [],
+      editDialogVisible: false,       //详情
+      selectUdiDialogVisible: false,  //关联选入
+      selectErpDialogVisible: false,  //选入ERP产品
+      selectVersionVisible: false,
+      selectLocalVisible: false,      //关联UDI
+      isUseDyCheck: false,
+      lockStatusMap: {1: "未提交", 2: "已提交", 3: "已锁定"},
+      configParms: {},
+      activeNames: ['1'],
+      updateLoading: false,
+      enableMap: {
+        true: "是",
+        false: "否",
+      },
+    };
+  },
+
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        lockStatus: null,
+        unionCode: null,
+        udiCode: null,
+        ylqxzcrbarmc: "",
+        cpmctymc: "", thrPiId: null,
+        nameCode: "",
+        ggxh: null,
+        page: 1,
+        limit: 20,
+        addType: 1,
+      };
+      this.getList();
     },
+    submit() {
+      this.loading = true;
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    getList() {
+
+      getUdiInfos(this.filterQuery)
+          .then((response) => {
+            this.loading = false;
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          })
+          .catch(() => {
+            this.loading = false;
+            this.list = [];
+            this.total = 0;
+          });
+    },
+    diableChange() {
+      let query = {
+        relId: this.editQuery.id
+      }
+      disableUdi(query)
+          .then((response) => {
+            if (response.code != 20000) {
+              this.editQuery.isDisable = false;
+              this.$message.error(response.message);
+            }
 
-    methods: {
-        onReset() {
-            this.$router.push({
-                path: "",
-            });
-            this.filterQuery = {
-                lockStatus: null,
-                unionCode: null,
-                udiCode: null,
-                ylqxzcrbarmc: "",
-                cpmctymc: "", thrPiId: null,
-                nameCode: "",
-                ggxh: null,
-                page: 1,
-                limit: 20,
-                addType: 1,
-            };
-            this.getList();
-        },
-        submit() {
-            this.loading = true;
-            this.filterQuery.page = 1;
-            this.getList();
-        },
-        getList() {
+          })
+          .catch(() => {
+            this.loading = false;
+            this.detailList = [];
+          });
+    },
 
-            getUdiInfos(this.filterQuery)
-                .then((response) => {
-                    this.loading = false;
-                    this.list = response.data.list || [];
-                    this.total = response.data.total || 0;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                    this.total = 0;
-                });
-        },
-        diableChange() {
-            let query = {
-                relId: this.editQuery.id
-            }
-            disableUdi(query)
-                .then((response) => {
-                    if (response.code != 20000) {
-                        this.editQuery.isDisable = false;
-                        this.$message.error(response.message);
-                    }
+    groupBuyChange() {
+      if (this.editQuery.groupBuy == true) {
+        this.editQuery.dispatch = true;
+      } else {
+        this.editQuery.dispatch = false;
+      }
+    },
 
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.detailList = [];
-                });
-        },
-        keyup_submit(event) {
-            this.filterQuery.page = 1;
-            this.getList();
-            event.target.select();
-        },
-        getDetailList(detailQuery) {
-            this.loading = true;
-            filterByUuid(detailQuery)
-                .then((response) => {
-                    this.isUseDyCheck = false;
-                    this.loading = false;
-                    this.detailList = response.data || [];
-                    this.detailList.forEach((item, index, array) => {
-                        if (item.zxxsbzbhsydysl > 1) {
-                            this.isUseDyCheck = true;
-                        }
-                    });
-                    this.productType = this.detailList[0].productType;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.detailList = [];
-                });
-        },
-
-        handleDetail(row) {
-            let rlId = this.editQuery.rlId;
-            this.editQuery = row;
-            this.editQuery.rlId = rlId;
-        },
-
-
-        selectVersion() {
-            this.selectVersionVisible = true;
-            this.uuid = this.editQuery.uuid;
-            this.originUuid = this.editQuery.originUuid;
-            this.relId = this.editQuery.id;
-        },
-
-        updateVersion() {
-            this.$confirm("此操作将访问国家库查询最新版本信息, 是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            })
-                .then(() => {
-                    this.updateLoading = true;
-                    let query = {nameCode: this.editQuery.nameCode};
-                    dlLastVersionByDi(query)
-                        .then((response) => {
-                            this.updateLoading = false;
-                            if (response.code == 20000) {
-                                this.$message.success("更新成功！");
-                                this.closeDialog();
-                            } else {
-                                this.$message.error(response.message);
-                            }
-                        })
-                        .catch(() => {
-                            this.updateLoading = false;
-                            this.udidlList = [];
-                            this.total = 0;
-                        });
-                })
-                .catch(() => {
-                });
+    keyup_submit(event) {
+      this.filterQuery.page = 1;
+      this.getList();
+      event.target.select();
+    },
+    getDetailList(detailQuery) {
+      this.loading = true;
+      filterByUuid(detailQuery)
+          .then((response) => {
+            this.isUseDyCheck = false;
+            this.loading = false;
+            this.detailList = response.data || [];
+            this.detailList.forEach((item, index, array) => {
+              if (item.zxxsbzbhsydysl > 1) {
+                this.isUseDyCheck = true;
+              }
+            });
+            this.productType = this.detailList[0].productType;
+          })
+          .catch(() => {
+            this.loading = false;
+            this.detailList = [];
+          });
+    },
+
+    handleDetail(row) {
+      let rlId = this.editQuery.rlId;
+      this.editQuery = row;
+      this.editQuery.rlId = rlId;
+    },
 
-        },
 
-        deleteOrders(data) {
-            this.loading = true;
-            let tquery = {
-                id: data.id + "",
-            };
+    selectVersion() {
+      this.selectVersionVisible = true;
+      this.uuid = this.editQuery.uuid;
+      this.originUuid = this.editQuery.originUuid;
+      this.relId = this.editQuery.id;
+    },
 
-            deletetUdiInfos(tquery)
+    updateVersion() {
+      this.$confirm("此操作将访问国家库查询最新版本信息, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+          .then(() => {
+            this.updateLoading = true;
+            let query = {nameCode: this.editQuery.nameCode};
+            dlLastVersionByDi(query)
                 .then((response) => {
-                    if (response.code == 20000) {
-                        this.getList();
-                        this.$message({
-                            type: "success",
-                            message: "删除成功！",
-                        });
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                })
-                .catch(() => {
-                });
-        },
-
-        deleteDialog(rowId) {
-            this.$confirm("此操作将永久删除该产品信息, 是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            })
-                .then(() => {
-                    this.deleteOrders(rowId);
-                })
-                .catch(() => {
-                });
-        },
-
-        intentDetail() {
-            this.isImportUdi = false;
-            this.selectUdiDialogVisible = true;
-        },
-        addSelectErp(row) {
-            this.defaultSys = row.sysId;
-            this.isImport = false;
-            this.selectErpDialogVisible = true;
-        },
-
-        removeErp(row) {
-            this.$confirm("此操作将解除该绑定产品信息, 是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            })
-                .then(() => {
-                    let query = {
-                        relId: this.editQuery.id,
-                        thirdSys: row.sysId
-                    };
-                    removeRl(query)
-                        .then((response) => {
-                            if (response.code == 20000) {
-
-
-                                this.$message({
-                                    type: "success",
-                                    message: "删除成功！",
-                                });
-                                this.getList();
-                                this.cancelDialog();
-                                this.getThirdSysDetail()();
-                            } else {
-                                this.$message.error(response.message);
-                            }
-                        })
-                        .catch(() => {
-                        });
+                  this.updateLoading = false;
+                  if (response.code == 20000) {
+                    this.$message.success("更新成功！");
+                    this.closeDialog();
+                  } else {
+                    this.$message.error(response.message);
+                  }
                 })
                 .catch(() => {
+                  this.updateLoading = false;
+                  this.udidlList = [];
+                  this.total = 0;
                 });
-        },
-
-
-        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.getList();
-                                this.cancelDialog();
-                            } else {
-                                this.$message.error(response.message);
-                            }
-                        })
-                        .catch(() => {
-                        });
-                })
-                .catch(() => {
-                });
-        },
-
-        intentSelectErp(val) {
-            this.uuid = val.uuid;
-            this.relId = val.id;
-            this.isImport = false;
-            this.thisData = val;
-            this.selectErpDialogVisible = true;
-        },
-
-        intentImportErp(val) {
-            this.defaultSys = null;
-            this.uuid = val.uuid;
-            this.relId = val.id;
-            this.isImport = true;
-            this.thisData = val;
-            this.selectErpDialogVisible = true;
-        },
-        uploadSMP() {
-            var selectData = this.multipleSelection;
-            var keys = [];
-            selectData.forEach((obj) => {
-                keys.push(obj.id);
-            });
-            var tquery = {
-                keys: keys,
-            };
-            uploadSmp(tquery)
-                .then((response) => {
-                    if (response.code == 20000) {
-                        this.$message({
-                            type: "success",
-                            message: "上传成功！",
-                        });
-                    } else {
-                        this.$message({
-                            type: "error",
-                            message: response.message,
-                        });
-                    }
-                })
-                .catch(() => {
-                    this.$message({
-                        type: "error",
-                        message: "上传失败",
-                    });
-                });
-        },
-        intentSelectUdi(val) {
-            this.relId = val.id;
-            this.isImportUdi = true;
-            this.thisData = val;
-            this.selectLocalVisible = true;
-        },
-
-
-        intentImportUdi() {
-            this.relId = null;
-            this.selectLocalVisible = true;
-        },
-
-
-        handleSelectionChange(val) {
-            this.multipleSelection = val;
-        },
-
-        cancelDialog() {
-            this.editDialogVisible = false;
-        },
-        handleCurrentChange(val) {
-            this.filterQuery.page = val;
-            this.getList();
-        },
-        handleModifyClick(row) {
-            this.uuid = row.uuid;
-            this.relId = row.id;
-            this.isImport = false;
-            this.thisData = row;
-            this.editDialogVisible = true;
-            this.editQuery = row;
-            this.pId = row.id;
-            this.relevanceEdit = {
-                id: row.id,
-                isUseDy: row.isUseDy,
-                isDisable: row.isDisable,
-                isLock: row.isLock,
-                isAdavence: row.isAdavence,
-            };
-            this.checked = row.isUseDy == 1;
-
-            let ttquery = {
-                relId: this.relId,
-                uuid: row.uuid,
-                page: 1,
-                limit: 10,
-            };
-            this.getDetailList(ttquery);
-            this.getThirdSysDetail();
-        },
+          })
+          .catch(() => {
+          });
 
+    },
 
-        lockProducts(status) {
-            let selectData = this.multipleSelection;
-            let postQuery = {
-                ids: [],
-                lockStatus: status,
+    deleteOrders(data) {
+      this.loading = true;
+      let tquery = {
+        id: data.id + "",
+      };
+
+      deletetUdiInfos(tquery)
+          .then((response) => {
+            if (response.code == 20000) {
+              this.getList();
+              this.$message({
+                type: "success",
+                message: "删除成功！",
+              });
+            } else {
+              this.$message.error(response.message);
             }
-            selectData.forEach((row) => {
-                postQuery.ids.push(row.id);
-            });
-            lockStatus(postQuery)
-                .then((response) => {
-                    if (response.code == 20000) {
-                        this.loading = false;
-                        this.$message.success(response.data);
-                        this.getList();
-                    } else {
-                        this.$message.error(response.message);
-                    }
+          })
+          .catch(() => {
+          });
+    },
 
-                })
-                .catch(() => {
-                    this.loading = false;
-                });
-        },
-        closeUdi(val) {
-            this.selectUdiDialogVisible = false;
-            this.selectErpDialogVisible = false;
-            this.selectLocalVisible = false;
-            this.selectVersionVisible = false;
-            this.getThirdSysDetail();
-            if (val) {
-                this.getList();
-                this.cancelDialog();
-            }
-        },
-        getThirdSysDetail() {
+    deleteDialog(rowId) {
+      this.$confirm("此操作将永久删除该产品信息, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+          .then(() => {
+            this.deleteOrders(rowId);
+          })
+          .catch(() => {
+          });
+    },
+
+    intentDetail() {
+      this.isImportUdi = false;
+      this.selectUdiDialogVisible = true;
+    },
+    addSelectErp(row) {
+      this.defaultSys = row.sysId;
+      this.isImport = false;
+      this.selectErpDialogVisible = true;
+    },
+
+    removeErp(row) {
+      this.$confirm("此操作将解除该绑定产品信息, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+          .then(() => {
             let query = {
-                id: this.relevanceEdit.id,
+              relId: this.editQuery.id,
+              thirdSys: row.sysId
             };
-
-            thirdSysDetail(query)
+            removeRl(query)
                 .then((response) => {
-                    this.loading = false;
-                    this.sysList = response.data.list || [];
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.sysList = [];
-                });
-        },
-        getSysFilter() {
-            sysFilter()
-                .then((response) => {
-                    this.loading = false;
-                    this.filterList = response.data.list || [];
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.filterList = [];
-                });
+                  if (response.code == 20000) {
 
-        },
 
-        uploadErpProduct() {
-            updateErpProduct()
-                .then((response) => {
-                    if (response.code == 20000) {
-                        this.$message({
-                            type: "success",
-                            message: response.data,
-                        });
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                })
-                .catch(() => {
-                });
-        },
-
-        closeDialog() {
-            this.selectErpDialogVisible = false;
-            this.selectLocalVisible = false;
-            this.selectVersionVisible = false;
-        },
-        onAddSubmit() {
-            this.relevanceEdit.isDisable = this.editQuery.isDisable;
-            this.relevanceEdit.isLock = this.editQuery.isLock;
-            this.relevanceEdit.isAdavence = this.editQuery.isAdavence;
-            this.relevanceEdit = this.editQuery;
-            this.relevanceEdit.pid = this.pId;
-            if (this.checked == true) {
-                this.relevanceEdit.isUseDy = 1;
-            } else {
-                this.relevanceEdit.isUseDy = 0;
-            }
-            updatetUdiInfos(this.relevanceEdit)
-                .then((response) => {
-                    this.loading = false;
+                    this.$message({
+                      type: "success",
+                      message: "删除成功！",
+                    });
                     this.getList();
                     this.cancelDialog();
+                    this.getThirdSysDetail()();
+                  } else {
+                    this.$message.error(response.message);
+                  }
                 })
                 .catch(() => {
-                    this.loading = false;
-                    this.cancelDialog();
                 });
-        },
-        getSyncConfig() {
-            findConfig()
+          })
+          .catch(() => {
+          });
+    },
+
+
+    removeDi() {
+      this.$confirm("此操作将解除该绑定DI器械信息, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+          .then(() => {
+            let query = {
+              relId: this.editQuery.id,
+            };
+            removeDiRl(query)
                 .then((response) => {
-                    if (response.code == 20000) {
-                        this.configParms = response.data;
-                    }
+                  if (response.code == 20000) {
+                    this.$message({
+                      type: "success",
+                      message: "删除成功！",
+                    });
+                    this.getList();
+                    this.cancelDialog();
+                  } else {
+                    this.$message.error(response.message);
+                  }
                 })
                 .catch(() => {
                 });
-        },
+          })
+          .catch(() => {
+          });
+    },
 
-        findBasicProductSet() {
-            finProductSet().then((response) => {
-                if (response.code == 20000) {
+    intentSelectErp(val) {
+      this.uuid = val.uuid;
+      this.relId = val.id;
+      this.isImport = false;
+      this.thisData = val;
+      this.selectErpDialogVisible = true;
+    },
 
-                    this.productRemarkSet = response.data;
-                } else {
-                    //出错了
-                }
+    intentImportErp(val) {
+      this.defaultSys = null;
+      this.uuid = val.uuid;
+      this.relId = val.id;
+      this.isImport = true;
+      this.thisData = val;
+      this.selectErpDialogVisible = true;
+    },
+    uploadSMP() {
+      var selectData = this.multipleSelection;
+      var keys = [];
+      selectData.forEach((obj) => {
+        keys.push(obj.id);
+      });
+      var tquery = {
+        keys: keys,
+      };
+      uploadSmp(tquery)
+          .then((response) => {
+            if (response.code == 20000) {
+              this.$message({
+                type: "success",
+                message: "上传成功！",
+              });
+            } else {
+              this.$message({
+                type: "error",
+                message: response.message,
+              });
+            }
+          })
+          .catch(() => {
+            this.$message({
+              type: "error",
+              message: "上传失败",
             });
-        },
+          });
+    },
+    intentSelectUdi(val) {
+      this.relId = val.id;
+      this.isImportUdi = true;
+      this.thisData = val;
+      this.selectLocalVisible = true;
+    },
 
 
-        selectSysParam() {
-            let query = {
-                paramKey: "smp_isUploadProuct",
-            };
+    intentImportUdi() {
+      this.relId = null;
+      this.selectLocalVisible = true;
+    },
 
-            spcombie().then((response) => {
-                if (response.code == 20000) {
-                    if (response.data.paramValue == "1") {
-                        this.isSpCombine = true;
-                    } else {
-                        this.isSpCombine = false;
-                    }
-                }
-            });
 
-            selectSysParamByKey(query).then((response) => {
-                if (response.code == 20000) {
-                    if (response.data.paramValue == "1") {
-                        this.isUploadSmp = true;
-                    } else {
-                        this.isUploadSmp = false;
-                    }
-                }
-            });
-            let query1 = {
-                paramKey: "upload_pi_file_enabled",
-            };
-            selectSysParamByKey(query1).then((response) => {
-                if (response.code == 20000) {
-                    if (response.data.paramValue == "1") {
-                        this.isImportFile = true;
-                    }
-                }
-            });
-            let query2 = {
-                paramKey: "upload_pi_file_url",
-            };
-            selectSysParamByKey(query2).then((response) => {
-                if (response.code == 20000) {
-                    this.uploadFileUrl = response.data.paramValue;
-                }
-            });
-        },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
 
+    cancelDialog() {
+      this.editDialogVisible = false;
     },
-    mounted() {
+    handleCurrentChange(val) {
+      this.filterQuery.page = val;
+      this.getList();
     },
-    components: {
-        selectUdi,
-        selectErp,
-        selectLocalUdi,
-        selectUdiVersion,
+    handleModifyClick(row) {
+      this.uuid = row.uuid;
+      this.relId = row.id;
+      this.isImport = false;
+      this.thisData = row;
+      this.editDialogVisible = true;
+      this.editQuery = row;
+      this.pId = row.id;
+      this.relevanceEdit = {
+        id: row.id,
+        isUseDy: row.isUseDy,
+        isDisable: row.isDisable,
+        isLock: row.isLock,
+        isAdavence: row.isAdavence,
+      };
+      this.checked = row.isUseDy == 1;
+
+      let ttquery = {
+        relId: this.relId,
+        uuid: row.uuid,
+        page: 1,
+        limit: 10,
+      };
+      this.getDetailList(ttquery);
+      this.getThirdSysDetail();
     },
-    created() {
 
-        this.findBasicProductSet();
+
+    lockProducts(status) {
+      let selectData = this.multipleSelection;
+      let postQuery = {
+        ids: [],
+        lockStatus: status,
+      }
+      selectData.forEach((row) => {
+        postQuery.ids.push(row.id);
+      });
+      lockStatus(postQuery)
+          .then((response) => {
+            if (response.code == 20000) {
+              this.loading = false;
+              this.$message.success(response.data);
+              this.getList();
+            } else {
+              this.$message.error(response.message);
+            }
+
+          })
+          .catch(() => {
+            this.loading = false;
+          });
+    },
+    closeUdi(val) {
+      this.selectUdiDialogVisible = false;
+      this.selectErpDialogVisible = false;
+      this.selectLocalVisible = false;
+      this.selectVersionVisible = false;
+      this.getThirdSysDetail();
+      if (val) {
         this.getList();
-        this.selectSysParam();
-        this.getSysFilter();
-        this.getSyncConfig();
+        this.cancelDialog();
+      }
+    },
+    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 = [];
+          });
+    },
+    getSysFilter() {
+      sysFilter()
+          .then((response) => {
+            this.loading = false;
+            this.filterList = response.data.list || [];
+          })
+          .catch(() => {
+            this.loading = false;
+            this.filterList = [];
+          });
+
+    },
+
+    uploadErpProduct() {
+      updateErpProduct()
+          .then((response) => {
+            if (response.code == 20000) {
+              this.$message({
+                type: "success",
+                message: response.data,
+              });
+            } else {
+              this.$message.error(response.message);
+            }
+          })
+          .catch(() => {
+          });
     },
+
+    closeDialog() {
+      this.selectErpDialogVisible = false;
+      this.selectLocalVisible = false;
+      this.selectVersionVisible = false;
+    },
+    onAddSubmit() {
+      this.relevanceEdit.isDisable = this.editQuery.isDisable;
+      this.relevanceEdit.isLock = this.editQuery.isLock;
+      this.relevanceEdit.isAdavence = this.editQuery.isAdavence;
+      this.relevanceEdit = this.editQuery;
+      this.relevanceEdit.pid = this.pId;
+      if (this.checked == true) {
+        this.relevanceEdit.isUseDy = 1;
+      } else {
+        this.relevanceEdit.isUseDy = 0;
+      }
+      updatetUdiInfos(this.relevanceEdit)
+          .then((response) => {
+            this.loading = false;
+            this.getList();
+            this.cancelDialog();
+          })
+          .catch(() => {
+            this.loading = false;
+            this.cancelDialog();
+          });
+    },
+    getSyncConfig() {
+      findConfig()
+          .then((response) => {
+            if (response.code == 20000) {
+              this.configParms = response.data;
+            }
+          })
+          .catch(() => {
+          });
+    },
+
+    findBasicProductSet() {
+      finProductSet().then((response) => {
+        if (response.code == 20000) {
+
+          this.productRemarkSet = response.data;
+        } else {
+          //出错了
+        }
+      });
+    },
+
+
+    selectSysParam() {
+      let query = {
+        paramKey: "smp_isUploadProuct",
+      };
+
+      spcombie().then((response) => {
+        if (response.code == 20000) {
+          if (response.data.paramValue == "1") {
+            this.isSpCombine = true;
+          } else {
+            this.isSpCombine = false;
+          }
+        }
+      });
+
+      selectSysParamByKey(query).then((response) => {
+        if (response.code == 20000) {
+          if (response.data.paramValue == "1") {
+            this.isUploadSmp = true;
+          } else {
+            this.isUploadSmp = false;
+          }
+        }
+      });
+      let query1 = {
+        paramKey: "upload_pi_file_enabled",
+      };
+      selectSysParamByKey(query1).then((response) => {
+        if (response.code == 20000) {
+          if (response.data.paramValue == "1") {
+            this.isImportFile = true;
+          }
+        }
+      });
+      let query2 = {
+        paramKey: "upload_pi_file_url",
+      };
+      selectSysParamByKey(query2).then((response) => {
+        if (response.code == 20000) {
+          this.uploadFileUrl = response.data.paramValue;
+        }
+      });
+    },
+
+  },
+  mounted() {
+  },
+  components: {
+    selectUdi,
+    selectErp,
+    selectLocalUdi,
+    selectUdiVersion,
+  },
+  created() {
+
+    this.findBasicProductSet();
+    this.getList();
+    this.selectSysParam();
+    this.getSysFilter();
+    this.getSyncConfig();
+  },
 };
 </script>
 <style scoped>
 .itemTag {
-    float: left;
-    text-align: left;
-    margin-top: 10px;
-    width: 25%;
+  float: left;
+  text-align: left;
+  margin-top: 10px;
+  width: 25%;
 }
 
 .text {
-    font-size: 13px;
-    font-family: "Microsoft YaHei";
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
 }
 
 .query-form-item {
-    display: block !important;
-    margin-right: 10px;
-    margin-bottom: 5px;
+  display: block !important;
+  margin-right: 10px;
+  margin-bottom: 5px;
 }
 
 .el-row {
-    display: flex;
-    flex-wrap: wrap;
-    margin-bottom: 6px;
+  display: flex;
+  flex-wrap: wrap;
+  margin-bottom: 6px;
 }
 
 .el-col {
-    border-radius: 4px;
-    flex-wrap: wrap;
+  border-radius: 4px;
+  flex-wrap: wrap;
 }
 
 .form-title {
-    font-size: 16px;
-    font-family: Noto Sans SC;
-    font-weight: bold;
-    color: #303133;
-    padding-bottom: 17px;
-    padding-top: 17px;
+  font-size: 16px;
+  font-family: Noto Sans SC;
+  font-weight: bold;
+  color: #303133;
+  padding-bottom: 17px;
+  padding-top: 17px;
 }
 </style>
diff --git a/src/views/basic/basicProductEdit.vue b/src/views/basic/basicProductEdit.vue
index 9e55508..0151c66 100644
--- a/src/views/basic/basicProductEdit.vue
+++ b/src/views/basic/basicProductEdit.vue
@@ -350,7 +350,6 @@
                     </el-col>
                 </el-row>
 
-
                 <el-divider></el-divider>
 
                 <el-collapse v-model="activeNames">
diff --git a/src/views/warehouse/IOWaitOrder.vue b/src/views/warehouse/IOWaitOrder.vue
index 94c7a4a..e436b78 100644
--- a/src/views/warehouse/IOWaitOrder.vue
+++ b/src/views/warehouse/IOWaitOrder.vue
@@ -151,6 +151,14 @@
                         </el-button
                         >
 
+<!--                        <el-button-->
+                        <!--                            type="text"-->
+                        <!--                            size="small"-->
+                        <!--                            @click.native.stop="rollBack(scope.row)"-->
+                        <!--                        >撤回-->
+                        <!--                        </el-button-->
+                        <!--                        >-->
+
 
                         <el-button
                             type="text"
@@ -218,7 +226,8 @@
                     label="生产日期"
                     prop="productDate"
                     :show-overflow-tooltip="true"
-                ><template slot-scope="scope">
+                >
+                    <template slot-scope="scope">
                         <span>{{ convertDateFun(scope.row.productDate) }}</span>
                     </template>
                 </el-table-column>
@@ -226,9 +235,11 @@
                     label="失效日期"
                     prop="expireDate"
                     :show-overflow-tooltip="true"
-                > <template slot-scope="scope">
-                    <span>{{ convertDateFun(scope.row.expireDate) }}</span>
-                </template></el-table-column>
+                >
+                    <template slot-scope="scope">
+                        <span>{{ convertDateFun(scope.row.expireDate) }}</span>
+                    </template>
+                </el-table-column>
                 <el-table-column
                     label="单据数量"
                     prop="erpCount"
@@ -376,7 +387,8 @@ import {getLocalJoinByUser} from "@/api/basic/busLocalType";
 import {filterSubByInv} from "@/api/basic/invSubWarehouse";
 import {isBlank} from "@/utils/strUtil";
 import {selectSysParamByKey} from "@/api/param/systemParamConfig";
-import {convertDate} from  "@/utils/date"
+import {convertDate} from "@/utils/date"
+import {rollbackOrder} from "@/api/warehouse/stockOrder";
 
 const formJson = {
     site_id: "",
@@ -394,7 +406,7 @@ export default {
 
     data() {
         return {
-            convertDateFun:convertDate,
+            convertDateFun: convertDate,
             query: {
                 page: 1,
                 limit: 10,
@@ -732,32 +744,49 @@ export default {
             // this.dialogTableVisible = true;
         },
         getUnitList() {
-            this.loading = true;
+            this.loading = true;                    this.loading = false;
+
             unitListBykey(this.unitquery)
                 .then((response) => {
-                    this.loading = false;
                     this.unitlist = response.data.list || [];
                 })
                 .catch(() => {
                     this.loading = false;
                 });
         },
-        intentDetail(row) {
-            // this.$router.push({
-            //   path: "../inout/detail",
-            //   query: { id: row.id },
-            // });
+        // rollBack(row) {
+        //     this.$confirm('此操作将撤回单据到草稿状态，需重新提交, 是否继续?', '提示', {
+        //         confirmButtonText: '确定',
+        //         cancelButtonText: '取消',
+        //         type: 'warning'
+        //     }).then(() => {
+        //         let param = {billNo: row.billNo};
+        //         rollbackOrder(param).then((res) => {
+        //             if (res.code === 20000) {
+        //                 this.$message.success("撤回成功");
+        //                 this.getList();
+        //             } else {
+        //                 this.$message.error(res.message);
+        //             }
+        //         })
+        //     }).catch(() => {
+        //         // this.$message.info('回退失败');
+        //     });
+        // },
 
+        intentDetail(row) {
             this.codeDetailVisible = true;
             this.idQuery.id = row.id;
-        },
+        }
+        ,
         successOrderExportPDFSetting(row) {
             this.idQuery.id = '';
             if (this.$isNotBlank(row.id)) {
                 this.idQuery.id = row.id;
             }
             this.successOrderExportPDFSettingVisible = true;
-        },
+        }
+        ,
         successOrderExportPDF(row) {
             let tQuery = {
                 orderId: row.id,
@@ -786,11 +815,13 @@ export default {
             }).catch(() => {
                 this.loading = false;
             });
-        },
+        }
+        ,
         closeDialog() {
             this.successOrderExportPDFSettingVisible = false;
             this.getList();
-        },
+        }
+        ,
 
         selectUnit(row) {
             this.unitUpdateQuery.id = this.curIndex;
@@ -804,7 +835,8 @@ export default {
                 .catch(() => {
                     this.dialogTableVisible = false;
                 });
-        },
+        }
+        ,
         deleteOrders(data) {
             this.loading = true;
             this.deleteData.id = data;
@@ -824,14 +856,16 @@ export default {
                 })
                 .catch(() => {
                 });
-        },
+        }
+        ,
         tableRowClassName({row, rowIndex}) {
             if (row.reCount === row.count) {
                 return "success-row";
             } else {
                 return "warning-row";
             }
-        },
+        }
+        ,
 
         exportDialog(value) {
             var mOrder = value;
@@ -880,7 +914,8 @@ export default {
                     .catch(() => {
                     });
             }
-        },
+        }
+        ,
 
 
         uploadOrderDialog(value) {
@@ -898,7 +933,8 @@ export default {
                 })
                 .catch(() => {
                 });
-        },
+        }
+        ,
 
         deleteDialog(rowId) {
             this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
@@ -911,10 +947,12 @@ export default {
                 })
                 .catch(() => {
                 });
-        },
+        }
+        ,
         closeDetailDialog(val) {
             this.codeDetailVisible = false;
-        },
+        }
+        ,
         closeManuDialog(val) {
             this.addDialogVisible = false;
             if (val) {
@@ -925,16 +963,19 @@ export default {
             } else {
                 this.$message.error("选入失败");
             }
-        },
+        }
+        ,
         cancelDialog() {
             this.addDialogVisible = false;
-        },
+        }
+        ,
         importOrder(row) {
             this.orderId = row.id;
             this.billAction = row.action;
             this.curLocInv = row.locStorageCode;
             this.addDialogVisible = true;
-        },
+        }
+        ,
         getBusType() {
             let query = {
                 code: this.filterQuery.invWarehouseCode,
@@ -948,14 +989,16 @@ export default {
                 })
                 .catch(() => {
                 });
-        },
+        }
+        ,
         getActionName(action) {
             for (let i = 0; i < this.busTypes.length; i++) {
                 if (this.busTypes[i].action === action) {
                     return this.busTypes[i].name;
                 }
             }
-        },
+        }
+        ,
         getStorage() {
             this.storageList = [];
             filterAllByUser()
@@ -968,7 +1011,8 @@ export default {
                 })
                 .catch(() => {
                 });
-        },
+        }
+        ,
         invChange() {
             this.filterQuery.invWarehouseCode = "";
             this.subInvList = [];
@@ -985,7 +1029,8 @@ export default {
                     .catch(() => {
                     });
             }
-        },
+        }
+        ,
 
 
         getSubInvList() {
@@ -998,7 +1043,8 @@ export default {
                 })
                 .catch(() => {
                 });
-        },
+        }
+        ,
 
         subInvChange() {
             this.getBusType();
@@ -1011,14 +1057,17 @@ export default {
                 true: "danger",
             };
             return statusMap[status];
-        },
-    },
+        }
+        ,
+    }
+    ,
     mounted() {
         document.body.ondrop = function (event) {
             event.preventDefault();
             event.stopPropagation();
         };
-    },
+    }
+    ,
 
     created() {
         this.getStorage();
@@ -1038,8 +1087,10 @@ export default {
                 }
             }
         })
-    },
-};
+    }
+    ,
+}
+;
 </script>
 
 
diff --git a/src/views/warehouse/addHosOrder.vue b/src/views/warehouse/addHosOrder.vue
index 1bad363..2c84dd7 100644
--- a/src/views/warehouse/addHosOrder.vue
+++ b/src/views/warehouse/addHosOrder.vue
@@ -1101,7 +1101,7 @@ export default {
             }
         },
         actionChange(item) {
-           
+
             this.curAction = this.getActionItem(item);
             this.findMethod();