bug修改

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

@@ -542,7 +542,7 @@
         <el-table-column label="包装规格" prop="bzgg" show-overflow-tooltip></el-table-column>
         <el-table-column label="包装比例" prop="packRatio" show-overflow-tooltip></el-table-column>
         <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
-        <el-table-column label="操作">
+        <el-table-column label="操作" fixed="right">
           <template slot-scope="scope">
             <el-button type="text" @click="selectDrugLevelItem(scope.row)">
               选入
@@ -925,7 +925,7 @@ export default {
         sjcpbm: row.sjcpbm,
         bhxjcpbm: row.bhxjcpbm,
         bhxjsl: row.bhxjsl,
-        relId: this.newProductData.id,
+        relId: this.newProductData.rlId,
         uuid: this.newProductData.uuid,
         productId: row.productId,
         diType: row.diType,
@@ -977,22 +977,49 @@ export default {
       }).catch(() => {
       })
     },
+    extractNumber(bzgg) {
+      // 使用正则表达式提取数字
+      const match = bzgg.match(/^\d+/);
+      // 如果匹配到，则返回数字，否则返回null
+      return match ? parseInt(match[0], 10) : null;
+    },
+
+    extractUnitAfterNumber(bzgg) {
+      // 使用正则表达式提取数字后面的单位
+      const match = bzgg.match(/^\d+([^\d/]+)/);
+      // 如果匹配到，则返回单位，否则返回null
+      return match ? match[1].trim() : null;
+    },
+
+
     selectDrugLevelItem(row) {
       getDrugLevelListBycode({nameCode: row.nameCode}).then((response) => {
         if (response.code == 20000) {
           if (response.data.length > 0) {
             response.data.forEach(item => {
-              //新增层级
               let parts = item.bzgg.split('/');
-              // 首先，根据 ':' 分割字符串
+              const levels = item.packRatio.split(":").map(Number);
-              const ratioParts = item.packRatio.split(':');
+              const calculatedLevels = [levels[0]];
-              let selectedValue;
+              for (let i = levels.length - 1; i > 0; i--) {
-              if (item.packLevel >= 0 && item.packLevel < ratioParts.length) {
+                const ratio = levels[i] / levels[i - 1];
-                selectedValue = ratioParts[item.packLevel];
+                calculatedLevels.unshift(ratio);
-              } else {
+              }
-                selectedValue = null; // 或者你可以设置一个默认值
+              calculatedLevels.reverse();
+              let selectedValue = calculatedLevels[item.packLevel - 1];
+              console.log(item)
+              if (item.packLevel == 1) {
+                selectedValue = this.extractNumber(this.newProductData.bzgg)
+                item.xjdw = this.extractUnitAfterNumber(this.newProductData.bzgg)
               }
 
+              // const ratioParts = item.packRatio.split(':');
+              // let selectedValue;
+              // if (item.packLevel >= 0 && item.packLevel < ratioParts.length) {
+              //   selectedValue = ratioParts[item.packLevel];
+              // } else {
+              //   selectedValue = 1; // 或者你可以设置一个默认值
+              // }
+
               let editQuery = {
                 nameCode: item.nameCode,
                 packLevel: item.packLevel,
@@ -1022,7 +1049,6 @@ export default {
 
             })
           }
-
         }
       }).catch(() => {
       })
@@ -1031,10 +1057,15 @@ export default {
       this.selectedIndex = this.detailList.length - 1
       this.isSave = false
       this.selectDrugLevelVisible = false
-    },
+      this.getDetailList()
+    }
+    ,
+
+
     handleCurrentChange() {
       this.selectDrugLevel()
-    },
+    }
+    ,
     addDrugLevel() {
       this.detailList.push({
         nameCode: '',
@@ -1047,7 +1078,8 @@ export default {
       this.newProductData.productId = null
       this.selectedIndex = this.detailList.length - 1
       this.isSave = false
-    },
+    }
+    ,
 
     rowChange(index, val) {
 
@@ -1060,7 +1092,8 @@ export default {
       this.selectedIndex = index
       this.isSave = false
       this.editRowSwitch = true
-    },
+    }
+    ,
 
     deleteLevel(index, row) {
       this.$confirm('此操作将删除该层级，是否继续?', '提示', {
@@ -1089,7 +1122,8 @@ export default {
         }
       }).catch(() => {
       })
-    },
+    }
+    ,
 
 
 //设置层级
@@ -1129,7 +1163,8 @@ export default {
             this.detailList = []
           })
       }
-    },
+    }
+    ,
 
     distributeLevelDiChange(val) {
       const matchingItem = this.detailList.find(item => item.nameCode == val)
@@ -1144,7 +1179,8 @@ export default {
         }
       })
 
-    },
+    }
+    ,
     useLevelDiChange(val) {
       const matchingItem = this.detailList.find(item => item.nameCode == val)
       if (matchingItem) {
@@ -1157,7 +1193,8 @@ export default {
           useLeverCount: res.data.useLeverCount
         }
       })
-    },
+    }
+    ,
     getDiLevel() {
       let query = {
         id: this.relId
@@ -1173,7 +1210,8 @@ export default {
           this.loading = false
           this.levelUnitList = []
         })
-    },
+    }
+    ,
 
     findMaxLevelObject() {
       this.maxLevel = 1;
@@ -1182,19 +1220,22 @@ export default {
           this.maxLevel = Number(obj.packLevel);
         }
       }
