11/12 界面优化1.0

src/views/basic/product/drug/drugAdd.vue

@@ -66,7 +66,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>-->
@@ -524,6 +525,7 @@
       :close-on-press-escape="false"
       width="85%"
       v-if="selectDrugLevelVisible"
+      @close="closeSelectDrugLevelVisible"
     >
 
       <el-form :model="filterQueryDrugLevel" class="query-form" label-width="100px">
@@ -598,7 +600,7 @@ import {
   getDrugLevelList, getDrugLevelListBycode
 } from '@/api/basic/product/drugUdiinfos'
 import { getCodeRelDetail } from '@/api/basic/product/udiRelevance'
-import {isBlank} from "@/utils/strUtil";
+import { isBlank } from '@/utils/strUtil'
 
 import {
   getYbDrugDetail, removeRl, thirdSysDetail
@@ -648,12 +650,12 @@ export default {
       ybDrugDetail: {},
       productData: {},
       filterQueryDrugLevel: {
-        nameCode: "",
+        nameCode: '',
-        cpmctymc: "",
+        cpmctymc: '',
         page: 1,
         limit: 20,
         total: 0,
-        approvalNum:"",
+        approvalNum: ''
       },
       newProductData: {
         cpmctymc: null,
@@ -803,7 +805,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
@@ -811,12 +813,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 != '' && this.ybDrugDetail.productInsuranceType != null) {
-            if ("甲" == this.ybDrugDetail.productInsuranceType) {
+            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
@@ -835,7 +837,7 @@ export default {
     },
     saveNewProduct() {
       if (!this.isSave) {
-        return this.$message.error("请先保存药品层级")
+        return this.$message.error('请先保存药品层级')
       }
       this.addProductDialogVisible = false
       this.newProductData.registerNo = this.newProductData.zczbhhzbapzbh
@@ -969,15 +971,15 @@ export default {
           this.$message.success('保存成功！')
           this.selectedIndex = null
           this.getDetailList()
-          this.getDiLevel();
+          this.getDiLevel()
 
           //如果都为空 进行补充
           if (!this.$isNotBlank(this.newProductData.sptm) && !this.$isNotBlank(this.newProductData.ybbm)) {
             getCodeRelDetail({ drugCode: row.nameCode }).then((response) => {
               if (response.code == 20000) {
                 if (response.data != null && response.data.length > 0) {
-                    this.newProductData.sptm = response.data[0].sptm;
+                  this.newProductData.sptm = response.data[0].sptm
-                    this.newProductData.ybbm = response.data[0].ybbm;
+                  this.newProductData.ybbm = response.data[0].ybbm
                   this.getYbDrugData()
                 }
               }
@@ -1014,14 +1016,14 @@ export default {
           if (response.data.length > 0) {
             response.data.forEach(item => {
               //新增层级
-              let parts = item.bzgg.split('/');
+              let parts = item.bzgg.split('/')
               // 首先，根据 ':' 分割字符串
-              const ratioParts = item.packRatio.split(':');
+              const ratioParts = item.packRatio.split(':')
-              let selectedValue;
+              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 = {
@@ -1062,6 +1064,24 @@ export default {
       this.selectedIndex = this.detailList.length - 1
       this.isSave = false
       this.selectDrugLevelVisible = false
+      this.filterQueryDrugLevel = {
+        nameCode: '',
+        cpmctymc: '',
+        page: 1,
+        limit: 20,
+        total: 0,
+        approvalNum: ''
+      }
+    },
+    closeSelectDrugLevelVisible(){
+      this.filterQueryDrugLevel = {
+        nameCode: '',
+        cpmctymc: '',
+        page: 1,
+        limit: 20,
+        total: 0,
+        approvalNum: ''
+      }
     },
     handleCurrentChange() {
       this.selectDrugLevel()
@@ -1082,7 +1102,6 @@ export default {
 
     rowChange(index, val) {
 
-
       if (this.editRowSwitch == true) {
         this.$message.error('请先保存当前产品标识编辑')
         return
@@ -1122,7 +1141,6 @@ export default {
       })
     },
 
-
     //设置层级
     // setDefaultLevel(){
     //   //判断流通 最大层级
@@ -1147,7 +1165,7 @@ export default {
           uuid: this.newProductData.uuid,
           id: this.newProductData.id,
           nameCode: this.newProductData.nameCode,
-          productType: this.newProductData.productsType,
+          productType: this.newProductData.productsType
         }
         this.loading = true
         filterByUuid(query)
@@ -1207,10 +1225,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)
         }
       }
     },
@@ -1301,12 +1319,12 @@ export default {
       this.getThirdSysDetail()
     },
     handleInput(index, value, type) {
-      const intValue = parseInt(value, 10);
+      const intValue = parseInt(value, 10)
       // 更新行的数据
       if (type == 1) {
-        this.$set(this.detailList[index], 'packLevel', intValue);
+        this.$set(this.detailList[index], 'packLevel', intValue)
       } else {
-        this.$set(this.detailList[index], 'bhxjsl', intValue);
+        this.$set(this.detailList[index], 'bhxjsl', intValue)
       }
 
     }

src/views/supplier/companyDrug/basicCompanyproductEdit.vue

@@ -695,6 +695,7 @@
       :close-on-press-escape="false"
       width="85%"
       v-if="selectDrugLevelVisible"
+      @close="closeSelectDrugLevelVisible"
     >
 
       <el-form :model="filterQueryDrugLevel" class="query-form" label-width="100px">
@@ -1236,6 +1237,24 @@ export default {
       this.selectedIndex = this.detailList.length - 1
       this.isSave = false
       this.selectDrugLevelVisible = false
+      this.filterQueryDrugLevel = {
+        nameCode: '',
+        cpmctymc: '',
+        page: 1,
+        limit: 20,
+        total: 0,
+        approvalNum: ''
+      }
+    },
+    closeSelectDrugLevelVisible(){
+      this.filterQueryDrugLevel = {
+        nameCode: '',
+        cpmctymc: '',
+        page: 1,
+        limit: 20,
+        total: 0,
+        approvalNum: ''
+      }
     },
     addDrugLevel() {
       this.detailList.push({