From e9d527c0639fe5a6738f2c2c20f4d599308a06a9 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 12 Nov 2024 18:15:34 +0800
Subject: [PATCH] =?UTF-8?q?11/12=20=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=961.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/product/drug/drugAdd.vue      | 154 ++++++++++--------
 .../companyDrug/basicCompanyproductEdit.vue   |  19 +++
 2 files changed, 105 insertions(+), 68 deletions(-)

diff --git a/src/views/basic/product/drug/drugAdd.vue b/src/views/basic/product/drug/drugAdd.vue
index 60813c0..7009415 100644
--- a/src/views/basic/product/drug/drugAdd.vue
+++ b/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,18 +525,19 @@
       :close-on-press-escape="false"
       width="85%"
       v-if="selectDrugLevelVisible"
+      @close="closeSelectDrugLevelVisible"
     >
 
-      <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">
@@ -555,7 +557,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="approvalNum" show-overflow-tooltip></el-table-column>
@@ -569,7 +571,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>
@@ -595,16 +597,16 @@ import {
   updatetDrug,
   delDrugLevel,
   updateLevelDrug, calculateDistCount, calculateUseCount,
-  getDrugLevelList,getDrugLevelListBycode
+  getDrugLevelList, getDrugLevelListBycode
 } from '@/api/basic/product/drugUdiinfos'
-import {getCodeRelDetail} from '@/api/basic/product/udiRelevance'
-import {isBlank} from "@/utils/strUtil";
+import { getCodeRelDetail } from '@/api/basic/product/udiRelevance'
+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'
 
@@ -642,18 +644,18 @@ export default {
     }
   },
   // components: {selectChargesProjectDialog, chooseHouseDrug},
-  components: { chooseHouseDrug},
+  components: { chooseHouseDrug },
   data() {
     return {
       ybDrugDetail: {},
       productData: {},
       filterQueryDrugLevel: {
-        nameCode: "",
-        cpmctymc: "",
+        nameCode: '',
+        cpmctymc: '',
         page: 1,
         limit: 20,
         total: 0,
-        approvalNum:"",
+        approvalNum: ''
       },
       newProductData: {
         cpmctymc: null,
@@ -690,49 +692,49 @@ 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'}
         // ],
         useLevel: [
-          {required: true, message: '请选择计量单位', trigger: 'blur'}
+          { required: true, message: '请选择计量单位', trigger: 'blur' }
         ],
         detailSort: [
           {required: true, message: '请选择明细分类', trigger: 'blur'}
@@ -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) {
+          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
@@ -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,18 +971,18 @@ 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.ybbm = response.data[0].ybbm;
-                    this.getYbDrugData()
-                  }
+            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.ybbm = response.data[0].ybbm
+                  this.getYbDrugData()
                 }
+              }
             }).catch(() => {
             })
           }
@@ -996,7 +998,7 @@ export default {
       row.isUpDisabled = true
       row.rowDisabled = false
     },
-    selectDrugLevel(){
+    selectDrugLevel() {
       //获取分页列表
       this.filterQueryDrugLevel.approvalNum = this.newProductData.zczbhhzbapzbh
       getDrugLevelList(this.filterQueryDrugLevel).then((response) => {
@@ -1008,20 +1010,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 = {
@@ -1032,7 +1034,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 => {
@@ -1043,7 +1045,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
@@ -1062,8 +1064,26 @@ 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: ''
+      }
     },
-    handleCurrentChange(){
+    closeSelectDrugLevelVisible(){
+      this.filterQueryDrugLevel = {
+        nameCode: '',
+        cpmctymc: '',
+        page: 1,
+        limit: 20,
+        total: 0,
+        approvalNum: ''
+      }
+    },
+    handleCurrentChange() {
       this.selectDrugLevel()
     },
     addDrugLevel() {
@@ -1082,8 +1102,7 @@ export default {
 
     rowChange(index, val) {
 
-
-      if(this.editRowSwitch == true ){
+      if (this.editRowSwitch == true) {
         this.$message.error('请先保存当前产品标识编辑')
         return
       }
@@ -1100,7 +1119,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
@@ -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)
         }
       }
     },
@@ -1300,13 +1318,13 @@ export default {
       this.chooseHouseDrugVisible = false
       this.getThirdSysDetail()
     },
-    handleInput(index, value,type){
-      const intValue = parseInt(value, 10);
+    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);
+      if (type == 1) {
+        this.$set(this.detailList[index], 'packLevel', intValue)
+      } else {
+        this.$set(this.detailList[index], 'bhxjsl', intValue)
       }
 
     }
diff --git a/src/views/supplier/companyDrug/basicCompanyproductEdit.vue b/src/views/supplier/companyDrug/basicCompanyproductEdit.vue
index 678d317..2e37c32 100644
--- a/src/views/supplier/companyDrug/basicCompanyproductEdit.vue
+++ b/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({