diff --git a/src/views/basic/product/drug/drugMaintain.vue b/src/views/basic/product/drug/drugMaintain.vue
index ef5a07d..b792dc7 100644
--- a/src/views/basic/product/drug/drugMaintain.vue
+++ b/src/views/basic/product/drug/drugMaintain.vue
@@ -338,7 +338,7 @@ export default {
         };
         deletetUdiInfos(tquery).then(res => {
           if (res.code != 20000) {
-            this.$message.error("删除错误")
+            this.$message.error(res.message)
             this.getList()
           } else {
             this.$message.success("删除成功！")
diff --git a/src/views/basic/product/udiInfoselectErpUdi.vue b/src/views/basic/product/udiInfoselectErpUdi.vue
index 47a1526..24ec748 100644
--- a/src/views/basic/product/udiInfoselectErpUdi.vue
+++ b/src/views/basic/product/udiInfoselectErpUdi.vue
@@ -273,7 +273,7 @@ export default {
         measname: null,
         page: 1,
         limit: 10,
-
+        productType:1
       },
       thisData: null,
       thrProductsDetailVisible: false,
diff --git a/src/views/supplier/companyDrug/basicCompanyDrugProducts.vue b/src/views/supplier/companyDrug/basicCompanyDrugProducts.vue
index 9b83b03..8e19773 100644
--- a/src/views/supplier/companyDrug/basicCompanyDrugProducts.vue
+++ b/src/views/supplier/companyDrug/basicCompanyDrugProducts.vue
@@ -360,13 +360,18 @@
         v-if="editDialogVisible"
         :before-close="refresh"
       >
+        <!--:productRemarkSet="productRemarkSet"-->
         <basicProductEdit
-          :productRemarkSet="productRemarkSet"
-          :editQuery="editQuery"
           :closeDialog="closeDialog"
+          :rowData="rowData"
           :type="type"
+          :relevanceEdit="relevanceEdit"
+          :uuid="uuid"
+          :relId="relId"
+          :thisData="thisData"
         >
         </basicProductEdit>
+
         <!--<selectDrugProductsEdit>-->
 
         <!--</selectDrugProductsEdit>-->
@@ -387,6 +392,7 @@
           :type="type"
         >
         </basicProductEdit>
+
         <!--<basicProductDetail-->
         <!--  :productRemarkSet="productRemarkSet"-->
         <!--  :editQuery="editQuery"-->
@@ -546,13 +552,19 @@ export default {
       addProductVisible: false,
       selectVersionVisible: false,
       editQuery: null,
+      rowData: null,
       productRemarkSet: {},
       relevanceEdit: {
         id: null,
         thirdId: "",
         isDisable: null,
         isUseDy: false,
+        isLock: null,
         isAdavence: null,
+        allowNoBatch: null,
+        allowNoExpire: null,
+        allowNoProduct: null,
+        allowNoSerial: null,
         pId: null,
       },
       pId: 0,
@@ -607,7 +619,7 @@ export default {
       isUseDyCheck: false,
       loading: false,
       activeNames: ['1'],
-      type: 2
+      type: null
     };
   },
 
@@ -941,6 +953,23 @@ export default {
         });
     },
     handleModifyClick(row) {
+      this.fromName = 'edit'
+
+      this.type = 2
+      this.uuid = row.uuid;
+      this.relId = row.rlId;
+      this.isImport = false;
+      this.thisData = row;
+      this.pId = row.rlId;
+      this.relevanceEdit = {
+        id: row.rlId,
+        isUseDy: row.isUseDy,
+        isDisable: row.isDisable,
+        isLock: row.isLock,
+        isAdavence: row.isAdavence,
+      };
+      this.editFormat = JSON.parse(JSON.stringify(row));
+      this.rowData = row
       this.editQuery = row;
       this.type = 1
       this.editDialogVisible = true;
diff --git a/src/views/supplier/companyDrug/basicCompanyProductsImport.vue b/src/views/supplier/companyDrug/basicCompanyProductsImport.vue
index 5dc20b9..e5568c3 100644
--- a/src/views/supplier/companyDrug/basicCompanyProductsImport.vue
+++ b/src/views/supplier/companyDrug/basicCompanyProductsImport.vue
@@ -4,8 +4,8 @@
       <el-form :model="filterQuery" label-width="120px" v-show="showSearch">
         <el-row>
           <el-col :span="6">
-            <el-form-item label="最小销售标识:">
-              <el-input v-model="filterQuery.unionCode" style="width: 90%" placeholder="最小销售标识"
+            <el-form-item label="药品编码:">
+              <el-input v-model="filterQuery.nameCode" style="width: 90%" placeholder="药品编码"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
@@ -16,27 +16,32 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="规格型号:">
-              <el-input v-model="filterQuery.ggxh" style="width: 90%" placeholder="规格型号" clearable="true"></el-input>
+            <el-form-item label="医保编码:">
+              <el-input v-model="filterQuery.ybbm" style="width: 90%" placeholder="医保编码" clearable="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="生产企业:">
-              <el-input v-model="filterQuery.ylqxzcrbarmc" style="width: 90%" placeholder="生产企业/注册备案人"
+            <el-form-item label="批准文号:">
+              <el-input v-model="filterQuery.zczbhhzbapzbh" style="width: 90%" placeholder="批准文号"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="6">
-            <el-form-item label="配送企业:">
-              <el-input v-model="filterQuery.supName" style="width: 90%" placeholder="配送企业" clearable="true"></el-input>
+            <el-form-item label="生产企业:">
+              <el-input v-model="filterQuery.manufactory" style="width: 90%" placeholder="生产企业" clearable="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="第三方编码:">
-              <el-input v-model="filterQuery.thrPiId" style="width: 90%" placeholder="第三方主系统编码"
-                        clearable="true"></el-input>
+            <el-form-item label="对照条件:" class="query-form-item">
+              <el-select v-model="filterQuery.filterType" style="width: 100%" placeholder="对照条件" clearable>
+                <el-option label="全部" :value="0"></el-option>
+                <el-option label="对照完成" :value="1"></el-option>
+                <el-option label="未对照产品编码" :value="2"></el-option>
+                <!--<el-option label="未对照" :value="3"></el-option>-->
+                <el-option label="未对照其他产品编码" :value="4"></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -59,17 +64,19 @@
                 :header-cell-class-name="cellClass" @current-change="handleSelectionChange">
         <el-table-column label width="45">
           <template slot-scope="scope">
-            <el-radio :label="scope.row.nameCode" v-model="radioCheck"><span></span></el-radio>
+            <el-radio :label="scope.row.mainId" v-model="radioCheck"><span></span></el-radio>
           </template>
         </el-table-column>
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="药品标识" prop="nameCode" width="140"></el-table-column>
         <el-table-column label="第三方主系统编码" prop="thirdId" show-overflow-tooltip width="140"></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="ggxh" show-overflow-tooltip></el-table-column>-->
         <el-table-column label="包装规格" prop="bzgg" show-overflow-tooltip></el-table-column>
         <el-table-column label="制剂规格" prop="prepnSpec" show-overflow-tooltip></el-table-column>
-        <el-table-column label="制剂单位" prop="prepnUnit" show-overflow-tooltip></el-table-column>
+        <el-table-column label="剂型" prop="prepnUnit" show-overflow-tooltip></el-table-column>
+        <el-table-column label="最小包装单位" prop="measname" show-overflow-tooltip width="120"></el-table-column>
+        <el-table-column label="包装材质" prop="packMatrial" show-overflow-tooltip width="120"></el-table-column>
         <el-table-column label="批准文号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
         <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
         <el-table-column width="120" label="操作">
@@ -141,7 +148,7 @@
             </el-col>
 
             <el-col :span="12" class="el-col">
-              <el-form-item label="制剂单位" prop="prepnUnit">
+              <el-form-item label="剂型" prop="prepnUnit">
                 <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容"
                           v-model="editQuery.prepnUnit"></el-input>
               </el-form-item>
@@ -353,6 +360,13 @@
           </el-col>
         </el-row>
         <el-row  type="flex" style="margin-top: 15px">
+          <el-col :span="11" class="el-col">
+            <el-form-item label="医保编码:" prop="ybbm">
+              <el-input style="width: 90%" size="small" placeholder="请输入内容"
+                        v-model.trim="repEditQuery.ybbm"
+              ></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="11" class="el-col">
             <el-form-item label="商品条码:" prop="cpmctymc">
               <el-input style="width: 90%" size="small" placeholder="请输入内容"
@@ -360,10 +374,27 @@
               ></el-input>
             </el-form-item>
           </el-col>
+
+        </el-row>
+        <el-row  type="flex">
+          <!--<el-col :span="11" class="el-col">-->
+          <!--  <el-form-item label="耗材材质:" prop="matrial">-->
+          <!--    <el-input style="width: 90%" size="small" placeholder="请输入内容"-->
+          <!--              v-model.trim="repEditQuery.matrial"-->
+          <!--    ></el-input>-->
+          <!--  </el-form-item>-->
+          <!--</el-col>-->
           <el-col :span="11" class="el-col">
-            <el-form-item label="医保编码:" prop="ybbm">
+            <el-form-item label="药品名称:" prop="cpmctymc">
               <el-input style="width: 90%" size="small" placeholder="请输入内容"
-                        v-model.trim="repEditQuery.ybbm"
+                        v-model.trim="repEditQuery.cpmctymc"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11" class="el-col">
+            <el-form-item label="包装规格:" prop="bzgg">
+              <el-input style="width: 90%" size="small" placeholder="请输入内容"
+                        v-model.trim="repEditQuery.bzgg"
               ></el-input>
             </el-form-item>
           </el-col>
@@ -377,23 +408,23 @@
           <!--  </el-form-item>-->
           <!--</el-col>-->
           <el-col :span="11" class="el-col">
-            <el-form-item label="药品价格:" prop="price">
+            <el-form-item label="包装材质:" prop="packMatrial">
               <el-input style="width: 90%" size="small" placeholder="请输入内容"
-                        v-model.trim="repEditQuery.price"
+                        v-model.trim="repEditQuery.packMatrial"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11" class="el-col">
-            <el-form-item label="规格型号:" prop="ggxh">
+            <el-form-item label="最小包装单位:" prop="measname">
               <el-input style="width: 90%" size="small" placeholder="请输入内容"
-                        v-model.trim="repEditQuery.ggxh"
+                        v-model.trim="repEditQuery.measname"
               ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row  type="flex">
           <el-col :span="11" class="el-col">
-            <el-form-item label="制剂单位:" prop="prepnUnit">
+            <el-form-item label="剂型:" prop="prepnUnit">
               <el-input style="width: 90%" size="small" placeholder="请输入内容"
                         v-model.trim="repEditQuery.prepnUnit"
               ></el-input>
@@ -425,9 +456,9 @@
         </el-row>
         <el-row  type="flex">
           <el-col :span="11" class="el-col">
-            <el-form-item label="商品名称:" prop="spmc">
+            <el-form-item label="批准文号:" prop="zczbhhzbapzbh">
               <el-input style="width: 90%" size="small" placeholder="请输入内容"
-                        v-model.trim="repEditQuery.spmc"
+                        v-model.trim="repEditQuery.zczbhhzbapzbh"
               ></el-input>
             </el-form-item>
           </el-col>
@@ -1022,7 +1053,7 @@ export default {
         });
     },
     handleSelectionChange(selection) {
-      this.radioCheck = selection.nameCode;
+      this.radioCheck = selection.mainId;
       this.curSelectDi = selection;
       if (selection.length > 1) {
         this.$refs.diList.clearSelection();
@@ -1041,8 +1072,12 @@ export default {
       this.repEditQuery.flbm = this.currentRow.flbm;
       this.repEditQuery.prepnUnit = this.currentRow.prepnUnit;
       this.repEditQuery.prepnSpec = this.currentRow.prepnSpec;
-      this.repEditQuery.ggxh = this.currentRow.ggxh;
+      this.repEditQuery.bzgg = this.currentRow.bzgg;
       this.repEditQuery.price = this.currentRow.price;
+      this.repEditQuery.cpmctymc = this.currentRow.cpmctymc;
+      this.repEditQuery.zczbhhzbapzbh = this.currentRow.zczbhhzbapzbh;
+      this.repEditQuery.packMatrial = this.currentRow.packMatrial;
+      this.repEditQuery.measname = this.currentRow.measname;
       this.getYbHcData()
       this.classifySearch()
       // if (isBlank(this.relevanceEdit.cpms)) {
@@ -1206,6 +1241,7 @@ export default {
     // }
     // if (this.editQuery.basicPrductRemak7 != null) {
     this.findThrTypeMethod(this.repEditQuery.basicPrductRemak7);
+    this.getList();
   },
  directives: {
   'debounce-input': {
diff --git a/src/views/supplier/companyDrug/basicCompanyproductEdit.vue b/src/views/supplier/companyDrug/basicCompanyproductEdit.vue
index 5f7ae9b..914fe20 100644
--- a/src/views/supplier/companyDrug/basicCompanyproductEdit.vue
+++ b/src/views/supplier/companyDrug/basicCompanyproductEdit.vue
@@ -1,149 +1,283 @@
 <template>
   <div>
+    <el-form :model="newProductData" :rules="formRules" label-width="140px" ref="dataForm">
 
-    <!--<el-card>-->
-    <!--  <el-table :data="sysList" style="width: 100%;   margin-bottom: 8px" key="2" border>-->
-    <!--    <el-table-column label="序号" type="index"></el-table-column>-->
-    <!--    <el-table-column label="第三方系统名称" prop="sysName" show-overflow-tooltip></el-table-column>-->
-    <!--    <el-table-column label="第三方系统物资编码" prop="thirdId" show-overflow-tooltip></el-table-column>-->
-    <!--    <el-table-column label="第三方系统物资名称" prop="thirdName" show-overflow-tooltip></el-table-column>-->
-    <!--    <el-table-column label="第三方系统规格型号" prop="spec" show-overflow-tooltip></el-table-column>-->
-    <!--    <el-table-column label="注册/备案号" prop="registerNo" show-overflow-tooltip></el-table-column>-->
-    <!--    <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>-->
-    <!--    <el-table-column label="操作">-->
-    <!--      <template slot-scope="scope">-->
-    <!--        <el-button type="text" @click="addSelectErp(scope.row)" :disabled="scope.row.thirdId==editQuery.nameCode || type == 2">-->
-    <!--          关联-->
-    <!--        </el-button>-->
-    <!--        <el-button type="text" @click.native.stop="removeErp(scope.row)"-->
-    <!--                   :disabled="editQuery.flbm==null || scope.row.thirdId==null || scope.row.thirdId=='' || type == 2">解绑-->
-    <!--        </el-button>-->
-    <!--      </template>-->
-    <!--    </el-table-column>-->
-    <!--  </el-table>-->
-    <!--</el-card>-->
+      <el-collapse v-model="activeNames">
+        <el-collapse-item name="0" >
+          <template slot="title">
+            <p class="form-title">第三方信息</p>
+          </template>
+          <el-table :data="sysList" style="width: 100%;   margin-bottom: 8px" key="2" border>
+            <el-table-column label="序号" type="index"></el-table-column>
+            <el-table-column label="第三方系统名称" prop="sysName" show-overflow-tooltip></el-table-column>
+            <el-table-column label="第三方系统药品编码" prop="thirdId" show-overflow-tooltip></el-table-column>
+            <el-table-column label="第三方系统药品名称" prop="thirdName" show-overflow-tooltip></el-table-column>
+            <el-table-column label="第三方系统包装规格" prop="spec" show-overflow-tooltip></el-table-column>
+            <el-table-column label="注册号" prop="registerNo" show-overflow-tooltip></el-table-column>
+            <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
+            <el-table-column label="操作">
+              <template slot-scope="scope">
+                <el-button type="text" @click="addSelectErp(scope.row)" :disabled="scope.row.thirdId==rowData.nameCode">
+                  关联
+                </el-button>
+                <el-button type="text" @click.native.stop="removeErp(scope.row)"
+                           :disabled=" scope.row.thirdId==null || scope.row.thirdId==''"
+                >解绑
+                </el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-collapse-item>
+        <el-collapse-item name="1">
+          <template slot="title">
+            <p class="form-title">药品层级</p>
+          </template>
+          <div style=" float: right;
+                        text-align: right;
+                        margin-bottom: 8px;"
+          >
+            <el-button type="primary" size="mini" icon="search" @click="addDrugLevel"
+                       style="text-align:right"
+            >新增药品层级
+            </el-button>
+          </div>
+          <el-table
+            v-loading="loading"
+            :data="detailList"
+            style="width: 100%;"
+            border
+            key="3"
+            @current-change="handleDetail"
+          >
+            <el-table-column label="序号" type="index"></el-table-column>
+            <el-table-column label="层级标识" prop="nameCode" show-overflow-tooltip width="160">
+              <template slot-scope="scope">
+                <el-input size="small" v-model="scope.row.nameCode" style="width: 100%;margin: 4px;"
+                          :disabled="scope.$index !== selectedIndex"
+                ></el-input>
+              </template>
+            </el-table-column>
+            <!--            1.主标识，2，使用单元标识，3.本体标识，4，包装标识-->
+            <el-table-column label="标识类型" prop="diType" show-overflow-tooltip width="160">
+              <template slot-scope="scope">
+                <el-select v-model="scope.row.diType"
+                           :disabled="scope.$index !== selectedIndex"
+                           style="width: 90%" placeholder="选择标识类型" clearable>
+                  <el-option label="最小销售标识" :value="1"></el-option>
+                  <!--                  <el-option label="使用单元标识" :value="2"></el-option>-->
+                  <!--                  <el-option label="本体标识" :value="3"></el-option>-->
+                  <el-option label="外包装标识" :value="4"></el-option>
+                </el-select>
+              </template>
+            </el-table-column>
+            <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip width="100">
+              <template slot-scope="scope">
+                <el-input size="small" v-model="scope.row.packLevel" style="width: 100%"
+                          type="number"
+                          :disabled="scope.$index !== selectedIndex"
+                ></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column label="层级单位" prop="packUnit" show-overflow-tooltip width="120">
+              <template slot-scope="scope">
+                <el-input size="small" v-model="scope.row.packUnit" style="width: 100%"
+                          :disabled="scope.$index !== selectedIndex"
+                ></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column label="下级数量" prop="bhxjsl" show-overflow-tooltip width="100">
+              <template slot-scope="scope">
+                <el-input size="small" v-model="scope.row.bhxjsl" style="width: 100%"
+                          type="number"
+                          :disabled="scope.$index !== selectedIndex"
+                ></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column label="下级单位" prop="xjdw" show-overflow-tooltip width="120">
+              <template slot-scope="scope">
+                <el-input size="small" v-model="scope.row.xjdw" style="width: 100%"
+                          :disabled="scope.$index !== selectedIndex"
+                ></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column label="下级标识" prop="bhxjcpbm" show-overflow-tooltip width="160">
+              <template slot-scope="scope">
+                <el-input size="small" v-model="scope.row.bhxjcpbm" style="width: 100%"
+                          :disabled="scope.$index !== selectedIndex "
+                ></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column label="上级标识" prop="sjcpbm" show-overflow-tooltip width="160">
+              <template slot-scope="scope">
+                <el-input size="small" v-model="scope.row.sjcpbm" style="width: 100%"
+                          :disabled="scope.$index !== selectedIndex"
+                ></el-input>
+              </template>
+            </el-table-column>
 
+            <el-table-column label="操作" width="180px" fixed="right">
+              <template slot-scope="scope">
+                <el-button type="text" size="small" v-if="scope.$index == selectedIndex " @click.stop="true"
+                           @click.native="levelSave(scope.row)"
+                >保存
+                </el-button>
+                <el-button
+                  type="text"
+                  size="small"
+                  v-if="scope.$index != selectedIndex "
+                  @click.stop="true"
+                  @click.native="rowChange(scope.$index,scope.row)"
+                >编辑
+                </el-button>
 
-    <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="addDrugLevel" v-if="type != 2"
-                   style="text-align:right">新增药品层级
-        </el-button>
-      </div>
-      <el-table
-        v-loading="loading"
-        :data="detailList"
-        style="width: 100%;"
-        border
-        key="3"
-        @current-change="handleDetail"
-      >
-        <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="层级标识" prop="nameCode" show-overflow-tooltip width="160">
-          <template slot-scope="scope">
-            <el-input size="small" v-model="scope.row.nameCode" style="width: 100%;margin: 4px;"
+                <!--:disabled=" scope.row.id != null"-->
+                <el-button
+                  type="text"
+                  size="small"
+                  @click.stop="true"
+                  @click.native="deleteLevel(scope.$index, scope.row)"
+                >删除
 
-                      :disabled="scope.$index !== selectedIndex"
-            ></el-input>
-          </template>
-        </el-table-column>
-        <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip width="160">
-          <template slot-scope="scope">
-            <el-input size="small" v-model="scope.row.packLevel" style="width: 100%"
-                      type="number"
-                      :disabled="scope.$index !== selectedIndex"
-            ></el-input>
-          </template>
-        </el-table-column>
-        <el-table-column label="层级单位" prop="packUnit" show-overflow-tooltip width="100">
-          <template slot-scope="scope">
-            <el-input size="small" v-model="scope.row.packUnit" style="width: 100%"
-                      :disabled="scope.$index !== selectedIndex"
-            ></el-input>
-          </template>
-        </el-table-column>
-        <el-table-column label="上级标识" prop="sjcpbm" show-overflow-tooltip width="160">
-          <template slot-scope="scope">
-            <el-input size="small" v-model="scope.row.sjcpbm" style="width: 100%"
-                      :disabled="scope.$index !== selectedIndex"
-            ></el-input>
-          </template>
-        </el-table-column>
-        <el-table-column label="下级标识" prop="bhxjcpbm" show-overflow-tooltip width="160">
-          <template slot-scope="scope">
-            <el-input size="small" v-model="scope.row.bhxjcpbm" style="width: 100%"
-                      :disabled="scope.$index !== selectedIndex"
-            ></el-input>
-          </template>
-        </el-table-column>
-        <el-table-column label="下级数量" prop="bhxjsl" show-overflow-tooltip width="100">
-          <template slot-scope="scope">
-            <el-input size="small" v-model="scope.row.bhxjsl" style="width: 100%"
-                      type="number"
-                      :disabled="scope.$index !== selectedIndex"
-            ></el-input>
+                </el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+
+          <template>
+            <p class="form-title2">流通时采用的计量单位设置</p>
           </template>
-        </el-table-column>
-        <el-table-column label="操作" width="100px" fixed="right" v-if="type != 2">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" v-if="scope.$index == selectedIndex" @click.stop="true"
-                       @click.native="levelSave(scope.row)">保存
-            </el-button>
-            <el-button
-              type="text"
-              size="small"
-              v-if="scope.$index != selectedIndex  "
-              @click.stop="true"
-              @click.native="rowChange(scope.$index,scope.row)"
-            >编辑
-            </el-button>
-            <el-button
-              type="text"
-              size="small"
-              @click.stop="true"
-              :disabled="scope.$index == selectedIndex  ||  scope.row.id == null"
-              @click.native="deleteLevel(scope.$index, scope.row)"
-            >删除
-            </el-button>
+          <el-row :gutter="20">
+            <el-col :span="11" class="el-col">
+              <el-form-item label="计量单位:" prop="distributeLevel" label-width="160px">
+
+                <el-select v-model="newProductData.distributeLevel" size="small" style="width: 90%"
+                           @change="distributeLevelDiChange"
+                           placeholder="请选择计量单位"
+                >
+                  <el-option
+                    v-for="item in levelUnitList"
+                    :key="item.packLevel"
+                    :value="item.packLevel"
+                    :label="item.packUnit"
+                  >
+                    <span style="float: right; color: #8492a6; font-size: 13px">单位:{{ item.packUnit }}</span>
+                    <span style="float: left">层级:{{ item.packLevel }}</span>
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="11" class="el-col">
+              <el-form-item label="允许采集的最大层级:" prop="distributeMaxLevel" label-width="160px">
+                <el-select v-model="newProductData.distributeMaxLevel" size="small" style="width: 90%"
+                           placeholder="请选择允许采集的最大层级"
+                >
+                  <el-option
+                    v-for="item in levelUnitList"
+                    :key="item.packLevel"
+                    :value="item.packLevel"
+                    :label="item.packLevel"
+                  >
+                    <span style="float: right; color: #8492a6; font-size: 13px">单位:{{ item.packUnit }}</span>
+                    <span style="float: left">层级:{{ item.packLevel }}</span>
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-divider></el-divider>
+          <template>
+            <p class="form-title2">使用时采用的计量单位设置</p>
           </template>
-        </el-table-column>
-      </el-table>
-      <!--<el-table v-loading="loading" :data="detailList" style="width: 100%; " border key="3" highlight-current-row>-->
-      <!--  <el-table-column label="产品最小销售标识" prop="nameCode" show-overflow-tooltip></el-table-column>-->
-      <!--  <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>-->
-      <!--  <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>-->
-      <!--  <el-table-column label="包装层级" prop="bzcj" show-overflow-tooltip></el-table-column>-->
-      <!--</el-table>-->
-    </el-card>
-    <el-card>
-      <el-form :model="editQuery" :rules="rules" ref="editQuery" border label-width="120px" style="margin-top: 20px;  ">
-      <el-collapse v-model="activeNames">
-        <el-collapse-item name="1">
+          <el-row :gutter="20">
+            <el-col :span="11" class="el-col">
+              <el-form-item label="计量单位:" prop="useLevel" label-width="160px">
+
+                <el-select v-model="newProductData.useLevel" size="small" style="width: 90%"
+                           clearable
+                           @change="useLevelDiChange"
+                           placeholder="请选择计量单位"
+                >
+                  <el-option
+                    v-for="item in levelUnitList"
+                    :key="item.packLevel"
+                    :value="item.packLevel"
+                    :label="item.packUnit"
+                  >
+                    <span style="float: right; color: #8492a6; font-size: 13px">单位:{{ item.packUnit }}</span>
+                    <span style="float: left">层级:{{ item.packLevel }}</span>
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="11" class="el-col">
+              <el-form-item label="允许采集的最大层级:" prop="useMaxLevel" label-width="160px">
+                <el-select v-model="newProductData.useMaxLevel" size="small" style="width: 90%"
+                           clearable
+                           placeholder="请选择允许采集的最大层级"
+                >
+                  <el-option
+                    v-for="item in levelUnitList"
+                    :key="item.packLevel"
+                    :value="item.packLevel"
+                    :label="item.packLevel"
+                  >
+                    <span style="float: right; color: #8492a6; font-size: 13px">单位:{{ item.packUnit }}</span>
+                    <span style="float: left">层级:{{ item.packLevel }}</span>
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="20">
+            <el-col :span="11" class="el-col">
+              <el-form-item label="拆包后可用时长(小时):" prop="unpackUseTime" label-width="160px">
+
+                <el-input v-model="newProductData.unpackUseTime" size="small" style="width: 90%"
+                          clearable
+                          placeholder="请输入拆包后可用时长(小时)"
+                >
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-collapse-item>
+        <el-collapse-item name="2">
           <template slot="title">
             <p class="form-title">基本信息</p>
           </template>
+          <el-row type="flex">
+            <el-col :span="11" class="el-col">
+              <el-form-item label="医保编码:" prop="ybbm">
+                <el-input style="width: 90%" size="small" placeholder="请输入医保编码"
+                          v-model.trim="newProductData.ybbm"
+                          v-debounce-input:500ms="getYbDrugData"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="11" class="el-col">
+              <el-form-item label="商品条码:" prop="sptm">
+                <el-input style="width: 90%" size="small" placeholder="请输入药品商品条码"
+                          v-model.trim="newProductData.sptm"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+
+          </el-row>
           <el-row type="flex">
             <el-col :span="11" class="el-col">
               <el-form-item label="药品通用名称:" prop="cpmctymc">
                 <el-input style="width: 90%" size="small" placeholder="请输入药品通用名称"
-                          v-model.trim="editQuery.cpmctymc"
-                          :disabled="isdisabled"
+                          v-model.trim="newProductData.cpmctymc"
                 ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="11" class="el-col">
               <el-form-item label="商品名称:" prop="spmc">
                 <el-input style="width: 90%" size="small" placeholder="请输入商品名称"
-                          v-model.trim="editQuery.spmc"
-                          :disabled="isdisabled"
+                          v-model.trim="newProductData.spmc"
                 ></el-input>
               </el-form-item>
             </el-col>
@@ -152,16 +286,14 @@
             <el-col :span="11" class="el-col">
               <el-form-item label="包装规格:" prop="bzgg">
                 <el-input style="width: 90%" size="small" placeholder="请输入包装规格"
-                          v-model.trim="editQuery.bzgg"
-                          :disabled="isdisabled"
+                          v-model.trim="newProductData.bzgg"
                 ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="11" class="el-col">
-              <el-form-item label="包装单位:" prop="packUnit">
-                <el-input style="width: 90%" size="small" placeholder="请输入包装单位"
-                          v-model.trim="editQuery.packUnit"
-                          :disabled="isdisabled"
+              <el-form-item label="最小包装单位:" prop="packUnit">
+                <el-input style="width: 90%" size="small" placeholder="请输入最小包装单位"
+                          v-model.trim="newProductData.packUnit"
                 ></el-input>
               </el-form-item>
             </el-col>
@@ -170,16 +302,14 @@
             <el-col :span="11" class="el-col">
               <el-form-item label="制剂规格:" prop="prepnSpec">
                 <el-input style="width: 90%" size="small" placeholder="请输入制剂规格"
-                          v-model.trim="editQuery.prepnSpec"
-                          :disabled="isdisabled"
+                          v-model.trim="newProductData.prepnSpec"
                 ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="11" class="el-col">
-              <el-form-item label="制剂单位:" prop="prepnUnit">
-                <el-input style="width: 90%" size="small" placeholder="请输入制剂单位"
-                          v-model.trim="editQuery.prepnUnit"
-                          :disabled="isdisabled"
+              <el-form-item label="剂型:" prop="prepnUnit">
+                <el-input style="width: 90%" size="small" placeholder="请输入剂型"
+                          v-model.trim="newProductData.prepnUnit"
                 ></el-input>
               </el-form-item>
             </el-col>
@@ -188,72 +318,60 @@
             <el-col :span="11" class="el-col">
               <el-form-item label="包装材质:" prop="packMatrial">
                 <el-input style="width: 90%" size="small" placeholder="请输入包装材质"
-                          v-model.trim="editQuery.packMatrial"
-                          :disabled="isdisabled"
+                          v-model.trim="newProductData.packMatrial"
                 ></el-input>
               </el-form-item>
             </el-col>
+            <!--<el-col :span="11" class="el-col">-->
+            <!--  <el-form-item label="包装比例:" prop="packRatio">-->
+            <!--    <el-input style="width: 90%" size="small" placeholder="请输入制剂单位"-->
+            <!--              v-model.trim="newProductData.packRatio"-->
+            <!--    ></el-input>-->
+            <!--  </el-form-item>-->
+            <!--</el-col>-->
             <el-col :span="11" class="el-col">
-              <el-form-item label="包装比例:" prop="packRatio">
-                <el-input style="width: 90%" size="small" placeholder="请输入包装比例"
-                          v-model.trim="editQuery.packRatio"
-                          :disabled="isdisabled"
+              <el-form-item label="批准文号:" prop="zczbhhzbapzbh">
+                <el-input style="width: 90%" size="small" placeholder="请输入批准文号"
+                          v-model="newProductData.zczbhhzbapzbh"
                 ></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row type="flex">
-            <el-col :span="11" class="el-col">
-              <el-form-item label="批准文号:" prop="registerNo">
-                <el-input style="width: 90%" size="small" placeholder="请输入批准文号"
-                          v-model.trim="editQuery.registerNo"
-                          :disabled="isdisabled"
-                ></el-input>
-              </el-form-item>
-            </el-col>
+
             <el-col :span="11" class="el-col">
               <el-form-item label="生产企业:" prop="manufactory">
                 <el-input style="width: 90%" size="small" placeholder="请输入生产企业"
-                          v-model.trim="editQuery.manufactory"
-                          :disabled="isdisabled"
+                          v-model.trim="newProductData.manufactory"
                 ></el-input>
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row type="flex">
             <el-col :span="11" class="el-col">
               <el-form-item label="药品类型:" prop="physicType">
-                <el-select v-model="editQuery.physicType" style="width: 90%" placeholder="选择药品类型" clearable  :disabled="isdisabled">
+                <el-select v-model="newProductData.physicType" style="width: 90%" placeholder="选择药品类型">
+                  <el-option label="普通药品" :value="3"></el-option>
                   <el-option label="特殊药品原料药" :value="1"></el-option>
                   <el-option label="特殊药品制剂" :value="2"></el-option>
-                  <el-option label="普通药品" :value="3"></el-option>
                   <el-option label="未分类" :value="9"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
+          </el-row>
+          <el-row type="flex">
+
             <el-col :span="11" type="flex">
               <el-form-item label="药品分类:" prop="majorType">
-                <el-select v-model="editQuery.majorType" style="width: 90%" placeholder="选择药品分类" clearable  :disabled="isdisabled">
+                <el-select v-model="newProductData.majorType" style="width: 90%" placeholder="选择药品分类" clearable>
                   <el-option label="中药" :value="1"></el-option>
                   <el-option label="化学药" :value="2"></el-option>
                   <el-option label="生物制品" :value="3"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row type="flex">
-            <el-col :span="11" class="el-col">
-              <el-form-item label="医保编码:" prop="ybbm">
-                <el-input style="width: 90%" size="small" placeholder="请输入医保编码"
-                          v-model.trim="editQuery.ybbm"
-                          :disabled="isdisabled"
-                ></el-input>
-              </el-form-item>
-            </el-col>
             <el-col :span="11" class="el-col">
               <el-form-item label="医保分类:" prop="medicareType">
-                <el-select v-model="editQuery.medicareType" style="width: 90%" placeholder="选择医保分类"
-                           clearable  :disabled="isdisabled"
+                <el-select v-model="newProductData.medicareType" style="width: 90%" placeholder="选择医保分类"
+                           clearable
                 >
                   <el-option label="甲类" :value="1"></el-option>
                   <el-option label="乙类" :value="2"></el-option>
@@ -261,917 +379,618 @@
                 </el-select>
               </el-form-item>
             </el-col>
+
           </el-row>
           <el-row type="flex">
+
+
             <el-col :span="11" class="el-col">
               <el-form-item label="药品价格:" prop="price">
                 <el-input
                   style="width: 90%"
                   size="small"
                   placeholder="请输入药品价格"
-                  type="number"
-                  :precision="2"
-                  :min="0"
-                  v-model.number="editQuery.price"
-                  :disabled="isdisabled"
+                  type="text"
+                  v-model="newProductData.price"
                 ></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="11" class="el-col">
-              <el-form-item label="有效期:" prop="indate">
-                <el-date-picker
-                  style="width: 90%"
-                  v-model="editQuery.indate"
-                  type="datetime"
-                  format="yyyy 年 MM 月 dd 日 HH 点 mm 分 ss 秒"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  placeholder="选择有效期"
-                  :disabled="isdisabled"
-                >
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row type="flex">
             <el-col :span="11" class="el-col">
               <el-form-item label="存储条件:" prop="ylqxzcrbarmc">
                 <el-input style="width: 90%" size="small" placeholder="请输入存储条件"
-                          v-model.trim="editQuery.storageCondition"  :disabled="isdisabled"
+                          v-model.trim="newProductData.storageCondition"
                 ></el-input>
               </el-form-item>
             </el-col>
+          </el-row>
+          <!--<el-row type="flex">-->
+
+          <!--  <el-col :span="11" class="el-col">-->
+          <!--    <el-form-item label="有效期:" prop="indate">-->
+          <!--      <el-date-picker-->
+          <!--          style="width: 90%"-->
+          <!--          v-model="newProductData.indate"-->
+          <!--          type="datetime"-->
+          <!--          format="yyyy 年 MM 月 dd 日 HH 点 mm 分 ss 秒"-->
+          <!--          value-format="yyyy-MM-dd HH:mm:ss"-->
+          <!--          placeholder="选择有效期"-->
+          <!--      >-->
+          <!--      </el-date-picker>-->
+          <!--    </el-form-item>-->
+          <!--  </el-col>-->
+          <!--</el-row>-->
+          <el-row type="flex">
+
             <el-col :span="11" class="el-col">
               <el-form-item label="运输条件:" prop="transportCondition">
                 <el-input style="width: 90%" size="small" placeholder="请输入运输条件"
-                          v-model.trim="editQuery.transportCondition"  :disabled="isdisabled"
+                          v-model.trim="newProductData.transportCondition"
                 ></el-input>
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row type="flex">
             <el-col :span="11" class="el-col">
               <el-form-item label="统一社会信用号:" prop="tyshxydm">
                 <el-input style="width: 90%" size="small" placeholder="请输入统一社会信用号"
-                          v-model.trim="editQuery.tyshxydm"  :disabled="isdisabled"
+                          v-model.trim="newProductData.tyshxydm"
                 ></el-input>
               </el-form-item>
             </el-col>
+          </el-row>
+          <el-row type="flex">
+
             <el-col :span="11" class="el-col">
               <el-form-item label="药品状态:" prop="majorStatus">
-                <el-select v-model="editQuery.majorStatus" style="width: 90%" placeholder="选择药品状态" clearable  :disabled="isdisabled">
+                <el-select v-model="newProductData.majorStatus" style="width: 90%" placeholder="选择药品状态">
                   <el-option label="停用" :value="0"></el-option>
                   <el-option label="在用" :value="1"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
           </el-row>
-
+          <!--<el-row type="flex" class="edit-row">-->
+          <!--<el-col :span="11">-->
+          <!--  <el-form-item label="收费项目编码:">-->
+          <!--    <el-input-->
+          <!--      style="width: 65%"-->
+          <!--      size="small"-->
+          <!--      placeholder="选择项目收费编码"-->
+          <!--      v-model="newProductData.payFeeCode"-->
+          <!--    ></el-input>-->
+          <!--    <el-button type="primary" size="mini" style="margin-left: 10px" @click="selectPayFeecode">选入-->
+          <!--    </el-button>-->
+          <!--  </el-form-item>-->
+          <!--</el-col>-->
+          <!--<el-col :span="11">-->
+          <!--  <el-form-item label="是否拆零:" prop="splitEnable">-->
+          <!--    <el-select v-model="newProductData.splitEnable" style="width: 90%" placeholder="是否拆零" clearable>-->
+          <!--      <el-option label="是" :value="true"></el-option>-->
+          <!--      <el-option label="否" :value="false"></el-option>-->
+          <!--    </el-select>-->
+          <!--  </el-form-item>-->
+          <!--</el-col>-->
+          <!--</el-row>-->
+          <!--<el-row type="flex" class="edit-row">-->
+          <!--<el-col :span="11">-->
+          <!--  <el-form-item label="是否自动赋码:" prop="autoCode">-->
+          <!--    <el-select v-model="newProductData.autoCode" style="width: 90%" placeholder="是否自动赋码" clearable>-->
+          <!--      <el-option label="是" :value="true"></el-option>-->
+          <!--      <el-option label="否" :value="false"></el-option>-->
+          <!--    </el-select>-->
+          <!--  </el-form-item>-->
+          <!--</el-col>-->
+          <!--</el-row>-->
           <el-row type="flex">
             <el-col :span="23" class="el-col">
               <el-form-item label="产品描述:" prop="cpms">
                 <el-input style="width: 92%" type="textarea" size="mini" rows="3" placeholder="请输入产品描述"
-                          v-model.trim="editQuery.cpms"
-                          :disabled="isdisabled"
+                          v-model.trim="newProductData.cpms"
                 ></el-input>
               </el-form-item>
             </el-col>
           </el-row>
         </el-collapse-item>
-        <el-collapse-item name="2">
+
+
+        <!--        <el-collapse-item name="3">-->
+        <!--          <template slot="title">-->
+        <!--            <p class="form-title">流通使用参数设置</p>-->
+        <!--          </template>-->
+        <!--          <el-row :gutter="20">-->
+        <!--            <el-col :span="11" class="el-col">-->
+        <!--              <el-form-item label="流通计量层级标识:" prop="distributeLevelDi" label-width="160px">-->
+        <!--                <el-select v-model="newProductData.distributeLevelDi" size="small" style="width: 90%"-->
+        <!--                           @change="distributeLevelDiChange"-->
+        <!--                           clearable-->
+        <!--                           placeholder="请选择流通计量层级标识"-->
+        <!--                >-->
+        <!--                  <el-option-->
+        <!--                    v-for="item in detailList"-->
+        <!--                    :key="item.nameCode"-->
+        <!--                    :value="item.nameCode"-->
+        <!--                    :label="item.nameCode"-->
+        <!--                  >-->
+        <!--                    <span style="float: left">{{ item.nameCode }}</span>-->
+        <!--                    <span style="float: right; color: #8492a6; font-size: 13px">{{ item.packLevel }}</span>-->
+        <!--                  </el-option>-->
+        <!--                </el-select>-->
+        <!--              </el-form-item>-->
+        <!--            </el-col>-->
+        <!--            <el-col :span="11" class="el-col">-->
+        <!--              <el-form-item label="使用计量层级标识:" prop="useLevelDi" label-width="160px">-->
+        <!--                <el-select v-model="newProductData.useLevelDi" size="small" style="width: 90%"-->
+        <!--                           @change="useLevelDiChange"-->
+        <!--                           clearable-->
+        <!--                           disabled-->
+        <!--                           placeholder="请选择流通计量层级标识"-->
+        <!--                >-->
+        <!--                  <el-option-->
+        <!--                    v-for="item in detailList"-->
+        <!--                    :key="item.nameCode"-->
+        <!--                    :value="item.nameCode"-->
+        <!--                    :label="item.nameCode"-->
+        <!--                  >-->
+        <!--                    <span style="float: left">{{ item.nameCode }}</span>-->
+        <!--                    <span style="float: right; color: #8492a6; font-size: 13px">{{ item.packLevel }}</span>-->
+        <!--                  </el-option>-->
+        <!--                </el-select>-->
+        <!--              </el-form-item>-->
+        <!--            </el-col>-->
+        <!--            <el-col :span="11" class="el-col">-->
+        <!--              <el-form-item label="流通计量层级单位:" prop="distributeLevelUnit" label-width="160px">-->
+        <!--                <el-input style="width: 90%" size="small" placeholder="请输入流通计量层级单位"-->
+        <!--                          disabled-->
+        <!--                          v-model="newProductData.distributeLevelUnit"-->
+        <!--                ></el-input>-->
+        <!--              </el-form-item>-->
+        <!--            </el-col>-->
+        <!--            <el-col :span="11" class="el-col">-->
+        <!--              <el-form-item label="使用计量层级单位:" prop="useLevelUnit" label-width="160px">-->
+        <!--                <el-input style="width: 90%" size="small" placeholder="请输入使用计量层级标识"-->
+        <!--                          disabled-->
+        <!--                          v-model.trim="newProductData.useLevelUnit"-->
+        <!--                ></el-input>-->
+        <!--              </el-form-item>-->
+        <!--            </el-col>-->
+        <!--            <el-col :span="11" class="el-col">-->
+        <!--              <el-form-item label="流通时含计量单元数量:" prop="distributeLevelCount" label-width="160px">-->
+        <!--                <el-input style="width: 90%" size="small" placeholder="请输入流通时包含计量单元的数量"-->
+        <!--                          v-model.trim="newProductData.distributeLevelCount"-->
+        <!--                ></el-input>-->
+        <!--              </el-form-item>-->
+        <!--            </el-col>-->
+        <!--            <el-col :span="11" class="el-col">-->
+        <!--              <el-form-item label="使用时含计量单元数量:" prop="useLeverCount" label-width="160px">-->
+        <!--                <el-input style="width: 90%" size="small" placeholder="请输入使用时包含计量单元的数量"-->
+        <!--                          v-model.trim="newProductData.useLeverCount"-->
+        <!--                ></el-input>-->
+        <!--              </el-form-item>-->
+        <!--            </el-col>-->
+
+        <!--          </el-row>-->
+        <!--        </el-collapse-item>-->
+        <el-collapse-item name="4">
           <template slot="title">
-            <p class="form-title">参数设置</p>
+            <p class="form-title">高级设置</p>
           </template>
-          <el-row :gutter="20">
+          <el-row type="flex">
             <el-col :span="11" class="el-col">
-              <el-form-item label="流通计量层级标识:" prop="distributeLevelDi" label-width="160px">
-                <el-select v-model="editQuery.distributeLevelDi" size="small" style="width: 90%"
-                           @change="distributeLevelDiChange"
-                           clearable
-                           placeholder="请选择流通计量层级标识"
-                           :disabled="isdisabled">
-                  <el-option
-                    v-for="item in detailList"
-                    :key="item.nameCode"
-                    :value="item.nameCode"
-                    :label="item.nameCode">
-                    <span style="float: left">{{ item.nameCode }}</span>
-                    <span style="float: right; color: #8492a6; font-size: 13px">{{ item.packLevel }}</span>
-                  </el-option>
-                </el-select>
-              </el-form-item>
+              <span>参数</span>
             </el-col>
+            <el-divider direction="vertical"></el-divider>
             <el-col :span="11" class="el-col">
-              <el-form-item label="使用计量层级标识:" prop="useLevelDi" label-width="160px">
-                <el-select v-model="editQuery.useLevelDi" size="small" style="width: 90%"
-                           @change="useLevelDiChange"
-                           clearable
-                           placeholder="请选择流通计量层级标识"
-                           :disabled="isdisabled">
-                  <el-option
-                    v-for="item in detailList"
-                    :key="item.nameCode"
-                    :value="item.nameCode"
-                    :label="item.nameCode">
-                    <span style="float: left">{{ item.nameCode }}</span>
-                    <span style="float: right; color: #8492a6; font-size: 13px">{{ item.packLevel }}</span>
-                  </el-option>
-                </el-select>
-              </el-form-item>
+              <span>设置</span>
             </el-col>
+            <el-divider direction="vertical"></el-divider>
             <el-col :span="11" class="el-col">
-              <el-form-item label="流通计量层级单位:" prop="distributeLevelUnit" label-width="160px">
-                <el-input style="width: 90%" size="small" placeholder="请输入流通计量层级单位"
-                          disabled
-                          v-model="editQuery.distributeLevelUnit"
-                ></el-input>
-              </el-form-item>
+              <span>参数设置说明</span>
             </el-col>
+          </el-row>
+          <el-row type="flex">
             <el-col :span="11" class="el-col">
-              <el-form-item label="使用计量层级标识:" prop="useLevelUnit" label-width="160px">
-                <el-input style="width: 90%" size="small" placeholder="请输入使用计量层级标识"
-                          disabled
-                          v-model.trim="editQuery.useLevelUnit"
-                ></el-input>
-              </el-form-item>
+              <span class="sptext">是否禁用</span>
             </el-col>
+            <el-divider direction="vertical"></el-divider>
             <el-col :span="11" class="el-col">
-              <el-form-item label="流通时含计量单元数量:" prop="distributeLevelCount" label-width="160px">
-                <el-input style="width: 90%" size="small" placeholder="请输入流通时包含计量单元的数量"
-                          v-model.trim="editQuery.distributeLevelCount"
-                          :disabled="isdisabled"
-                ></el-input>
-              </el-form-item>
+              <el-switch
+                v-model="status"
+                active-color="#13ce66"
+                inactive-color="#ff4949"
+              >
+              </el-switch>
             </el-col>
+            <el-divider direction="vertical"></el-divider>
             <el-col :span="11" class="el-col">
-              <el-form-item label="使用时含计量单元数量:" prop="useLeverCount" label-width="160px">
-                <el-input style="width: 90%" size="small" placeholder="请输入使用时包含计量单元的数量"
-                          v-model.trim="editQuery.useLeverCount"
-                          :disabled="isdisabled"
-                ></el-input>
-              </el-form-item>
+              <span class="sptext">禁用后该药品将无法扫码使用</span>
             </el-col>
-
           </el-row>
         </el-collapse-item>
       </el-collapse>
-      </el-form>
-    </el-card>
-    <div style="text-align: center; margin-top: 20px;" v-if="type != 2">
-      <el-button type="primary" @click="submitUploadDrug" :loading="saveLoading">提交</el-button>
-      <el-button  @click="closeAddDialog">取消</el-button>
+    </el-form>
+    <div style="text-align: center; margin-top: 20px;">
+      <el-button type="primary" @click="saveNewProduct" :loading="saveLoading">提交</el-button>
+      <el-button @click="closeAddDialog">取消</el-button>
     </div>
 
-    <!--<el-card>-->
-    <!--  <el-form :model="editQuery" :rules="rules" ref="editQuery" border label-width="120px" style="margin-top: 20px;  ">-->
-    <!--    <el-row type="flex" class="edit-row">-->
-    <!--      <el-col :span="12">-->
-    <!--        <el-form-item label="商品条码:">-->
-    <!--          <el-input style="width: 80%" size="small" splaceholder="请输入内容" v-model="editQuery.sptm"></el-input>-->
-    <!--        </el-form-item>-->
-    <!--      </el-col>-->
-    <!--      <el-col :span="12">-->
-    <!--        <el-form-item label="商品名称:">-->
-    <!--          <el-input style="width: 80%" size="small" splaceholder="请输入内容" v-model="editQuery.spmc"></el-input>-->
-    <!--        </el-form-item>-->
-    <!--      </el-col>-->
-    <!--    </el-row>-->
-    <!--    <el-row type="flex" class="edit-row">-->
-    <!--      <el-col :span="12">-->
-    <!--        <el-form-item label="计量单位:">-->
-    <!--          <el-input style="width: 80%" size="small" splaceholder="请输入内容" v-model="editQuery.measname"></el-input>-->
-    <!--        </el-form-item>-->
-    <!--      </el-col>-->
-    <!--      <el-col :span="12">-->
-    <!--        <el-form-item label="生产企业:">-->
-    <!--          <el-input style="width: 80%" size="small" splaceholder="请输入内容" v-model="editQuery.manufactory"-->
-    <!--          ></el-input>-->
-    <!--        </el-form-item>-->
-    <!--      </el-col>-->
-    <!--    </el-row>-->
-    <!--    <el-row type="flex" class="edit-row">-->
-    <!--      <el-col :span="12">-->
-    <!--        <el-form-item label="产品价格:">-->
-    <!--          <el-input style="width: 80%" size="small" splaceholder="请输入内容" v-model="editQuery.price"></el-input>-->
-    <!--        </el-form-item>-->
-    <!--      </el-col>-->
-    <!--      <el-col :span="12">-->
-    <!--        <el-form-item label="医保编码:">-->
-    <!--          <el-input style="width: 80%"-->
-    <!--                    size="small"-->
-    <!--                    splaceholder="请输入内容"-->
-    <!--                    v-model="editQuery.ybbm"-->
-    <!--                    v-debounce-input:500ms="getYbHcData"-->
-    <!--          ></el-input>-->
-    <!--        </el-form-item>-->
-    <!--      </el-col>-->
-    <!--    </el-row>-->
-
-    <!--    <el-row type="flex" class="edit-row">-->
-    <!--      <el-col :span="12">-->
-    <!--        <el-form-item label="一级分类名称:">-->
-    <!--          <el-input-->
-    <!--            style="width: 80%"-->
-    <!--            size="small"-->
-    <!--            splaceholder="请输入内容"-->
-    <!--            v-model="editQuery.catalogname1"-->
-    <!--            disabled-->
-    <!--          ></el-input>-->
-    <!--        </el-form-item>-->
-    <!--      </el-col>-->
-    <!--      <el-col :span="12">-->
-    <!--        <el-form-item label="二级分类名称:">-->
-    <!--          <el-input-->
-    <!--            style="width: 80%"-->
-    <!--            size="small"-->
-    <!--            splaceholder="请输入内容"-->
-    <!--            v-model="editQuery.catalogname2"-->
-    <!--            disabled-->
-    <!--          ></el-input>-->
-    <!--        </el-form-item>-->
-    <!--      </el-col>-->
-    <!--    </el-row>-->
-
-    <!--    <el-row type="flex" class="edit-row">-->
-    <!--      <el-col :span="12">-->
-    <!--        <el-form-item label="三级分类名称:">-->
-    <!--          <el-input-->
-    <!--            style="width: 80%"-->
-    <!--            size="small"-->
-    <!--            splaceholder="请输入内容"-->
-    <!--            v-model="editQuery.catalogname3"-->
-    <!--            disabled-->
-    <!--          ></el-input>-->
-    <!--        </el-form-item>-->
-    <!--      </el-col>-->
-    <!--      <el-col :span="12">-->
-    <!--        <el-form-item label="耗材材质:">-->
-    <!--          <el-input-->
-    <!--            style="width: 80%"-->
-    <!--            size="small"-->
-    <!--            splaceholder="请输入内容"-->
-    <!--            v-model="editQuery.matrial"-->
-    <!--            disabled-->
-    <!--          ></el-input>-->
-    <!--        </el-form-item>-->
-    <!--      </el-col>-->
-    <!--    </el-row>-->
-
-    <!--    <el-row type="flex" class="edit-row">-->
-    <!--      <el-col :span="12">-->
-    <!--        <el-form-item label="采购类型">-->
-    <!--          <el-select-->
-    <!--            v-model="editQuery.purType"-->
-    <!--            placeholder="请选择"-->
-    <!--            clearable-->
-    <!--            style="width: 80%"-->
-    <!--          >-->
-    <!--            <el-option label="普通入账产品" :value="1"></el-option>-->
-    <!--            <el-option label="预验收产品" :value="2"></el-option>-->
-    <!--            <el-option label="寄售产品" :value="3"></el-option>-->
-    <!--          </el-select>-->
-    <!--        </el-form-item>-->
-    <!--      </el-col>-->
-    <!--      <el-col :span="12">-->
-    <!--        <el-form-item label="产品属性">-->
-    <!--          <el-select-->
-    <!--            v-model="editQuery.attributeType"-->
-    <!--            placeholder="请选择"-->
-    <!--            clearable-->
-    <!--            style="width: 80%"-->
-    <!--          >-->
-    <!--            <el-option label="设备" :value="1"></el-option>-->
-    <!--            <el-option label="耗材" :value="2"></el-option>-->
-    <!--            <el-option label="伴随服务费" :value="3"></el-option>-->
-    <!--          </el-select>-->
-    <!--        </el-form-item>-->
-    <!--      </el-col>-->
-    <!--    </el-row>-->
-    <!--    <el-row type="flex" class="edit-row">-->
-    <!--      <el-col :span="12" v-if="productRemarkSet.remarkEnable1">-->
-    <!--        <el-form-item :label="productRemarkSet.remarkTitle1+':'">-->
-    <!--          <el-input-->
-    <!--            style="width: 80%"-->
-    <!--            size="small"-->
-    <!--            splaceholder="请输入内容"-->
-    <!--            v-model="editQuery.basicPrductRemak1"-->
-    <!--          ></el-input>-->
-    <!--        </el-form-item>-->
-    <!--      </el-col>-->
-    <!--      <el-col :span="12" v-if="productRemarkSet.remarkEnable2">-->
-    <!--        <el-form-item :label="productRemarkSet.remarkTitle2+':'">-->
-    <!--          <el-input-->
-    <!--            style="width: 80%"-->
-    <!--            size="small"-->
-    <!--            splaceholder="请输入内容"-->
-    <!--            v-model="editQuery.basicPrductRemak2"-->
-    <!--          ></el-input>-->
-    <!--        </el-form-item>-->
-    <!--      </el-col>-->
-    <!--    </el-row>-->
-    <!--    <el-row type="flex" class="edit-row">-->
-    <!--      <el-col :span="12" v-if="productRemarkSet.remarkEnable3">-->
-    <!--        <el-form-item :label="productRemarkSet.remarkTitle3+':'">-->
-    <!--          <el-input-->
-    <!--            style="width: 80%"-->
-    <!--            size="small"-->
-    <!--            splaceholder="请输入内容"-->
-    <!--            v-model="editQuery.basicPrductRemak3"-->
-    <!--          ></el-input>-->
-    <!--        </el-form-item>-->
-    <!--      </el-col>-->
-    <!--      <el-col :span="12" v-if="productRemarkSet.remarkEnable4">-->
-    <!--        <el-form-item :label="productRemarkSet.remarkTitle4+':'">-->
-    <!--          <el-input-->
-    <!--            style="width: 80%"-->
-    <!--            size="small"-->
-    <!--            splaceholder="请输入内容"-->
-    <!--            v-model="editQuery.basicPrductRemak4"-->
-    <!--          ></el-input>-->
-    <!--        </el-form-item>-->
-    <!--      </el-col>-->
-    <!--    </el-row>-->
-    <!--    <el-row type="flex" class="edit-row">-->
-    <!--      <el-col :span="12" v-if="productRemarkSet.remarkEnable5">-->
-    <!--        <el-form-item :label="productRemarkSet.remarkTitle5+':'">-->
-    <!--          <el-input-->
-    <!--            style="width: 80%"-->
-    <!--            size="small"-->
-    <!--            splaceholder="请输入内容"-->
-    <!--            v-model="editQuery.basicPrductRemak5"-->
-    <!--          ></el-input>-->
-    <!--        </el-form-item>-->
-    <!--      </el-col>-->
-    <!--      <el-col :span="12" v-if="productRemarkSet.remarkEnable6">-->
-    <!--        <el-form-item :label="productRemarkSet.remarkTitle6+':'">-->
-    <!--          <el-select-->
-    <!--            v-model="editQuery.basicPrductRemak6"-->
-    <!--            placeholder="请选择"-->
-    <!--            clearable-->
-    <!--            style="width: 80%"-->
-    <!--          >-->
-    <!--            <el-option label="扣费" value="1"></el-option>-->
-    <!--            <el-option label="不扣费" value="0"></el-option>-->
-    <!--          </el-select>-->
-    <!--        </el-form-item>-->
-    <!--      </el-col>-->
-    <!--    </el-row>-->
-    <!--    <el-row type="flex" class="edit-row">-->
-    <!--      <el-col :span="12" v-if="productRemarkSet.remarkEnable7">-->
-    <!--        <el-form-item :label="productRemarkSet.remarkTitle7+':'">-->
-    <!--          <el-select-->
-    <!--            v-model="editQuery.basicPrductRemak7"-->
-    <!--            filterable-->
-    <!--            remote-->
-    <!--            clearable="true"-->
-    <!--            reserve-keyword-->
-    <!--            placeholder="请选择物资类别"-->
-    <!--            :remote-method="findThrTypeMethod"-->
-    <!--            style="width: 80%"-->
-    <!--          >-->
-    <!--            <el-option-->
-    <!--              v-for="item in thrTypeOptions"-->
-    <!--              :key="item.code"-->
-    <!--              :label="item.name"-->
-    <!--              :value="item.code"-->
-    <!--            >-->
-    <!--              <span style="float: left">{{ item.name }}</span>-->
-    <!--              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>-->
-    <!--            </el-option>-->
-    <!--          </el-select>-->
-    <!--        </el-form-item>-->
-    <!--      </el-col>-->
-    <!--    </el-row>-->
-    <!--    <el-row type="flex" class="edit-row">-->
-    <!--      <el-col :span="12" v-if="productRemarkSet.remarkEnable8==true  && editQuery.basicPrductRemak6=='1'">-->
-    <!--        <el-form-item :label="productRemarkSet.remarkTitle8+':'">-->
-    <!--          <el-select-->
-    <!--            v-model="editQuery.basicPrductRemak8"-->
-    <!--            filterable-->
-    <!--            remote-->
-    <!--            clearable="true"-->
-    <!--            reserve-keyword-->
-    <!--            placeholder="请选择物价类别"-->
-    <!--            :remote-method="findHsflMethod"-->
-    <!--            style="width: 80%"-->
-    <!--          >-->
-    <!--            <el-option-->
-    <!--              v-for="item in hsflOptions"-->
-    <!--              :key="item.hsbm"-->
-    <!--              :label="item.hsmc"-->
-    <!--              :value="item.hsbm"-->
-    <!--            >-->
-    <!--              <span style="float: left">{{ item.hsmc }}</span>-->
-    <!--              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.hsbm }}</span>-->
-    <!--            </el-option>-->
-    <!--          </el-select>-->
-    <!--        </el-form-item>-->
-    <!--      </el-col>-->
-    <!--    </el-row>-->
-    <!--    <el-row type="flex" class="edit-row">-->
-    <!--      <el-col :span="12">-->
-    <!--        <el-form-item label="产品描述:">-->
-    <!--          <el-input style="width: 80%" size="small" splaceholder="请输入内容" v-model="editQuery.cpms"></el-input>-->
-    <!--        </el-form-item>-->
-    <!--      </el-col>-->
-    <!--      <el-col :span="12">-->
-    <!--        <el-form-item-->
-    <!--          label="是否可集采:"-->
-    <!--          prop="spUse"-->
-    <!--          class="query-form-item"-->
-    <!--        >-->
-    <!--          <el-radio-group v-model="editQuery.groupBuy">-->
-    <!--            <el-radio :label="true">是</el-radio>-->
-    <!--            <el-radio :label="false">否</el-radio>-->
-    <!--          </el-radio-group>-->
-    <!--        </el-form-item>-->
-    <!--      </el-col>-->
-    <!--    </el-row>-->
-    <!--    <el-row type="flex" class="edit-row">-->
-    <!--      <el-col :span="12">-->
-    <!--        <el-form-item-->
-    <!--          label="耗材类别:"-->
-    <!--          prop="hcType"-->
-    <!--          class="query-form-item"-->
-    <!--        >-->
-    <!--          <el-radio-group v-model="editQuery.hcType">-->
-    <!--            <el-radio :label=1>高值耗材</el-radio>-->
-    <!--            <el-radio :label=2>普通耗材</el-radio>-->
-    <!--          </el-radio-group>-->
-    <!--        </el-form-item>-->
-    <!--      </el-col>-->
-    <!--      <el-col :span="12">-->
-    <!--        <el-form-item-->
-    <!--          label="是否组套:"-->
-    <!--          prop="isStack"-->
-    <!--          class="query-form-item"-->
-    <!--        >-->
-    <!--          <el-radio-group v-model="editQuery.isStack">-->
-    <!--            <el-radio :label="true">是</el-radio>-->
-    <!--            <el-radio :label="false">否</el-radio>-->
-    <!--          </el-radio-group>-->
-    <!--        </el-form-item>-->
-    <!--      </el-col>-->
-    <!--    </el-row>-->
-    <!--    <el-row type="flex" class="edit-row">-->
-    <!--      <el-col :span="12">-->
-    <!--        <el-form-item label="分类编码:"-->
-    <!--                      prop="flbm"-->
-    <!--                      class="query-form-item">-->
-    <!--          <el-select-->
-    <!--            v-model="editQuery.flbm"-->
-    <!--            filterable-->
-    <!--            remote-->
-    <!--            clearable="true"-->
-    <!--            style="width: 80%"-->
-    <!--            reserve-keyword-->
-    <!--            placeholder="请选择"-->
-    <!--            :loading="loading"-->
-    <!--            @change="classifyChange()"-->
-    <!--          >-->
-    <!--            <el-option-->
-    <!--              v-for="item in classifyList"-->
-    <!--              :key="item.code"-->
-    <!--              :label="item.name"-->
-    <!--              :value="item.code">-->
-    <!--              <span>{{ item.code }}</span>-->
-    <!--              <span>{{ item.name }}</span>-->
-    <!--            </el-option>-->
-    <!--          </el-select>-->
-    <!--        </el-form-item>-->
-    <!--      </el-col>-->
-    <!--    </el-row>-->
-    <!--    <el-row class="edit-row">-->
-    <!--      <el-button-group style="display: flex">-->
-    <!--        <el-button type="primary" @click.native="submitUpload()" style="margin: 0 60px 10px auto; height: 35px"-->
-    <!--                   :loading="loading"-->
-    <!--        >提交-->
-    <!--        </el-button>-->
-    <!--      </el-button-group>-->
-    <!--    </el-row>-->
-    <!--  </el-form>-->
-    <!--</el-card>-->
+    <!--<el-dialog-->
+    <!--  title="收费项目选入"-->
+    <!--  :visible.sync="tollProjectDialogVisible"-->
+    <!--  :close-on-click-modal="false"-->
+    <!--  :close-on-press-escape="false"-->
+    <!--  width="70%"-->
+    <!--  v-if="tollProjectDialogVisible"-->
+    <!--  append-to-body-->
+    <!--&gt;-->
+    <!--  &lt;!&ndash;<product-single-edit&ndash;&gt;-->
+    <!--  &lt;!&ndash;  :editQuery="editSingleFormat"&ndash;&gt;-->
+    <!--  &lt;!&ndash;&gt;</product-single-edit>&ndash;&gt;-->
+    <!--  <selectChargesProjectDialog-->
+    <!--    :getData="getData"-->
+    <!--  >-->
+    <!--  </selectChargesProjectDialog>-->
+    <!--  &lt;!&ndash;<div style="text-align: center;margin-top: 12px">&ndash;&gt;-->
+    <!--  &lt;!&ndash;  <el-button type="primary" size="small" icon="search" @click="onAddSingleSubmit(false)" :loading="addLoading"&ndash;&gt;-->
+    <!--  &lt;!&ndash;  >提交&ndash;&gt;-->
+    <!--  &lt;!&ndash;  </el-button>&ndash;&gt;-->
+    <!--  &lt;!&ndash;  <el-button type="primary" size="small" icon="search" @click="cancelDialog"&ndash;&gt;-->
+    <!--  &lt;!&ndash;  >取消&ndash;&gt;-->
+    <!--  &lt;!&ndash;  </el-button>&ndash;&gt;-->
+    <!--  &lt;!&ndash;</div>&ndash;&gt;-->
+    <!--</el-dialog>-->
 
     <el-dialog
-      title="耗材字典-从指定系统添加器械信息"
-      :visible.sync="selectErpDialogVisible"
+      title="药品字典-从指定系统添加药品字典"
+      :visible.sync="chooseHouseDrugVisible"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
-      width="80%"
-      append-to-body
-      v-if="selectErpDialogVisible"
+      width="85%"
+      v-if="chooseHouseDrugVisible"
     >
-      <selectErp
-        :closeDialog="closeDialog"
+      <chooseHouseDrug
         :uuid="uuid"
         :relId="relId"
         :isImport="isImport"
         :data="thisData"
         :defaultSys="defaultSys"
-        @closeUdi="closeUdi2"
         :supEnable="false"
-      ></selectErp>
+        @closeUdi="closeUdi"
+      ></chooseHouseDrug>
     </el-dialog>
 
+
   </div>
 </template>
 
 <script>
 import {
-  getYbHcflDetail,
-  disableUdi,
-  removeDiRl,
-  removeRl,
-  thirdSysDetail,
-  delDrugLevel, updateLevelDrug
+  addDrug,
+  updatetDrug,
+  delDrugLevel,
+  updateLevelDrug, calculateDistCount, calculateUseCount
+} from '@/api/basic/product/drugUdiinfos'
+import {isBlank} from "@/utils/strUtil";
+
+import {
+  getYbDrugDetail, removeRl, thirdSysDetail
 } from '@/api/basic/product/udiRelevance'
-import {updateById,updateDrugProductById} from '@/api/basic/udiRelevance'
-import {filterByUuid} from '@/api/basic/udiInfo'
-import selectErp from "./udiInfoselectErpUdi";
-import selectUdiVersion from '@/views/basic/product/UdiinfoSelectVersion'
-import {getHslbs, getThrProductType} from "@/api/thrsys/thrHsfl";
 import {filterClassify} from '@/api/purchase/classifyCode'
+import {filterByUuid, levelByUuid} from '@/api/basic/product/udiInfo'
+// import selectChargesProjectDialog from './selectChargesProjectDialog'
+// import chooseHouseDrug from './chooseHouseDrug'
 
 export default {
-  name: 'productEdit',
+  name: 'basicCompanyproductEdit',
   props: {
-    editQuery: {
-      type: Object,
+    closeDialog: {
+      type: Function,
       required: true
     },
-    productRemarkSet: {
+    rowData: {
+      type: Object,
+      required: false
+    },
+    type: {
+      //1：新增；2：编辑
+      type: Object,
+      required: false
+    },
+    uuid: {
       type: Object,
       required: true
     },
-    closeDialog: {
-      type: Function,
+    relId: {
+      type: Object,
       required: true
     },
-    type: {
+    thisData: {
       type: Object,
-      required: false
+      required: true
     },
+    relevanceEdit: {
+      type: Object,
+      required: true
+    }
   },
-
+  // components: {selectChargesProjectDialog, chooseHouseDrug},
+  // components: { chooseHouseDrug},
   data() {
     return {
-      ybHcflDetail: {},
-      isUseDyCheck: false,
-      useNumEnable: true,
-      editDialogVisible: false,
-      sysList: {},
-      relId: null,
-      defaultSys: null,
-      detailList: [
-        // 初始化一个空对象或包含默认值的对象
-        {nameCode: '', packLevel: null, bhxjsl: null, isDisabled: false, isUpDisabled: true, rowDisabled: false}
-      ],
-      isImport: null,
-      thisData: {
-        nameCode: null,
+      ybDrugDetail: {},
+      productData: {},
+      newProductData: {
         cpmctymc: null,
-        ggxh: null
-      },
-      selectVersionVisible: false,
-      originUuid: null,
-      uuid: null,
-      editSingleFormat: {
-        uuid: null,
-        relId: null,
-        sptm: null,
-        packUnit: null,
+        bzgg: null,
+        spmc: null,
         measname: null,
+        manufactory: null,
+        ybbm: null,
+        cpms: null,
+        productsType: 2,
+        //高级设置默认开启扫码
+        status: false,
+        relId: null,
+        drugLevelLists: [],
+        productId: null,
+
+        useLevelDi: null,
+        distributeLevelDi: null,
+        distributeLevelUnit: null,
+        useLeverCount: null,
+        distributeLevelCount: null,
+        useLevelUnit: null,
+        distributeLevel: null,
+        useLevel: null,
+        majorStatus: 1,
+        physicType: 3
+
       },
-      editSingleDiDialogVisible: false,
-      selectErpDialogVisible: false,  //选入ERP产品
-      hsflOptions: [],
-      thrTypeOptions: [],
+      thirdSys: [],
       classifyList: [],
-
-      //新数据
-      activeNames: ['1', '2'],
+      saveLoading: false,
+      activeNames: ['0', '1', '2'],
+      formRules: {
+        cpmctymc: [
+          {required: true, message: '请输入药品通用名', trigger: 'blur'}
+        ],
+        prepnSpec: [
+          {required: true, message: '请输入制剂规格', trigger: 'blur'}
+        ],
+        packUnit: [
+          {required: true, message: '请输入包装单位', trigger: 'blur'}
+        ],
+        prepnUnit: [
+          {required: true, message: '请输入制剂单位', trigger: 'blur'}
+        ],
+        // packRatio: [
+        //   {required: true, message: '请输入包装比例', trigger: 'blur'}
+        // ],
+        packMatrial: [
+          {required: true, message: '请输入包装材质', trigger: 'blur'}
+        ],
+        zczbhhzbapzbh: [
+          {required: true, message: '请输入批准文号', trigger: 'blur'}
+        ],
+        manufactory: [
+          {required: true, message: '生产企业不能为空', trigger: 'blur'}
+        ],
+        physicType: [
+          {required: true, message: '药品类型不能为空', trigger: 'blur'}
+        ],
+        ybbm: [
+          {required: true, message: '医保编码不能为空', trigger: 'blur'}
+        ],
+        price: [
+          {required: true, message: '药品价格不能为空', trigger: 'blur'}
+        ],
+        majorStatus: [
+          {required: true, message: '请选择药品状态', trigger: 'blur'}
+        ],
+        distributeLevel: [
+          {required: true, message: '请选择计量单位', trigger: 'blur'}
+        ],
+        distributeMaxLevel: [
+          {required: true, message: '请选择允许采集的最大层级', trigger: 'blur'}
+        ],
+        useLevel: [
+          {required: true, message: '请选择计量单位', trigger: 'blur'}
+        ],
+        useMaxLevel: [
+          {required: true, message: '请选择允许采集的最大层级', trigger: 'blur'}
+        ],
+      },
+      detailList: [
+        // 初始化一个空对象或包含默认值的对象
+        {
+          productId: null,
+          nameCode: '',
+          packLevel: null,
+          bhxjsl: null,
+          isDisabled: false,
+          isUpDisabled: true,
+          rowDisabled: false
+        }
+      ],
+      status: false,
+      rowDisabled: false,
       selectedIndex: null,
-      isdisabled: false
+      isSave: true,
+      loading: false,
+      tollProjectDialogVisible: false,
+      sysList: [],
+      chooseHouseDrugVisible: false,
+      isImport: false,
+      defaultSys: null,
+      levelUnitList: [],
+      maxLevel: 1,
     }
-  },
 
+  },
   methods: {
     classifyChange() {
-      this.classifySearch(this.editQuery.flbm)
-      let item = this.classifyList.find(item => item.code == this.editQuery.flbm)
-      if (item != null) this.editQuery.requireScanCode = item.requireScanCode;
+      this.classifyChange(this.newProductData.flbm)
+      let item = this.classifyList.find(item => item.code == this.newProductData.flbm)
+      if (item != null) this.newProductData.requireScanCode = item.requireScanCode
     },
     classifySearch(key) {
       let query = {
-        key: key,
+        key: key
       }
       filterClassify(query)
         .then(response => {
-          this.loading = false;
-          this.classifyList = response.data.list || [];
+          this.loading = false
+          this.classifyList = response.data.list || []
         })
         .catch(() => {
-          this.loading = false;
-          this.classifyList = [];
-        });
+          this.loading = false
+          this.classifyList = []
+        })
     },
-    getYbHcData() {
+    getYbDrugData() {
       let query = {
-        specificationCode: this.editQuery.ybbm
-      };
-      getYbHcflDetail(query).then((response) => {
+        goodsCode: this.newProductData.ybbm
+      }
+      getYbDrugDetail(query).then((response) => {
         if (response.code == 20000) {
-          this.ybHcflDetail = response.data
-          this.editQuery.catalogcode = this.ybHcflDetail.catalogcode
-          this.editQuery.catalogname1 = this.ybHcflDetail.catalogname1
-          this.editQuery.catalogname2 = this.ybHcflDetail.catalogname2
-          this.editQuery.catalogname3 = this.ybHcflDetail.catalogname3
-          this.editQuery.matrial = this.ybHcflDetail.matrial
-          this.$forceUpdate();
+          this.ybDrugDetail = response.data
+          //对照关系
+          this.newProductData.prepnSpec = this.ybDrugDetail.realityOutlook
+          this.newProductData.zczbhhzbapzbh = this.ybDrugDetail.approvalCode
+          this.newProductData.cpmctymc = this.ybDrugDetail.registeredProductName
+          this.newProductData.spmc = this.ybDrugDetail.goodsName
+          this.newProductData.bzgg = this.ybDrugDetail.factor + this.ybDrugDetail.minUnit + "/" + this.ybDrugDetail.unit
+          this.newProductData.matrial = this.ybDrugDetail.materialName
+          this.newProductData.packMatrial = this.ybDrugDetail.materialName
+          this.newProductData.packUnit = this.ybDrugDetail.unit
+          this.newProductData.bhxjsl = this.ybDrugDetail.factor
+          this.newProductData.manufactory = this.ybDrugDetail.companyNameSc
+          this.newProductData.prepnUnit = this.ybDrugDetail.realityMedicinemodel
+
+          if (this.ybDrugDetail.productInsuranceType != "" && this.ybDrugDetail.productInsuranceType != null) {
+            if ("甲" == this.ybDrugDetail.productInsuranceType) {
+              this.newProductData.medicareType = 1
+            } else if ("乙" == this.ybDrugDetail.productInsuranceType) {
+              this.newProductData.medicareType = 2
+            } else if ("丙" == this.ybDrugDetail.productInsuranceType) {
+              this.newProductData.medicareType = 3
+            } else {
+              this.newProductData.medicareType = null
+            }
+            console.log(this.newProductData.medicareType)
+
+          }
+
+          this.$forceUpdate()
         } else {
-          this.editQuery.catalogcode = ""
-          this.editQuery.catalogname1 = ""
-          this.editQuery.catalogname2 = ""
-          this.editQuery.catalogname3 = ""
-          this.editQuery.matrial = ""
-          this.$forceUpdate();
+          // this.$forceUpdate()
         }
       }).catch(() => {
       })
 
     },
-    onClose() {
-      this.$emit("onClose")
-    },
-    submitUploadDrug(){
-      var data = {
-        id: this.editQuery.prid,
-        uid: this.editQuery.rlId,
-        sptm: this.editQuery.sptm,
-        spmc: this.editQuery.spmc,
-        bzgg: this.editQuery.bzgg,
-        packMatrial: this.editQuery.packMatrial,
-        packRatio: this.editQuery.packRatio,
-        zczbhhzbapzbh: this.editQuery.registerNo,
-        manufactory: this.editQuery.manufactory,
-        physicType: this.editQuery.physicType,
-        majorType: this.editQuery.majorType,
-        ybbm: this.editQuery.ybbm,
-        medicareType: this.editQuery.medicareType,
-        packUnit: this.editQuery.packUnit,
-        price: this.editQuery.price,
-        indate: this.editQuery.indate,
-        storageCondition: this.editQuery.storageCondition,
-        transportCondition: this.editQuery.transportCondition,
-        tyshxydm: this.editQuery.tyshxydm,
-        majorStatus: this.editQuery.majorStatus,
-        cpms: this.editQuery.cpms,
-        relSupId: this.editQuery.id,
-        //参数设置
-        distributeLevelDi: this.editQuery.distributeLevelDi,
-        distributeLevelUnit: this.editQuery.distributeLevelUnit,
-        useLevelDi: this.editQuery.useLevelDi,
-        useLevelUnit: this.editQuery.useLevelUnit,
-        distributeLevelCount: this.editQuery.distributeLevelCount,
-        useLeverCount: this.editQuery.useLeverCount,
-        basicPrductRemak1: this.editQuery.basicPrductRemak1,
-        basicPrductRemak2: this.editQuery.basicPrductRemak2,
-        basicPrductRemak3: this.editQuery.basicPrductRemak3,
-        basicPrductRemak4: this.editQuery.basicPrductRemak4,
-        basicPrductRemak5: this.editQuery.basicPrductRemak5,
-        basicPrductRemak6: this.editQuery.basicPrductRemak6,
-        basicPrductRemak7: this.editQuery.basicPrductRemak7,
-        basicPrductRemak8: this.editQuery.basicPrductRemak8,
-        catalogcode: this.editQuery.catalogcode,
-        catalogname1: this.editQuery.catalogname1,
-        catalogname2: this.editQuery.catalogname2,
-        catalogname3: this.editQuery.catalogname3,
+    saveNewProduct() {
+      if (!this.isSave) {
+        return this.$message.error("请先保存药品层级")
       }
-      updateDrugProductById(data).then(res => {
-        if (res.code == 20000) {
-          this.closeDialog();
-        } else {
-          this.$message.error(res.message);
-        }
-      })
-
-    },
+      this.addProductDialogVisible = false
+      this.newProductData.registerNo = this.newProductData.zczbhhzbapzbh
+      this.newProductData.splitEnable = true
+      this.newProductData.autoCode = true
+      // this.newProductData.updateLevelDrugRequests = this.detailList
+      //新增
+      if (this.type == 1) {
+        this.$refs['dataForm'].validate((valid) => {
+          if (valid) {
+            if (this.status) {
+              this.newProductData.requireScanCode = 1
+            } else {
+              this.newProductData.requireScanCode = 0
+            }
 
-    submitUpload() {
-      var data = {
-        id: this.editQuery.prid,
-        uid: this.editQuery.rlId,
-        sptm: this.editQuery.sptm,
-        spmc: this.editQuery.spmc,
-        measname: this.editQuery.measname,
-        manufactory: this.editQuery.manufactory,
-        price: this.editQuery.price,
-        cpms: this.editQuery.cpms,
-        ybbm: this.editQuery.ybbm,
-        purType: this.editQuery.purType,
-        attributeType: this.editQuery.attributeType,
-        hcType: this.editQuery.hcType,
-        isStack: this.editQuery.isStack,
-        overStockNum: this.editQuery.overStockNum,
-        lowStockNum: this.editQuery.lowStockNum,
-        recentDateTime: this.editQuery.recentDateTime,
-        isDateBy: this.editQuery.isDateBy,
-        relSupId: this.editQuery.id,
-        groupBuy: this.editQuery.groupBuy,
-        basicPrductRemak1: this.editQuery.basicPrductRemak1,
-        basicPrductRemak2: this.editQuery.basicPrductRemak2,
-        basicPrductRemak3: this.editQuery.basicPrductRemak3,
-        basicPrductRemak4: this.editQuery.basicPrductRemak4,
-        basicPrductRemak5: this.editQuery.basicPrductRemak5,
-        basicPrductRemak6: this.editQuery.basicPrductRemak6,
-        basicPrductRemak7: this.editQuery.basicPrductRemak7,
-        basicPrductRemak8: this.editQuery.basicPrductRemak8,
-        catalogcode: this.editQuery.catalogcode,
-        catalogname1: this.editQuery.catalogname1,
-        catalogname2: this.editQuery.catalogname2,
-        catalogname3: this.editQuery.catalogname3,
-        matrial: this.editQuery.matrial,
-      }
+            if (this.detailList.length <= 0) {
+              this.$message.error('请先添加药品层级标识')
+              return
+            } else {
+              const validateItem = (item, fieldName, errorMessage) => {
+                if (!item[fieldName]) {
+                  this.$message.error(errorMessage)
+                  return false
+                }
+                return true
+              }
+              for (let i = 0; i < this.detailList.length; i++) {
+                const item = this.detailList[i]
+                if (!validateItem(item, 'nameCode', '药品层级标识不能为空！') ||
+                  !validateItem(item, 'packLevel', '包装级别不能为空') ||
+                  !validateItem(item, 'packUnit', '层级单位不能为空')) {
+                  return
+                }
+              }
+              const isLevel1 = this.detailList.some(item => item.packLevel === 1)
+              if (!isLevel1) {
+                this.$message.error('药品层级缺少一级标识！')
+              }
+              this.newProductData.drugLevelLists = this.detailList
 
-      updateById(data).then(res => {
-        if (res.code == 20000) {
-          this.closeDialog();
-        } else {
-          this.$message.error(response.message);
-        }
-      })
+            }
+            this.saveLoading = true
 
-    },
-    getThirdSysDetail() {
-      let query = {
-        id: this.editQuery.rlId,
-      };
-      thirdSysDetail(query)
-        .then((response) => {
-          this.loading = false;
-          this.sysList = response.data.list || [];
-        })
-        .catch(() => {
-          this.loading = false;
-          this.sysList = [];
-        });
-    },
-    addSelectErp(row) {
-      this.defaultSys = row.sysId;
-      this.isImport = false;
-      this.relId = this.editQuery.rlId;
-      this.thisData = this.editQuery;
-      this.selectErpDialogVisible = true;
-    },
-    removeErp(row) {
-      this.$confirm("此操作将解除该绑定产品信息, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          let query = {
-            relId: this.editQuery.rlId,
-            thirdSys: row.sysId
-          };
-          removeRl(query)
-            .then((response) => {
-              if (response.code == 20000) {
-                this.$message({
-                  type: "success",
-                  message: "删除成功！",
-                });
-                this.getThirdSysDetail();
+            addDrug(this.newProductData).then((res) => {
+              this.saveLoading = false
+              if (res.code == 20000) {
+                this.$message.success('添加成功')
+                //清空弹窗数据
+                this.closeDialog()
               } else {
-                this.$message.error(response.message);
+                this.$message.error(res.message)
               }
+            }).catch((error) => {
+              this.saveLoading = false
+              this.$message.error(error.message)
             })
-            .catch(() => {
-            });
-        })
-        .catch(() => {
-        });
-    },
-    removeDi() {
-      this.$confirm("此操作将解除该绑定DI器械信息, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          let query = {
-            relId: this.editQuery.rlId,
-          };
-          removeDiRl(query)
-            .then((response) => {
-              if (response.code == 20000) {
-                this.$message({
-                  type: "success",
-                  message: "删除成功！",
-                });
-                this.editDialogVisible = false;
-                this.closeDialog();
-              } else {
-                this.$message.error(response.message);
-              }
-            })
-            .catch(() => {
-            });
-        })
-        .catch(() => {
-        });
-    },
-    getDetailList(detailQuery) {
-      this.loading = true;
-      filterByUuid(detailQuery)
-        .then((response) => {
-          this.loading = false;
-          this.detailList = response.data || [];
-        })
-        .catch(() => {
-          this.loading = false;
-          this.detailList = [];
-        });
-    },
-    closeUdi2() {
-      this.selectUdiDialogVisible = false;
-      this.selectErpDialogVisible = false;
-      this.selectLocalVisible = false;
-      this.selectVersionVisible = false;
-      this.getThirdSysDetail();
-    },
-
-    findHsflMethod(query) {
-      this.hsflOptions = [];
-      let cQuery = {
-        key: query,
-        page: 1,
-        limit: 20
-      };
-      getHslbs(cQuery)
-        .then((response) => {
-          this.loading = false;
-          this.hsflOptions = response.data.list || [];
+          }
         })
-        .catch(() => {
-          this.loading = false;
-        });
-    },
-
-    findThrTypeMethod(query) {
-      this.thrTypeOptions = [];
-      let cQuery = {
-        key: query,
-        page: 1,
-        limit: 20
-      };
-      getThrProductType(cQuery)
-        .then((response) => {
-          this.loading = false;
-          this.thrTypeOptions = response.data.list || [];
+      } else {
+        this.$refs['dataForm'].validate((valid) => {
+          if (!valid) {
+            return this.$message.error('请补充必要数据')
+          }
+          if (this.status) {
+            this.newProductData.requireScanCode = 1
+          } else {
+            this.newProductData.requireScanCode = 0
+          }
+          this.newProductData.uuid = this.rowData.uuid
+          this.newProductData.nameCode = this.rowData.nameCode
+          this.newProductData.relId = this.newProductData.id
+          updatetDrug(this.newProductData).then(res => {
+            this.saveLoading = false
+            if (res.code == 20000) {
+              //清空弹窗数据
+              this.closeDialog()
+              this.$message.success('保存成功')
+            } else {
+              this.$message.error(res.message)
+            }
+          })
         })
-        .catch(() => {
-          this.loading = false;
-        });
-    },
-    distributeLevelDiChange(val) {
-
-      const matchingItem = this.detailList.find(item => item.nameCode == val);
-      if (matchingItem) {
-        this.editQuery.distributeLevelUnit = matchingItem.packUnit;
-      }
-    },
-    useLevelDiChange(val) {
-      const matchingItem = this.detailList.find(item => item.nameCode == val);
-      if (matchingItem) {
-        this.editQuery.useLevelUnit = matchingItem.packUnit;
       }
+
     },
-    closeAddDialog(){
+    closeAddDialog() {
       this.closeDialog()
     },
-    addDrugLevel() {
-      this.detailList.push({
-        nameCode: '',
-        packLevel: null,
-        bhxjsl: null,
-        isDisabled: false,
-        rowDisabled: false,
-        isUpDisabled: true
-      });
-    },
 
     //层级保存
     levelSave(row) {
-      if (row.nameCode == null) {
-        this.$message.error("层级标识不能为空");
+      if (isBlank(row.nameCode)) {
+        this.$message.error('层级标识不能为空')
         return
       }
-      if (row.packLevel == null) {
-        this.$message.error("包装级别不能为空");
+      if (isBlank(row.packLevel)) {
+        this.$message.error('包装级别不能为空')
         return
       }
-      if (row.packUnit == null) {
-        this.$message.error("层级单位不能为空");
+      if (isBlank(row.packUnit)) {
+        this.$message.error('层级单位不能为空')
         return
       }
       let editQuery = {
@@ -1181,22 +1000,49 @@ export default {
         sjcpbm: row.sjcpbm,
         bhxjcpbm: row.bhxjcpbm,
         bhxjsl: row.bhxjsl,
-        relId: this.editQuery.rlId,
-        uuid: this.editQuery.uuid
+        relId: this.newProductData.id,
+        uuid: this.newProductData.uuid,
+        productId: row.productId,
+        diType: row.diType,
+        xjdw: row.xjdw
       }
       updateLevelDrug(editQuery).then(res => {
         this.saveLoading = false
         if (res.code == 20000) {
-          this.$message.success("保存成功！");
-          if (this.editQuery.id != null)
-            this.getDetailList();
+          this.isSave = true
+          this.$message.success('保存成功！')
+          this.selectedIndex = null
+          this.getDetailList()
+          this.getDiLevel();
         } else {
+          this.isSave = true
           this.$message.error(res.message)
         }
       })
     },
+    update(row) {
+      row.isDisabled = false
+      row.isUpDisabled = true
+      row.rowDisabled = false
+    },
+    addDrugLevel() {
+      this.detailList.push({
+        nameCode: '',
+        packLevel: null,
+        bhxjsl: null,
+        isDisabled: false,
+        rowDisabled: false,
+        isUpDisabled: true
+      })
+      this.newProductData.productId = null
+      this.selectedIndex = this.detailList.length - 1
+      this.isSave = false
+    },
+
     rowChange(index, val) {
-      this.selectedIndex = index;
+      this.selectedIndex = index
+
+      this.isSave = false
     },
 
     deleteLevel(index, row) {
@@ -1205,44 +1051,212 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        let params = {nameCode: row.nameCode};
-        delDrugLevel(params).then((res) => {
-          if (res.code === 20000) {
-            this.$message.success("删除成功");
-            this.getList();
+        if (row.id != null) {
+          let params = {nameCode: row.nameCode}
+          delDrugLevel(params).then((res) => {
+            if (res.code === 20000) {
+              this.isSave = true
+              this.$message.success('删除成功')
+              this.getDetailList()
+              this.getDiLevel()
+              this.newProductData.distributeLevel = null
+              this.newProductData.distributeMaxLevel = null
+              this.newProductData.useLevel = null
+              this.newProductData.useMaxLevel = null
+            }
+          })
+        } else {
+          this.isSave = true
+          this.detailList.splice(index, 1)
+          this.$message.success('删除成功')
+        }
+      }).catch(() => {
+      })
+    },
+
+    //获取层级标识
+    getDetailList() {
+      if (this.newProductData.uuid != null) {
+
+        let query = {
+          uuid: this.newProductData.uuid,
+          id: this.newProductData.rlId,
+          nameCode: this.newProductData.nameCode,
+          productType: this.newProductData.productsType,
+        }
+        this.loading = true
+        console.log("djdjd",query)
+        filterByUuid(query)
+          .then((response) => {
+            this.loading = false
+            this.detailList = response.data || []
+          })
+          .catch(() => {
+            this.loading = false
+            this.detailList = []
+          })
+      }
+    },
+
+    distributeLevelDiChange(val) {
+      const matchingItem = this.detailList.find(item => item.nameCode == val)
+      if (matchingItem) {
+        this.newProductData.distributeLevelUnit = matchingItem.packUnit
+        this.newProductData.distributeLevel = matchingItem.packLevel
+      }
+      calculateDistCount(matchingItem).then((res) => {
+        this.newProductData = {
+          ...this.newProductData,
+          distributeLevelCount: res.data.distributeLevelCount
+        }
+      })
+
+    },
+    useLevelDiChange(val) {
+      const matchingItem = this.detailList.find(item => item.nameCode == val)
+      if (matchingItem) {
+        this.newProductData.useLevelUnit = matchingItem.packUnit
+        this.newProductData.useLevel = matchingItem.packLevel
+      }
+      calculateUseCount(matchingItem).then((res) => {
+        this.newProductData = {
+          ...this.newProductData,
+          useLeverCount: res.data.useLeverCount
+        }
+      })
+    },
+    getDiLevel() {
+      let query = {
+        id: this.newProductData.rlId
+      }
+      this.loading = true
+      levelByUuid(query)
+        .then((response) => {
+          this.loading = false
+          this.levelUnitList = response.data || []
+          this.findMaxLevelObject()
+        })
+        .catch(() => {
+          this.loading = false
+          this.levelUnitList = []
+        })
+    },
+
+    findMaxLevelObject() {
+      this.maxLevel = 1;
+      for (const obj of this.levelUnitList) {
+        if (obj.packLevel > this.maxLevel) {
+          this.maxLevel = Number(obj.packLevel);
+        }
+      }
+    },
+
+    /**
+     * 选择收费项目
+     */
+    selectPayFeecode() {
+      this.tollProjectDialogVisible = true
+    },
+
+    getData(data) {
+      this.tollProjectDialogVisible = false
+      this.newProductData.payFeeCode = data.medCatalogCode
+    },
+    /**
+     * 第三方系统药品信息
+     */
+    getThirdSysDetail() {
+      let query = {
+        id: this.relevanceEdit.id
+      }
+      thirdSysDetail(query)
+        .then((response) => {
+          this.loading = false
+          this.sysList = response.data.list || []
+          this.resetThirdId()
+        })
+        .catch(() => {
+          this.loading = false
+          this.sysList = []
+        })
+    },
+    resetThirdId() {
+      this.sysList.forEach((item) => {
+        if (item.sysId === 'thirdId') {
+          this.newProductData.thirdId = item.thirdId
+        } else if (item.sysId === 'thirdId1') {
+          this.newProductData.thirdId1 = item.thirdId
+        } else if (item.sysId === 'thirdId2') {
+          this.newProductData.thirdId2 = item.thirdId
+        } else if (item.sysId === 'thirdId3') {
+          this.newProductData.thirdId3 = item.thirdId
+        } else if (item.sysId === 'thirdId4') {
+          this.newProductData.thirdId4 = item.thirdId
+        }
+      })
+    },
+    /**
+     * 关联 第三方
+     */
+    addSelectErp(row) {
+      this.defaultSys = row.sysId
+      this.isImport = false
+      this.chooseHouseDrugVisible = true
+    },
+    removeErp(row) {
+      this.$confirm('此操作将解除该绑定药品信息, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          let query = {
+            relId: this.relId,
+            thirdSys: row.sysId
           }
+          removeRl(query)
+            .then((response) => {
+              if (response.code == 20000) {
+                this.$message({
+                  type: 'success',
+                  message: '解绑成功！'
+                })
+                this.getThirdSysDetail()
+              } else {
+                this.$message.error(response.message)
+              }
+            })
+            .catch(() => {
+            })
+        })
+        .catch(() => {
         })
-      }).catch(() => {
-      });
     },
+    closeUdi(val) {
+      this.chooseHouseDrugVisible = false
+      this.getThirdSysDetail()
+    }
 
   },
-  components: {
-    selectErp
-  },
   created() {
-    console.log("type ",this.type )
-    if(this.type == 2){
-      this.isdisabled = true
+    if (this.rowData != null) {
+      this.newProductData = this.rowData
+      console.log("和水水水水",this.newProductData)
+      this.newProductData.cpmctymc = this.rowData.cpmctymc
+      this.newProductData.zczbhhzbapzbh = this.rowData.zczbhhzbapzbh
+      if (this.rowData.requireScanCode == 1) {
+        this.status = true
+      } else {
+        this.status = false
+      }
+      this.getDiLevel()
+      this.getDetailList()
+      this.getThirdSysDetail()
+    } else {
+      this.selectedIndex = 0
     }
-    this.editQuery.registerNo = this.editQuery.zczbhhzbapzbh
-    this.getThirdSysDetail();
-    var ttquery = {
-      id: this.editQuery.rlId,
-      page: 1,
-      limit: 10,
-    };
-    this.getDetailList(ttquery);
-    // if (this.editQuery.basicPrductRemak8 != null) {
-    this.findHsflMethod(this.editQuery.basicPrductRemak8);
-    // }
-    // if (this.editQuery.basicPrductRemak7 != null) {
-    this.findThrTypeMethod(this.editQuery.basicPrductRemak7);
-    // }
-    this.classifySearch()
-
-    console.log("editQuery:", this.editQuery)
-  }, directives: {
+  },
+  directives: {
     'debounce-input': {
       inserted(el, binding) {
         let timeout
@@ -1259,6 +1273,20 @@ export default {
 </script>
 
 <style scoped>
+.form-title {
+  font-size: 16px;
+  font-family: Noto Sans SC;
+  font-weight: bold;
+  color: #303133;
+  padding-bottom: 17px;
+  padding-top: 17px;
+}
 
-</style>
+.form-title2 {
+  font-size: 16px;
+  font-family: Noto Sans SC;
+  font-weight: bold;
+  color: #303133;
+}
 
+</style>