-    },
+    }
+    ,
 
     /**
      * 选择收费项目
      */
     selectPayFeecode() {
       this.tollProjectDialogVisible = true
-    },
+    }
+    ,
 
     getData(data) {
       this.tollProjectDialogVisible = false
       this.newProductData.payFeeCode = data.medCatalogCode
-    },
+    }
+    ,
     /**
      * 第三方系统药品信息
      */
@@ -1212,7 +1253,8 @@ export default {
           this.loading = false
           this.sysList = []
         })
-    },
+    }
+    ,
     resetThirdId() {
       this.sysList.forEach((item) => {
         if (item.sysId === 'thirdId') {
@@ -1227,7 +1269,8 @@ export default {
           this.newProductData.thirdId4 = item.thirdId
         }
       })
-    },
+    }
+    ,
     /**
      * 关联 第三方
      */
@@ -1235,7 +1278,8 @@ export default {
       this.defaultSys = row.sysId
       this.isImport = false
       this.chooseHouseDrugVisible = true
-    },
+    }
+    ,
     removeErp(row) {
       this.$confirm('此操作将解除该绑定药品信息, 是否继续?', '提示', {
         confirmButtonText: '确定',
@@ -1264,11 +1308,13 @@ export default {
         })
         .catch(() => {
         })
-    },
+    }
+    ,
     closeUdi(val) {
       this.chooseHouseDrugVisible = false
       this.getThirdSysDetail()
-    },
+    }
+    ,
     handleInput(index, value, type) {
       const intValue = parseInt(value, 10);
       // 更新行的数据
@@ -1297,9 +1343,11 @@ export default {
     } else {
       this.selectedIndex = 0
     }
-  },
+  }
+  ,
   directives: {
-    'debounce-input': {
+    'debounce-input':
+      {
         inserted(el, binding) {
           let timeout
           el.addEventListener('input', () => {

src/views/supplier/companyDrug/basicCompanyproductEdit.vue

@@ -717,7 +717,7 @@
         <el-table-column label="包装规格" prop="bzgg" show-overflow-tooltip></el-table-column>
         <el-table-column label="包装比例" prop="packRatio" show-overflow-tooltip></el-table-column>
         <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
-        <el-table-column label="操作">
+        <el-table-column label="操作" fixed="right">
           <template slot-scope="scope">
             <el-button type="text" @click="selectDrugLevelItem(scope.row)">
               选入
@@ -1145,28 +1145,54 @@ export default {
       }).catch(() => {
       })
     },
+    extractNumber(bzgg) {
+      // 使用正则表达式提取数字
+      const match = bzgg.match(/^\d+/);
+      // 如果匹配到，则返回数字，否则返回null
+      return match ? parseInt(match[0], 10) : null;
+    },
+
+    extractUnitAfterNumber(bzgg) {
+      // 使用正则表达式提取数字后面的单位
+      const match = bzgg.match(/^\d+([^\d/]+)/);
+      // 如果匹配到，则返回单位，否则返回null
+      return match ? match[1].trim() : null;
+    },
+
+
     selectDrugLevelItem(row) {
       getDrugLevelListBycode({nameCode: row.nameCode}).then((response) => {
         if (response.code == 20000) {
           if (response.data.length > 0) {
             response.data.forEach(item => {
-              //新增层级
+              let parts = item.bzgg.split('/');
-              let parts = item.bzgg.split('/')
+              const levels = item.packRatio.split(":").map(Number);
-              // 首先，根据 ':' 分割字符串
+              const calculatedLevels = [levels[0]];
-              const ratioParts = item.packRatio.split(':')
+              for (let i = levels.length - 1; i > 0; i--) {
-              let selectedValue
+                const ratio = levels[i] / levels[i - 1];
-              if (item.packLevel >= 0 && item.packLevel < ratioParts.length) {
+                calculatedLevels.unshift(ratio);
-                selectedValue = ratioParts[item.packLevel]
+              }
-              } else {
+              calculatedLevels.reverse();
-                selectedValue = null // 或者你可以设置一个默认值
+              let selectedValue = calculatedLevels[item.packLevel - 1];
+              if (item.packLevel == 1) {
+                selectedValue = this.extractNumber(this.newProductData.bzgg)
+                item.xjdw = this.extractUnitAfterNumber(this.newProductData.bzgg)
               }
 
+              // const ratioParts = item.packRatio.split(':');
+              // let selectedValue;
+              // if (item.packLevel >= 0 && item.packLevel < ratioParts.length) {
+              //   selectedValue = ratioParts[item.packLevel];
+              // } else {
+              //   selectedValue = 1; // 或者你可以设置一个默认值
+              // }
+
               let editQuery = {
                 nameCode: item.nameCode,
                 packLevel: item.packLevel,
                 packUnit: parts[1] || '',
                 bhxjsl: selectedValue,
-                relId: this.newProductData.id,
+                relId: this.newProductData.rlId,
                 uuid: this.newProductData.uuid,
                 productId: item.productId,
                 diType: item.packLevel == 1 ? 1 : 4,
@@ -1199,7 +1225,10 @@ export default {
       this.selectedIndex = this.detailList.length - 1
       this.isSave = false
       this.selectDrugLevelVisible = false
-    },
+
+      this.getDetailList()
+    }
+    ,
     addDrugLevel() {
       this.detailList.push({
         nameCode: '',