diff --git a/src/views/basic/product/drug/drugAdd.vue b/src/views/basic/product/drug/drugAdd.vue
index 007b496..f1126c0 100644
--- a/src/views/basic/product/drug/drugAdd.vue
+++ b/src/views/basic/product/drug/drugAdd.vue
@@ -79,6 +79,7 @@
                 <el-input size="small" v-model="scope.row.packLevel" style="width: 100%"
                           type="number"
                           :disabled="scope.$index !== selectedIndex"
+                          @input="handleInput(scope.$index, $event,1)"
                 ></el-input>
               </template>
             </el-table-column>
@@ -94,6 +95,7 @@
                 <el-input size="small" v-model="scope.row.bhxjsl" style="width: 100%"
                           type="number"
                           :disabled="scope.$index !== selectedIndex"
+                          @input="handleInput(scope.$index, $event,1)"
                 ></el-input>
               </template>
             </el-table-column>
@@ -157,6 +159,7 @@
                 <el-select v-model="newProductData.distributeLevel" size="small" style="width: 90%"
                            @change="distributeLevelDiChange"
                            placeholder="请选择计量单位"
+
                 >
                   <el-option
                     v-for="item in levelUnitList"
@@ -699,15 +702,15 @@ export default {
         distributeLevel: [
           {required: true, message: '请选择计量单位', trigger: 'blur'}
         ],
-        distributeMaxLevel: [
-          {required: true, message: '请选择允许采集的最大层级', trigger: 'blur'}
-        ],
+        // distributeMaxLevel: [
+        //   {required: true, message: '请选择允许采集的最大层级', trigger: 'blur'}
+        // ],
         useLevel: [
           {required: true, message: '请选择计量单位', trigger: 'blur'}
         ],
-        useMaxLevel: [
-          {required: true, message: '请选择允许采集的最大层级', trigger: 'blur'}
-        ],
+        // useMaxLevel: [
+        //   {required: true, message: '请选择允许采集的最大层级', trigger: 'blur'}
+        // ],
       },
       detailList: [
         // 初始化一个空对象或包含默认值的对象
@@ -864,7 +867,6 @@ export default {
           }
         })
       } else {
-        this.setDefaultLevel()
         this.$refs['dataForm'].validate((valid) => {
           if (!valid) {
             return this.$message.error('请补充必要数据')
@@ -1089,22 +1091,22 @@ export default {
 
 
     //设置层级
-    setDefaultLevel(){
-      //判断流通 最大层级
-      if (this.newProductData.distributeMaxLevel == null){
-        let levelUnit = this.levelUnitList[this.levelUnitList.length - 1];
-        this.newProductData.distributeMaxLevel = levelUnit.packLevel
-      }
-      // 判断使用 采集最大层级
-      if (this.newProductData.useMaxLevel == null){
-        //获取获取第一个 如果packUnit且为null的话就设置第二个
-        let levelUnit = this.levelUnitList[0];
-        if (isBlank(levelUnit.packUnit)){
-          levelUnit = this.levelUnitList[1]
-        }
-        this.newProductData.useMaxLevel = levelUnit.packLevel
-      }
-    },
+    // setDefaultLevel(){
+    //   //判断流通 最大层级
+    //   if (this.newProductData.distributeMaxLevel == null){
+    //     let levelUnit = this.levelUnitList[this.levelUnitList.length - 1];
+    //     this.newProductData.distributeMaxLevel = levelUnit.packLevel
+    //   }
+    //   // 判断使用 采集最大层级
+    //   if (this.newProductData.useMaxLevel == null){
+    //     //获取获取第一个 如果packUnit且为null的话就设置第二个
+    //     let levelUnit = this.levelUnitList[0];
+    //     if (isBlank(levelUnit.packUnit)){
+    //       levelUnit = this.levelUnitList[1]
+    //     }
+    //     this.newProductData.useMaxLevel = levelUnit.packLevel
+    //   }
+    // },
     //获取层级标识
     getDetailList() {
       if (this.newProductData.uuid != null) {
@@ -1118,7 +1120,7 @@ export default {
         filterByUuid(query)
           .then((response) => {
             this.loading = false
-            this.detailList = response.data.list || []
+            this.detailList = response.data || []
           })
           .catch(() => {
             this.loading = false
@@ -1264,13 +1266,22 @@ export default {
     closeUdi(val) {
       this.chooseHouseDrugVisible = false
       this.getThirdSysDetail()
+    },
+    handleInput(index, value,type){
+      const intValue = parseInt(value, 10);
+      // 更新行的数据
+      if (type == 1){
+        this.$set(this.detailList[index], 'packLevel', intValue);
+      }else {
+        this.$set(this.detailList[index], 'bhxjsl', intValue);
+      }
+
     }
 
   },
   created() {
     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) {
diff --git a/src/views/supplier/companyDrug/basicCompanyDrugProducts.vue b/src/views/supplier/companyDrug/basicCompanyDrugProducts.vue
index c5dbd24..1cdbe60 100644
--- a/src/views/supplier/companyDrug/basicCompanyDrugProducts.vue
+++ b/src/views/supplier/companyDrug/basicCompanyDrugProducts.vue
@@ -712,12 +712,14 @@ export default {
         unionCode: null,
         udiCode: null,
         ylqxzcrbarmc: "",
-        cpmctymc: "", thrPiId: null,
+        cpmctymc: "",
+        thrPiId: null,
         nameCode: "",
         ggxh: null,
         page: 1,
         limit: 20,
         addType: 1,
+        productType: 2
       };
       this.getList();
     },
diff --git a/src/views/supplier/companyDrug/basicCompanyproductEdit.vue b/src/views/supplier/companyDrug/basicCompanyproductEdit.vue
index 32be21e..e121722 100644
--- a/src/views/supplier/companyDrug/basicCompanyproductEdit.vue
+++ b/src/views/supplier/companyDrug/basicCompanyproductEdit.vue
@@ -3,7 +3,7 @@
     <el-form :model="newProductData" :rules="formRules" label-width="140px" ref="dataForm">
 
       <el-collapse v-model="activeNames">
-        <el-collapse-item name="0" >
+        <el-collapse-item name="0">
           <template slot="title">
             <p class="form-title">第三方信息</p>
           </template>
@@ -67,7 +67,8 @@
               <template slot-scope="scope">
                 <el-select v-model="scope.row.diType"
                            :disabled="scope.$index !== selectedIndex"
-                           style="width: 90%" placeholder="选择标识类型" clearable>
+                           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>-->
@@ -80,6 +81,7 @@
                 <el-input size="small" v-model="scope.row.packLevel" style="width: 100%"
                           type="number"
                           :disabled="scope.$index !== selectedIndex"
+                          @input="handleInput(scope.$index, $event,1)"
                 ></el-input>
               </template>
             </el-table-column>
@@ -95,6 +97,7 @@
                 <el-input size="small" v-model="scope.row.bhxjsl" style="width: 100%"
                           type="number"
                           :disabled="scope.$index !== selectedIndex"
+                          @input="handleInput(scope.$index, $event,2)"
                 ></el-input>
               </template>
             </el-table-column>
@@ -120,7 +123,7 @@
               </template>
             </el-table-column>
 
-            <el-table-column label="操作" width="180px" fixed="right"  v-if="type != 2">
+            <el-table-column label="操作" width="180px" 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)"
@@ -148,105 +151,105 @@
             </el-table-column>
           </el-table>
 
-<!--          <template>-->
-<!--            <p class="form-title2">流通时采用的计量单位设置</p>-->
-<!--          </template>-->
-<!--          <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-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>-->
+          <!--          <template>-->
+          <!--            <p class="form-title2">流通时采用的计量单位设置</p>-->
+          <!--          </template>-->
+          <!--          <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-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">
@@ -572,45 +575,45 @@
 
         <!--          </el-row>-->
         <!--        </el-collapse-item>-->
-        <el-collapse-item name="4">
-          <template slot="title">
-            <p class="form-title">高级设置</p>
-          </template>
-          <el-row type="flex">
-            <el-col :span="11" class="el-col">
-              <span>参数</span>
-            </el-col>
-            <el-divider direction="vertical"></el-divider>
-            <el-col :span="11" class="el-col">
-              <span>设置</span>
-            </el-col>
-            <el-divider direction="vertical"></el-divider>
-            <el-col :span="11" class="el-col">
-              <span>参数设置说明</span>
-            </el-col>
-          </el-row>
-          <el-row type="flex">
-            <el-col :span="11" class="el-col">
-              <span class="sptext">是否禁用</span>
-            </el-col>
-            <el-divider direction="vertical"></el-divider>
-            <el-col :span="11" class="el-col">
-              <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">
-              <span class="sptext">禁用后该药品将无法扫码使用</span>
-            </el-col>
-          </el-row>
-        </el-collapse-item>
+        <!--<el-collapse-item name="4">-->
+        <!--  <template slot="title">-->
+        <!--    <p class="form-title">高级设置</p>-->
+        <!--  </template>-->
+        <!--  <el-row type="flex">-->
+        <!--    <el-col :span="11" class="el-col">-->
+        <!--      <span>参数</span>-->
+        <!--    </el-col>-->
+        <!--    <el-divider direction="vertical"></el-divider>-->
+        <!--    <el-col :span="11" class="el-col">-->
+        <!--      <span>设置</span>-->
+        <!--    </el-col>-->
+        <!--    <el-divider direction="vertical"></el-divider>-->
+        <!--    <el-col :span="11" class="el-col">-->
+        <!--      <span>参数设置说明</span>-->
+        <!--    </el-col>-->
+        <!--  </el-row>-->
+        <!--  <el-row type="flex">-->
+        <!--    <el-col :span="11" class="el-col">-->
+        <!--      <span class="sptext">是否禁用</span>-->
+        <!--    </el-col>-->
+        <!--    <el-divider direction="vertical"></el-divider>-->
+        <!--    <el-col :span="11" class="el-col">-->
+        <!--      <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">-->
+        <!--      <span class="sptext">禁用后该药品将无法扫码使用</span>-->
+        <!--    </el-col>-->
+        <!--  </el-row>-->
+        <!--</el-collapse-item>-->
       </el-collapse>
     </el-form>
-    <div style="text-align: center; margin-top: 20px;"  v-if="type != 2">
+    <div style="text-align: center; margin-top: 20px;" v-if="type != 2">
       <el-button type="primary" @click="saveNewProduct" :loading="saveLoading">提交</el-button>
       <el-button @click="closeAddDialog">取消</el-button>
     </div>
@@ -670,16 +673,16 @@
       v-if="selectDrugLevelVisible"
     >
 
-      <el-form :model="filterQueryDrugLevel" class="query-form" label-width="100px" >
+      <el-form :model="filterQueryDrugLevel" class="query-form" label-width="100px">
         <el-row>
           <el-col :span="8">
             <el-form-item label="层级标识:">
-              <el-input v-model="filterQueryDrugLevel.nameCode"  placeholder="请输入层级标识" clearable></el-input>
+              <el-input v-model="filterQueryDrugLevel.nameCode" placeholder="请输入层级标识" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="通用名称:">
-              <el-input v-model="filterQueryDrugLevel.cpmctymc"  placeholder="请输入通用名称" clearable></el-input>
+              <el-input v-model="filterQueryDrugLevel.cpmctymc" placeholder="请输入通用名称" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -688,7 +691,11 @@
                         margin-bottom: 8px;
                         margin-right: 15px;"
             >
-              <el-button type="primary" icon="search" @click="handleCurrentChange"
+              <el-button type="primary" icon="search" @click="onResetDrugLevelList"
+                         style="text-align:right"
+              >重置
+              </el-button>
+              <el-button type="primary" icon="search" @click="getDrugLevelList"
                          style="text-align:right"
               >查询
               </el-button>
@@ -699,7 +706,7 @@
       </el-form>
 
       <el-table :data="selectDrugLevelList" style="width: 100%;   margin-bottom: 8px" key="2" border>
-        <el-table-column label="序号" type="index" ></el-table-column>
+        <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="层级标识" prop="nameCode" show-overflow-tooltip></el-table-column>
         <el-table-column label="药品类型" prop="type" show-overflow-tooltip></el-table-column>
         <el-table-column label="生产企业" prop="manufacturer" show-overflow-tooltip width="200px"></el-table-column>
@@ -712,7 +719,7 @@
         <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
-            <el-button type="text" @click="selectDrugLevelItem(scope.row)" >
+            <el-button type="text" @click="selectDrugLevelItem(scope.row)">
               选入
             </el-button>
           </template>
@@ -724,12 +731,12 @@
         :total="filterQueryDrugLevel.total"
         :page.sync="filterQueryDrugLevel.page"
         :limit.sync="filterQueryDrugLevel.limit"
-        @pagination="handleCurrentChange"
-
+        @pagination="selectDrugLevel"
       ></pagination>
     </el-dialog>
 
   </div>
+
 </template>
 
 <script>
@@ -738,15 +745,15 @@ import {
   updatetDrug,
   delDrugLevel,
   updateLevelDrug, calculateDistCount, calculateUseCount,
-  getDrugLevelList,getDrugLevelListBycode
+  getDrugLevelList, getDrugLevelListBycode
 } from '@/api/basic/product/drugUdiinfos'
-import {isBlank} from "@/utils/strUtil";
+import { isBlank } from '@/utils/strUtil'
 
 import {
   getYbDrugDetail, removeRl, thirdSysDetail
 } from '@/api/basic/product/udiRelevance'
-import {filterClassify} from '@/api/purchase/classifyCode'
-import {filterByUuid, levelByUuid} from '@/api/basic/product/udiInfo'
+import { filterClassify } from '@/api/purchase/classifyCode'
+import { filterByUuid, levelByUuid } from '@/api/basic/product/udiInfo'
 // import selectChargesProjectDialog from './selectChargesProjectDialog'
 // import chooseHouseDrug from './chooseHouseDrug'
 
@@ -822,53 +829,53 @@ export default {
       activeNames: ['0', '1', '2'],
       formRules: {
         cpmctymc: [
-          {required: true, message: '请输入药品通用名', trigger: 'blur'}
+          { required: true, message: '请输入药品通用名', trigger: 'blur' }
         ],
         prepnSpec: [
-          {required: true, message: '请输入制剂规格', trigger: 'blur'}
+          { required: true, message: '请输入制剂规格', trigger: 'blur' }
         ],
         packUnit: [
-          {required: true, message: '请输入包装单位', trigger: 'blur'}
+          { required: true, message: '请输入包装单位', trigger: 'blur' }
         ],
         prepnUnit: [
-          {required: true, message: '请输入制剂单位', trigger: 'blur'}
+          { required: true, message: '请输入制剂单位', trigger: 'blur' }
         ],
         // packRatio: [
         //   {required: true, message: '请输入包装比例', trigger: 'blur'}
         // ],
         packMatrial: [
-          {required: true, message: '请输入包装材质', trigger: 'blur'}
+          { required: true, message: '请输入包装材质', trigger: 'blur' }
         ],
         zczbhhzbapzbh: [
-          {required: true, message: '请输入批准文号', trigger: 'blur'}
+          { required: true, message: '请输入批准文号', trigger: 'blur' }
         ],
         manufactory: [
-          {required: true, message: '生产企业不能为空', trigger: 'blur'}
+          { required: true, message: '生产企业不能为空', trigger: 'blur' }
         ],
         physicType: [
-          {required: true, message: '药品类型不能为空', trigger: 'blur'}
+          { required: true, message: '药品类型不能为空', trigger: 'blur' }
         ],
         ybbm: [
-          {required: true, message: '医保编码不能为空', trigger: 'blur'}
+          { required: true, message: '医保编码不能为空', trigger: 'blur' }
         ],
         price: [
-          {required: true, message: '药品价格不能为空', trigger: 'blur'}
+          { required: true, message: '药品价格不能为空', trigger: 'blur' }
         ],
         majorStatus: [
-          {required: true, message: '请选择药品状态', trigger: 'blur'}
+          { required: true, message: '请选择药品状态', trigger: 'blur' }
         ],
         distributeLevel: [
-          {required: true, message: '请选择计量单位', trigger: 'blur'}
+          { required: true, message: '请选择计量单位', trigger: 'blur' }
         ],
         distributeMaxLevel: [
-          {required: true, message: '请选择允许采集的最大层级', trigger: 'blur'}
+          { required: true, message: '请选择允许采集的最大层级', trigger: 'blur' }
         ],
         useLevel: [
-          {required: true, message: '请选择计量单位', trigger: 'blur'}
+          { required: true, message: '请选择计量单位', trigger: 'blur' }
         ],
         useMaxLevel: [
-          {required: true, message: '请选择允许采集的最大层级', trigger: 'blur'}
-        ],
+          { required: true, message: '请选择允许采集的最大层级', trigger: 'blur' }
+        ]
       },
       detailList: [
         // 初始化一个空对象或包含默认值的对象
@@ -897,12 +904,12 @@ export default {
       selectDrugLevelVisible: false,
       selectDrugLevelList: [],
       filterQueryDrugLevel: {
-        nameCode: "",
-        cpmctymc: "",
+        nameCode: '',
+        cpmctymc: '',
         page: 1,
         limit: 20,
-        total: 0,
-      },
+        total: 0
+      }
     }
 
   },
@@ -938,7 +945,7 @@ export default {
           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.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
@@ -946,12 +953,12 @@ export default {
           this.newProductData.manufactory = this.ybDrugDetail.companyNameSc
           this.newProductData.prepnUnit = this.ybDrugDetail.realityMedicinemodel
 
-          if (this.ybDrugDetail.productInsuranceType != "" && this.ybDrugDetail.productInsuranceType != null) {
-            if ("甲" == this.ybDrugDetail.productInsuranceType) {
+          if (this.ybDrugDetail.productInsuranceType != '' && this.ybDrugDetail.productInsuranceType != null) {
+            if ('甲' == this.ybDrugDetail.productInsuranceType) {
               this.newProductData.medicareType = 1
-            } else if ("乙" == this.ybDrugDetail.productInsuranceType) {
+            } else if ('乙' == this.ybDrugDetail.productInsuranceType) {
               this.newProductData.medicareType = 2
-            } else if ("丙" == this.ybDrugDetail.productInsuranceType) {
+            } else if ('丙' == this.ybDrugDetail.productInsuranceType) {
               this.newProductData.medicareType = 3
             } else {
               this.newProductData.medicareType = null
@@ -970,7 +977,7 @@ export default {
     },
     saveNewProduct() {
       if (!this.isSave) {
-        return this.$message.error("请先保存药品层级")
+        return this.$message.error('请先保存药品层级')
       }
       this.addProductDialogVisible = false
       this.newProductData.registerNo = this.newProductData.zczbhhzbapzbh
@@ -1096,7 +1103,7 @@ export default {
           this.$message.success('保存成功！')
           this.selectedIndex = null
           this.getDetailList()
-          this.getDiLevel();
+          this.getDiLevel()
         } else {
           this.isSave = true
           this.$message.error(res.message)
@@ -1108,7 +1115,24 @@ export default {
       row.isUpDisabled = true
       row.rowDisabled = false
     },
-    selectDrugLevel(){
+    getDrugLevelList() {
+      this.filterQueryDrugLevel.page = 1
+      this.selectDrugLevel()
+    },
+    onResetDrugLevelList() {
+      this.$router.push({
+        path: ''
+      })
+      this.filterQueryDrugLevel = {
+        nameCode: '',
+        cpmctymc: '',
+        page: 1,
+        limit: 20,
+        total: 0
+      }
+      this.selectDrugLevel()
+    },
+    selectDrugLevel() {
       //获取分页列表
       getDrugLevelList(this.filterQueryDrugLevel).then((response) => {
         if (response.code == 20000) {
@@ -1119,20 +1143,20 @@ export default {
       }).catch(() => {
       })
     },
-    selectDrugLevelItem(row){
-      getDrugLevelListBycode({nameCode:row.nameCode}).then((response) => {
+    selectDrugLevelItem(row) {
+      getDrugLevelListBycode({ nameCode: row.nameCode }).then((response) => {
         if (response.code == 20000) {
-          if (response.data.length > 0){
-            response.data.forEach( item => {
+          if (response.data.length > 0) {
+            response.data.forEach(item => {
               //新增层级
-              let parts = item.bzgg.split('/');
+              let parts = item.bzgg.split('/')
               // 首先，根据 ':' 分割字符串
-              const ratioParts = item.packRatio.split(':');
-              let selectedValue;
+              const ratioParts = item.packRatio.split(':')
+              let selectedValue
               if (item.packLevel >= 0 && item.packLevel < ratioParts.length) {
-                selectedValue = ratioParts[item.packLevel];
+                selectedValue = ratioParts[item.packLevel]
               } else {
-                selectedValue = null; // 或者你可以设置一个默认值
+                selectedValue = null // 或者你可以设置一个默认值
               }
 
               let editQuery = {
@@ -1143,7 +1167,7 @@ export default {
                 relId: this.newProductData.id,
                 uuid: this.newProductData.uuid,
                 productId: item.productId,
-                diType: item.packLevel == 1?1:4,
+                diType: item.packLevel == 1 ? 1 : 4,
                 xjdw: item.xjdw
               }
               updateLevelDrug(editQuery).then(res => {
@@ -1154,7 +1178,7 @@ export default {
                     packLevel: item.packLevel,
                     packUnit: parts[1] || '',
                     bhxjsl: selectedValue,
-                    diType: item.packLevel == 1?1:4,
+                    diType: item.packLevel == 1 ? 1 : 4,
                     isDisabled: false,
                     rowDisabled: false,
                     isUpDisabled: true
@@ -1201,7 +1225,7 @@ export default {
         type: 'warning'
       }).then(() => {
         if (row.id != null) {
-          let params = {nameCode: row.nameCode}
+          let params = { nameCode: row.nameCode }
           delDrugLevel(params).then((res) => {
             if (res.code === 20000) {
               this.isSave = true
@@ -1231,10 +1255,10 @@ export default {
           uuid: this.newProductData.uuid,
           id: this.newProductData.rlId,
           nameCode: this.newProductData.nameCode,
-          productType: this.newProductData.productsType,
+          productType: this.newProductData.productsType
         }
         this.loading = true
-        console.log("djdjd",query)
+        console.log('djdjd', query)
         filterByUuid(query)
           .then((response) => {
             this.loading = false
@@ -1292,10 +1316,10 @@ export default {
     },
 
     findMaxLevelObject() {
-      this.maxLevel = 1;
+      this.maxLevel = 1
       for (const obj of this.levelUnitList) {
         if (obj.packLevel > this.maxLevel) {
-          this.maxLevel = Number(obj.packLevel);
+          this.maxLevel = Number(obj.packLevel)
         }
       }
     },
@@ -1384,6 +1408,18 @@ export default {
     closeUdi(val) {
       this.chooseHouseDrugVisible = false
       this.getThirdSysDetail()
+    },
+
+    //自动去除小数
+    handleInput(index, value,type){
+      const intValue = parseInt(value, 10);
+      // 更新行的数据
+      if (type == 1){
+        this.$set(this.detailList[index], 'packLevel', intValue);
+      }else {
+        this.$set(this.detailList[index], 'bhxjsl', intValue);
+      }
+
     }
 
   },