yusheng 11 bulan lalu
induk
melakukan
4e897908f1
1 mengubah file dengan 4 tambahan dan 14 penghapusan
  1. 4 14
      src/views/warehouseManagement/stockManagement/add.vue

+ 4 - 14
src/views/warehouseManagement/stockManagement/add.vue

@@ -2892,9 +2892,8 @@
                       this.$math.format(filterArr[0].packageCell * index, 14);
               }
             } else {
-              measureQuantity = row.measureQuantity / packingCodeList.length;
+              measureQuantity = row.packingSpecificationOption[1].packageCell;
             }
-            console.log(filterArr[0], 'filterArr[0]');
             let item = {
               index: row.index + '-' + index, // 包装索引
               warehouseId: row.warehouseId, // 仓库id
@@ -2933,11 +2932,12 @@
               result: 1, // 结果(1合格 2不合格)
               status: 2 // 状态(0=未质检 1待检 2已检)
             };
+            console.log(row.packingSpecificationOption[1],'row.packingSpecificationOption[1]')
             if (row.isUnpack) {
               // 第二层条件: packingBoolen
               if (packingBoolen) {
                 // 空值保护: 确保 filterArr[0] 存在
-                item.packingUnit = filterArr?.[0]?.conversionUnit;
+                item.packingUnit = row.packingSpecificationOption[1].conversionUnit;
               } else {
                 // 第三层条件: measureBoolen
                 if (measureBoolen) {
@@ -2947,16 +2947,9 @@
                     row.packingSpecificationOption?.[0];
                   item.packingUnit = option?.conversionUnit;
                 } else {
-                  item.packingUnit = row.packingUnit;
+                  item.packingUnit = row.packingSpecificationOption[1].conversionUnit;
                 }
               }
-            } else {
-              // 第二层条件: packingBoolen (isUnpack 为 false 时的分支)
-              if (packingBoolen) {
-                item.packingUnit = filterArr?.[0]?.conversionUnit;
-              } else {
-                item.packingUnit = row.packingUnit;
-              }
             }
 
             let outBoolen = !!this.getDict('不拆物料层规格', item.measureUnit)
@@ -3087,9 +3080,6 @@
                 );
               } else {
                 if (row.packingSpecificationOption[1]?.packageCell) {
-                  // let num = Math.ceil(
-                  //   row.measureQuantity / row.packingSpecificationOption[1]?.packageCell
-                  // );
                   let num = row.packingQuantity;
                   let splitIndex = row.packingSpecificationOption.findIndex(
                     (item) =>