huang_an 2 anos atrás
pai
commit
8d1afe28aa
22 arquivos alterados com 554 adições e 501 exclusões
  1. 21 8
      src/views/bpm/handleTask/components/inoutBound/detailDialog.vue
  2. 8 3
      src/views/bpm/handleTask/components/inoutBound/detailDialog_new.vue
  3. 2 1
      src/views/bpm/handleTask/components/outBound/detailDialog.vue
  4. 10 5
      src/views/bpm/handleTask/components/productionWarehousing/productionWarehousing.vue
  5. 10 5
      src/views/bpm/handleTask/components/purchaseOrder/invoice/procurementStorage.vue
  6. 10 3
      src/views/bpm/handleTask/components/purchaseOrder/invoice/procurementWarehousing copy 2.vue
  7. 10 3
      src/views/bpm/handleTask/components/purchaseOrder/invoice/procurementWarehousing copy.vue
  8. 8 11
      src/views/bpm/handleTask/components/purchaseOrder/invoice/procurementWarehousing.vue
  9. 5 1
      src/views/bpm/handleTask/components/purchaseOrder/returnGoods/purchaseReturnsOutboundShipments.vue
  10. 10 5
      src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/inboundDetails.vue
  11. 10 13
      src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/innerFillWeight.vue
  12. 10 5
      src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/interiorProductionStorage.vue
  13. 10 13
      src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/interiorProductionStorageQuality.vue
  14. 10 5
      src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/interiorStorageToOutsourcing.vue
  15. 10 13
      src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/interiorStorageToOutsourcingQuality.vue
  16. 371 386
      src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/outboundDetailsDialog.vue
  17. 5 1
      src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/outboundToOutsourcing.vue
  18. 9 12
      src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/outerFillWeight.vue
  19. 5 1
      src/views/bpm/handleTask/components/saleOrder/invoice/saleShipmentsOutbound.vue
  20. 5 1
      src/views/bpm/outgoingManagement/add.vue
  21. 5 1
      src/views/bpm/outgoingManagement/components/batchDetail.vue
  22. 10 5
      src/views/bpm/stockManagement/add.vue

+ 21 - 8
src/views/bpm/handleTask/components/inoutBound/detailDialog.vue

@@ -427,7 +427,7 @@
               label="计量单位"
               prop="measuringUnit"
             ></el-table-column>
-            <el-table-column label="物料代号" prop="materielCode">
+            <el-table-column label="物料代号" prop="materielCode" width="130">
               <template slot-scope="{ row }">
                 <el-input
                   v-show="!row.isPack"
@@ -551,7 +551,7 @@
               label="计量单位"
               prop="measuringUnit"
             ></el-table-column>
-            <el-table-column label="物料代号" prop="materielCode">
+            <el-table-column label="物料代号" prop="materielCode" width="130">
               <template slot-scope="{ row }">
                 {{ row.materielCode }}
               </template>
@@ -1207,16 +1207,29 @@
         return arr;
       },
       packNum(row, value) {
-        console.log(row);
         const total = {
-          packingCount: Number(row.minPackingCount),
-          outInNum: Number(row.packingCount)
+          packingCount: Number(
+            row.minPackingCount > 0 ? row.minPackingCount : 0
+          ),
+          outInNum: Number(row.outInNum > 0 ? row.outInNum : 0)
         };
         if (row.measuringUnit == row.weightUnit) {
-          row.weight = total.packingCount * 1 * total.outInNum.toFixed(2);
+          row.weight = Number(
+            this.$math.format(
+              total.packingCount * 1 * total.outInNum.toFixed(2),
+              14
+            )
+          );
         } else {
-          const totals = total.packingCount * total.outInNum;
-          row.weight = totals * row.netWeight.toFixed(2);
+          const totals = Number(
+            this.$math.format(total.packingCount * total.outInNum, 14)
+          );
+          row.weight = Number(
+            this.$math.format(
+              totals * (row.netWeight > 0 ? row.netWeight.toFixed(2) : 0),
+              14
+            )
+          );
         }
         return (row.outInNum = value.replace(/^(0+)|[^\d]+/g, ''));
       },

+ 8 - 3
src/views/bpm/handleTask/components/inoutBound/detailDialog_new.vue

@@ -1466,8 +1466,10 @@
       },
       packNum(row, value) {
         const total = {
-          packingCount: Number(row.minPackingCount),
-          outInNum: Number(row.outInNum)
+          packingCount: Number(
+            row.minPackingCount > 0 ? row.minPackingCount : 0
+          ),
+          outInNum: Number(row.outInNum > 0 ? row.outInNum : 0)
         };
         if (row.measuringUnit == row.weightUnit) {
           row.weight = Number(
@@ -1481,7 +1483,10 @@
             this.$math.format(total.packingCount * total.outInNum, 14)
           );
           row.weight = Number(
-            this.$math.format(totals * row.netWeight.toFixed(2), 14)
+            this.$math.format(
+              totals * (row.netWeight > 0 ? row.netWeight.toFixed(2) : 0),
+              14
+            )
           );
         }
         return (row.outInNum = value.replace(/^(0+)|[^\d]+/g, ''));

+ 2 - 1
src/views/bpm/handleTask/components/outBound/detailDialog.vue

@@ -238,6 +238,7 @@
               v-if="infoData.bizType == 2 || infoData.bizType == 1"
               label="物料代号"
               prop="materielCode"
+              width="130"
             >
               <template slot-scope="{ row }">
                 {{ row.materielCode }}
@@ -314,7 +315,7 @@
             </el-table-column>
             <el-table-column label="计量单位" prop="measuringUnit">
             </el-table-column>
-            <el-table-column label="物料代号" prop="meterielCode">
+            <el-table-column label="物料代号" prop="meterielCode" width="130">
             </el-table-column>
             <el-table-column label="客户代号" prop="clientCode">
             </el-table-column>

+ 10 - 5
src/views/bpm/handleTask/components/productionWarehousing/productionWarehousing.vue

@@ -570,7 +570,7 @@
               label="计量单位"
               prop="measuringUnit"
             ></el-table-column>
-            <el-table-column label="物料代号" prop="materielCode">
+            <el-table-column label="物料代号" prop="materielCode" width="130">
               <template slot-scope="{ row }">
                 <el-input
                   v-if="!row.isPack"
@@ -741,7 +741,7 @@
               label="计量单位"
               prop="measuringUnit"
             ></el-table-column>
-            <el-table-column label="物料代号" prop="meterielCode">
+            <el-table-column label="物料代号" prop="meterielCode" width="130">
               <template slot-scope="{ row }">
                 <el-input
                   v-model="row.materielCode"
@@ -1233,8 +1233,10 @@
       // 重量计算
       packNum(row, value) {
         const total = {
-          packingCount: Number(row.minPackingCount),
-          outInNum: Number(row.outInNum)
+          packingCount: Number(
+            row.minPackingCount > 0 ? row.minPackingCount : 0
+          ),
+          outInNum: Number(row.outInNum > 0 ? row.outInNum : 0)
         };
         if (row.measuringUnit == row.weightUnit) {
           row.weight = Number(
@@ -1248,7 +1250,10 @@
             this.$math.format(total.packingCount * total.outInNum, 14)
           );
           row.weight = Number(
-            this.$math.format(totals * row.netWeight.toFixed(2), 14)
+            this.$math.format(
+              totals * (row.netWeight > 0 ? row.netWeight.toFixed(2) : 0),
+              14
+            )
           );
         }
         return (row.outInNum = value.replace(/^(0+)|[^\d]+/g, ''));

+ 10 - 5
src/views/bpm/handleTask/components/purchaseOrder/invoice/procurementStorage.vue

@@ -565,7 +565,7 @@
               label="计量单位"
               prop="measuringUnit"
             ></el-table-column>
-            <el-table-column label="物料代号" prop="materielCode">
+            <el-table-column label="物料代号" prop="materielCode" width="130">
               <template slot-scope="{ row }">
                 <el-input
                   v-if="!row.isPack"
@@ -736,7 +736,7 @@
               label="计量单位"
               prop="measuringUnit"
             ></el-table-column>
-            <el-table-column label="物料代号" prop="meterielCode">
+            <el-table-column label="物料代号" prop="meterielCode" width="130">
               <template slot-scope="{ row }">
                 <el-input
                   v-model="row.materielCode"
@@ -1228,8 +1228,10 @@
       // 重量计算
       packNum(row, value) {
         const total = {
-          packingCount: Number(row.minPackingCount),
-          outInNum: Number(row.outInNum)
+          packingCount: Number(
+            row.minPackingCount > 0 ? row.minPackingCount : 0
+          ),
+          outInNum: Number(row.outInNum > 0 ? row.outInNum : 0)
         };
         if (row.measuringUnit == row.weightUnit) {
           row.weight = Number(
@@ -1243,7 +1245,10 @@
             this.$math.format(total.packingCount * total.outInNum, 14)
           );
           row.weight = Number(
-            this.$math.format(totals * row.netWeight.toFixed(2), 14)
+            this.$math.format(
+              totals * (row.netWeight > 0 ? row.netWeight.toFixed(2) : 0),
+              14
+            )
           );
         }
         return (row.outInNum = value.replace(/^(0+)|[^\d]+/g, ''));

+ 10 - 3
src/views/bpm/handleTask/components/purchaseOrder/invoice/procurementWarehousing copy 2.vue

@@ -645,6 +645,7 @@
               v-if="formData.bizType == 2 || formData.bizType == 1"
               label="物料代号"
               prop="materielCode"
+              width="130"
             >
               <template slot-scope="{ row }">
                 <el-input
@@ -843,6 +844,7 @@
               v-if="formData.bizType == 2"
               label="物料代号"
               prop="meterielCode"
+              width="130"
             >
               <template slot-scope="{ row }">
                 <el-input
@@ -1547,8 +1549,10 @@
       },
       packNum(row, value) {
         const total = {
-          packingCount: Number(row.minPackingCount),
-          outInNum: Number(row.outInNum)
+          packingCount: Number(
+            row.minPackingCount > 0 ? row.minPackingCount : 0
+          ),
+          outInNum: Number(row.outInNum > 0 ? row.outInNum : 0)
         };
         if (row.measuringUnit == row.weightUnit) {
           row.weight = Number(
@@ -1562,7 +1566,10 @@
             this.$math.format(total.packingCount * total.outInNum, 14)
           );
           row.weight = Number(
-            this.$math.format(totals * row.netWeight.toFixed(2), 14)
+            this.$math.format(
+              totals * (row.netWeight > 0 ? row.netWeight.toFixed(2) : 0),
+              14
+            )
           );
         }
         return (row.outInNum = value.replace(/^(0+)|[^\d]+/g, ''));

+ 10 - 3
src/views/bpm/handleTask/components/purchaseOrder/invoice/procurementWarehousing copy.vue

@@ -645,6 +645,7 @@
               v-if="formData.bizType == 2 || formData.bizType == 1"
               label="物料代号"
               prop="materielCode"
+              width="130"
             >
               <template slot-scope="{ row }">
                 <el-input
@@ -855,6 +856,7 @@
               v-if="formData.bizType == 2"
               label="物料代号"
               prop="meterielCode"
+              width="130"
             >
               <template slot-scope="{ row }">
                 <el-input
@@ -1618,8 +1620,10 @@
       },
       packNum(row, value) {
         const total = {
-          packingCount: Number(row.minPackingCount),
-          outInNum: Number(row.outInNum)
+          packingCount: Number(
+            row.minPackingCount > 0 ? row.minPackingCount : 0
+          ),
+          outInNum: Number(row.outInNum > 0 ? row.outInNum : 0)
         };
         if (row.measuringUnit == row.weightUnit) {
           row.weight = Number(
@@ -1633,7 +1637,10 @@
             this.$math.format(total.packingCount * total.outInNum, 14)
           );
           row.weight = Number(
-            this.$math.format(totals * row.netWeight.toFixed(2), 14)
+            this.$math.format(
+              totals * (row.netWeight > 0 ? row.netWeight.toFixed(2) : 0),
+              14
+            )
           );
         }
         return (row.outInNum = value.replace(/^(0+)|[^\d]+/g, ''));

+ 8 - 11
src/views/bpm/handleTask/components/purchaseOrder/invoice/procurementWarehousing.vue

@@ -1908,14 +1908,12 @@
         }
       },
       packNum(row, value) {
-        console.log(value);
-        console.log(row);
-        row.outInNum = value;
         const total = {
-          packingCount: Number(row.minPackingCount),
-          outInNum: Number(row.outInNum)
+          packingCount: Number(
+            row.minPackingCount > 0 ? row.minPackingCount : 0
+          ),
+          outInNum: Number(row.outInNum > 0 ? row.outInNum : 0)
         };
-        console.log(total);
         if (row.measuringUnit == row.weightUnit) {
           row.weight = Number(
             this.$math.format(
@@ -1924,15 +1922,14 @@
             )
           );
         } else {
-          console.log('-----------------');
-          if (!row.netWeight) {
-            row.netWeight = 0;
-          }
           const totals = Number(
             this.$math.format(total.packingCount * total.outInNum, 14)
           );
           row.weight = Number(
-            this.$math.format(totals * row.netWeight.toFixed(2), 14)
+            this.$math.format(
+              totals * (row.netWeight > 0 ? row.netWeight.toFixed(2) : 0),
+              14
+            )
           );
         }
         return (row.outInNum = value.replace(/^(0+)|[^\d]+/g, ''));

+ 5 - 1
src/views/bpm/handleTask/components/purchaseOrder/returnGoods/purchaseReturnsOutboundShipments.vue

@@ -537,7 +537,11 @@
                   label="计量单位"
                   prop="measuringUnit"
                 ></el-table-column>
-                <el-table-column label="物料代号" prop="meterielCode">
+                <el-table-column
+                  label="物料代号"
+                  prop="meterielCode"
+                  width="130"
+                >
                 </el-table-column>
                 <el-table-column
                   label="客户代号"

+ 10 - 5
src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/inboundDetails.vue

@@ -501,7 +501,7 @@
               label="计量单位"
               prop="measuringUnit"
             ></el-table-column>
-            <el-table-column label="物料代号" prop="materielCode">
+            <el-table-column label="物料代号" prop="materielCode" width="130">
               <template slot-scope="{ row }">
                 <el-input
                   v-if="!row.isPack"
@@ -663,7 +663,7 @@
               label="计量单位"
               prop="measuringUnit"
             ></el-table-column>
-            <el-table-column label="物料代号" prop="meterielCode">
+            <el-table-column label="物料代号" prop="meterielCode" width="130">
               <template slot-scope="{ row }">
                 <el-input
                   v-model="row.materielCode"
@@ -1255,8 +1255,10 @@
       // 计算重量
       packNum(row, value) {
         const total = {
-          packingCount: Number(row.minPackingCount),
-          outInNum: Number(row.outInNum)
+          packingCount: Number(
+            row.minPackingCount > 0 ? row.minPackingCount : 0
+          ),
+          outInNum: Number(row.outInNum > 0 ? row.outInNum : 0)
         };
         if (row.measuringUnit == row.weightUnit) {
           row.weight = Number(
@@ -1270,7 +1272,10 @@
             this.$math.format(total.packingCount * total.outInNum, 14)
           );
           row.weight = Number(
-            this.$math.format(totals * row.netWeight.toFixed(2), 14)
+            this.$math.format(
+              totals * (row.netWeight > 0 ? row.netWeight.toFixed(2) : 0),
+              14
+            )
           );
         }
         return (row.outInNum = value.replace(/^(0+)|[^\d]+/g, ''));

+ 10 - 13
src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/innerFillWeight.vue

@@ -641,7 +641,7 @@
               label="计量单位"
               prop="measuringUnit"
             ></el-table-column>
-            <el-table-column label="物料代号" prop="materielCode">
+            <el-table-column label="物料代号" prop="materielCode" width="130">
               <template slot-scope="{ row }">
                 <span>{{ row.materielCode }}</span>
               </template>
@@ -816,7 +816,7 @@
               label="计量单位"
               prop="measuringUnit"
             ></el-table-column>
-            <el-table-column label="物料代号" prop="materielCode">
+            <el-table-column label="物料代号" prop="materielCode" width="130">
               <template slot-scope="{ row }">
                 <span>{{ row.materielCode }}</span>
               </template>
@@ -1790,14 +1790,12 @@
         }
       },
       packNum(row, value) {
-        console.log(value);
-        console.log(row);
-        row.outInNum = value;
         const total = {
-          packingCount: Number(row.minPackingCount),
-          outInNum: Number(row.outInNum)
+          packingCount: Number(
+            row.minPackingCount > 0 ? row.minPackingCount : 0
+          ),
+          outInNum: Number(row.outInNum > 0 ? row.outInNum : 0)
         };
-        console.log(total);
         if (row.measuringUnit == row.weightUnit) {
           row.weight = Number(
             this.$math.format(
@@ -1806,15 +1804,14 @@
             )
           );
         } else {
-          console.log('-----------------');
-          if (!row.netWeight) {
-            row.netWeight = 0;
-          }
           const totals = Number(
             this.$math.format(total.packingCount * total.outInNum, 14)
           );
           row.weight = Number(
-            this.$math.format(totals * row.netWeight.toFixed(2), 14)
+            this.$math.format(
+              totals * (row.netWeight > 0 ? row.netWeight.toFixed(2) : 0),
+              14
+            )
           );
         }
         return (row.outInNum = value.replace(/^(0+)|[^\d]+/g, ''));

+ 10 - 5
src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/interiorProductionStorage.vue

@@ -512,7 +512,7 @@
               label="计量单位"
               prop="measuringUnit"
             ></el-table-column>
-            <el-table-column label="物料代号" prop="materielCode">
+            <el-table-column label="物料代号" prop="materielCode" width="130">
               <template slot-scope="{ row }">
                 <el-input
                   v-if="!row.isPack"
@@ -675,7 +675,7 @@
               label="计量单位"
               prop="measuringUnit"
             ></el-table-column>
-            <el-table-column label="物料代号" prop="meterielCode">
+            <el-table-column label="物料代号" prop="meterielCode" width="130">
               <template slot-scope="{ row }">
                 <el-input
                   v-model="row.materielCode"
@@ -1341,8 +1341,10 @@
       },
       packNum(row, value) {
         const total = {
-          packingCount: Number(row.minPackingCount),
-          outInNum: Number(row.outInNum)
+          packingCount: Number(
+            row.minPackingCount > 0 ? row.minPackingCount : 0
+          ),
+          outInNum: Number(row.outInNum > 0 ? row.outInNum : 0)
         };
         if (row.measuringUnit == row.weightUnit) {
           row.weight = Number(
@@ -1356,7 +1358,10 @@
             this.$math.format(total.packingCount * total.outInNum, 14)
           );
           row.weight = Number(
-            this.$math.format(totals * row.netWeight.toFixed(2), 14)
+            this.$math.format(
+              totals * (row.netWeight > 0 ? row.netWeight.toFixed(2) : 0),
+              14
+            )
           );
         }
         return (row.outInNum = value.replace(/^(0+)|[^\d]+/g, ''));

+ 10 - 13
src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/interiorProductionStorageQuality.vue

@@ -638,7 +638,7 @@
               label="计量单位"
               prop="measuringUnit"
             ></el-table-column>
-            <el-table-column label="物料代号" prop="materielCode">
+            <el-table-column label="物料代号" prop="materielCode" width="130">
               <template slot-scope="{ row }">
                 <el-input
                   v-if="!row.isPack"
@@ -827,7 +827,7 @@
               label="计量单位"
               prop="measuringUnit"
             ></el-table-column>
-            <el-table-column label="物料代号" prop="materielCode">
+            <el-table-column label="物料代号" prop="materielCode" width="130">
               <template slot-scope="{ row }">
                 <el-input
                   v-model="row.materielCode"
@@ -1846,14 +1846,12 @@
         }
       },
       packNum(row, value) {
-        console.log(value);
-        console.log(row);
-        row.outInNum = value;
         const total = {
-          packingCount: Number(row.minPackingCount),
-          outInNum: Number(row.outInNum)
+          packingCount: Number(
+            row.minPackingCount > 0 ? row.minPackingCount : 0
+          ),
+          outInNum: Number(row.outInNum > 0 ? row.outInNum : 0)
         };
-        console.log(total);
         if (row.measuringUnit == row.weightUnit) {
           row.weight = Number(
             this.$math.format(
@@ -1862,15 +1860,14 @@
             )
           );
         } else {
-          console.log('-----------------');
-          if (!row.netWeight) {
-            row.netWeight = 0;
-          }
           const totals = Number(
             this.$math.format(total.packingCount * total.outInNum, 14)
           );
           row.weight = Number(
-            this.$math.format(totals * row.netWeight.toFixed(2), 14)
+            this.$math.format(
+              totals * (row.netWeight > 0 ? row.netWeight.toFixed(2) : 0),
+              14
+            )
           );
         }
         return (row.outInNum = value.replace(/^(0+)|[^\d]+/g, ''));

+ 10 - 5
src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/interiorStorageToOutsourcing.vue

@@ -500,7 +500,7 @@
               label="计量单位"
               prop="measuringUnit"
             ></el-table-column>
-            <el-table-column label="物料代号" prop="materielCode">
+            <el-table-column label="物料代号" prop="materielCode" width="130">
               <template slot-scope="{ row }">
                 <el-input
                   v-if="!row.isPack"
@@ -661,7 +661,7 @@
               label="计量单位"
               prop="measuringUnit"
             ></el-table-column>
-            <el-table-column label="物料代号" prop="meterielCode">
+            <el-table-column label="物料代号" prop="meterielCode" width="130">
               <template slot-scope="{ row }">
                 <el-input
                   v-model="row.materielCode"
@@ -1306,8 +1306,10 @@
       },
       packNum(row, value) {
         const total = {
-          packingCount: Number(row.minPackingCount),
-          outInNum: Number(row.outInNum)
+          packingCount: Number(
+            row.minPackingCount > 0 ? row.minPackingCount : 0
+          ),
+          outInNum: Number(row.outInNum > 0 ? row.outInNum : 0)
         };
         if (row.measuringUnit == row.weightUnit) {
           row.weight = Number(
@@ -1321,7 +1323,10 @@
             this.$math.format(total.packingCount * total.outInNum, 14)
           );
           row.weight = Number(
-            this.$math.format(totals * row.netWeight.toFixed(2), 14)
+            this.$math.format(
+              totals * (row.netWeight > 0 ? row.netWeight.toFixed(2) : 0),
+              14
+            )
           );
         }
         return (row.outInNum = value.replace(/^(0+)|[^\d]+/g, ''));

+ 10 - 13
src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/interiorStorageToOutsourcingQuality.vue

@@ -638,7 +638,7 @@
               label="计量单位"
               prop="measuringUnit"
             ></el-table-column>
-            <el-table-column label="物料代号" prop="materielCode">
+            <el-table-column label="物料代号" prop="materielCode" width="130">
               <template slot-scope="{ row }">
                 <el-input
                   v-if="!row.isPack"
@@ -810,7 +810,7 @@
               label="计量单位"
               prop="measuringUnit"
             ></el-table-column>
-            <el-table-column label="物料代号" prop="materielCode">
+            <el-table-column label="物料代号" prop="materielCode" width="130">
               <template slot-scope="{ row }">
                 <el-input
                   v-model="row.materielCode"
@@ -1837,14 +1837,12 @@
         }
       },
       packNum(row, value) {
-        console.log(value);
-        console.log(row);
-        row.outInNum = value;
         const total = {
-          packingCount: Number(row.minPackingCount),
-          outInNum: Number(row.outInNum)
+          packingCount: Number(
+            row.minPackingCount > 0 ? row.minPackingCount : 0
+          ),
+          outInNum: Number(row.outInNum > 0 ? row.outInNum : 0)
         };
-        console.log(total);
         if (row.measuringUnit == row.weightUnit) {
           row.weight = Number(
             this.$math.format(
@@ -1853,15 +1851,14 @@
             )
           );
         } else {
-          console.log('-----------------');
-          if (!row.netWeight) {
-            row.netWeight = 0;
-          }
           const totals = Number(
             this.$math.format(total.packingCount * total.outInNum, 14)
           );
           row.weight = Number(
-            this.$math.format(totals * row.netWeight.toFixed(2), 14)
+            this.$math.format(
+              totals * (row.netWeight > 0 ? row.netWeight.toFixed(2) : 0),
+              14
+            )
           );
         }
         return (row.outInNum = value.replace(/^(0+)|[^\d]+/g, ''));

+ 371 - 386
src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/outboundDetailsDialog.vue

@@ -7,7 +7,8 @@
     append-to-body
     :close-on-click-modal="false"
     width="80%"
-    :before-close="cancel">
+    :before-close="cancel"
+  >
     <div>
       <div class="content-detail">
         <header-title title="基本信息" size="16px"></header-title>
@@ -21,11 +22,11 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="出库物品类型">
-                  <span>{{
-                      infoData.bizType == 3
-                        ? '物品'
-                        : getDictValue('类型用途', infoData.assetType)
-                    }}</span>
+                <span>{{
+                  infoData.bizType == 3
+                    ? '物品'
+                    : getDictValue('类型用途', infoData.assetType)
+                }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -37,14 +38,12 @@
               <el-form-item label="客户名称">
                 <span>{{ infoData.clientName }}</span>
               </el-form-item>
-            </el-col
-            >
+            </el-col>
             <el-col :span="8" v-if="infoData.bizType == 3">
               <el-form-item label="客户联系人">
                 <span>{{ infoData.clientUser }}</span>
               </el-form-item>
-            </el-col
-            >
+            </el-col>
             <el-col :span="8" v-if="infoData.bizType == 3">
               <el-form-item label="客户电话">
                 <span>{{ infoData.clientPhone }}</span>
@@ -116,7 +115,6 @@
               :data="warehousingMaterialList"
               tooltip-effect="dark"
               style="width: 100%"
-
               stripe
               :header-cell-style="{ background: '#EEEEEE', border: 'none' }"
             >
@@ -132,10 +130,7 @@
                 prop="categoryCode"
               ></el-table-column>
               <el-table-column label="名称" prop="name"></el-table-column>
-              <el-table-column
-                label="批次号"
-                prop="batchNo"
-              ></el-table-column>
+              <el-table-column label="批次号" prop="batchNo"></el-table-column>
               <el-table-column label="最小包装单元" width="120">
                 <template slot-scope="{ row }">
                   {{ row.minPackingCount }}{{ row.measuringUnit }}/{{
@@ -148,10 +143,7 @@
                   {{ row.packingCount }}{{ row.packingUnit }}
                 </template>
               </el-table-column>
-              <el-table-column
-                label="计量数量"
-                prop="count"
-              ></el-table-column>
+              <el-table-column label="计量数量" prop="count"></el-table-column>
               <el-table-column
                 label="计量单位"
                 prop="measuringUnit"
@@ -166,10 +158,7 @@
                   {{ row.price ? row.price : '-' }}元/{{ row.measuringUnit }}
                 </template>
               </el-table-column>
-              <el-table-column
-                label="金额"
-                prop="totalMoney"
-              ></el-table-column>
+              <el-table-column label="金额" prop="totalMoney"></el-table-column>
               <el-table-column label="领料部门" prop="llbm"></el-table-column>
             </el-table>
           </div>
@@ -191,10 +180,7 @@
           stripe
           :header-cell-style="{ background: '#EEEEEE', border: 'none' }"
         >
-          <el-table-column
-            align="center"
-            type="selection"
-            width="55">
+          <el-table-column align="center" type="selection" width="55">
           </el-table-column>
           <el-table-column label="序号" type="index" width="50">
           </el-table-column>
@@ -223,10 +209,7 @@
             label="包装单位"
             prop="packingUnit"
           ></el-table-column>
-          <el-table-column
-            label="计量数量"
-            prop="totalCount"
-          ></el-table-column>
+          <el-table-column label="计量数量" prop="totalCount"></el-table-column>
           <el-table-column
             label="计量单位"
             prop="measuringUnit"
@@ -236,6 +219,7 @@
             v-if="infoData.bizType == 2 || infoData.bizType == 1"
             label="物料代号"
             prop="materielCode"
+            width="130"
           >
             <template slot-scope="{ row }">
               {{ row.materielCode }}
@@ -302,10 +286,7 @@
           stripe
           :header-cell-style="{ background: '#EEEEEE', border: 'none' }"
         >
-          <el-table-column
-            align="center"
-            type="selection"
-            width="55">
+          <el-table-column align="center" type="selection" width="55">
           </el-table-column>
           <el-table-column label="序号" type="index" width="50">
           </el-table-column>
@@ -318,7 +299,7 @@
           </el-table-column>
           <el-table-column label="计量单位" prop="measuringUnit">
           </el-table-column>
-          <el-table-column label="物料代号" prop="meterielCode">
+          <el-table-column label="物料代号" prop="meterielCode" width="130">
           </el-table-column>
           <el-table-column label="客户代号" prop="clientCode">
           </el-table-column>
@@ -334,411 +315,415 @@
       <el-button type="primary" @click="handleSave">保存</el-button>
       <el-button type="info" @click="cancel">关闭</el-button>
     </div>
-
   </ele-modal>
-
 </template>
 
 <script>
-
-// import { getInfo } from '@/api/stockManagement/outgoingManagement' '@/components/PageHeader'
-// import PageHeader from '@/components/PageHeader';
-// import { tableHeader } from '../common';
-import {mapGetters, mapActions} from 'vuex';
-//import warehouseDefinition from '@/api/warehouseManagement/warehouseDefinition';
-
-// import {
-//   materialType,
-//   warehousingType,
-//   useDict,
-//   useDictLabel,
-//   inputStatus,
-//   outputSceneState,
-//   auditStatus
-// } from '@/utils/dict/index';
-import {getUser} from '@/api/system/user';
-import {getOutInByIdAPI} from "@/api/bpm/components/saleManage/saleorder";
-import {deepClone} from "@/utils";
-
-export default {
-  props: {
-    outboundDetailsDialogFlag: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      title: '信息',
-      selectionChangeList: [],
-      selectionChangeList2: [],
-      selectionChangeList3: [],
-      metaList: [],
-      infoData: {},
-      warehousingMaterialList: [],
-      materialCodeReqList: [],
-      tableData2: [],
-      fromUserList: [],
-
-      num: 1,
-      stepsList: [
-        {status: 'Done', nodeName: '创建'},
-        {status: 'Done', nodeName: '暂存', time: '2023-01-06'},
-        {status: 'Done', nodeName: '收货中'},
-        {status: 'Processing', nodeName: '已收货'}
-      ],
-      list: [
-        {
-          name: '紧急',
-          color: 'red'
-        },
-        {
-          name: '重要',
-          color: 'blue'
-        },
-        {
-          name: '已催办',
-          color: 'red'
-        }
-      ],
-      stepsTitle: '已完成',
-      stepsStatus: 'success',
-      active: 0
-    };
-  },
-  watch: {},
-  computed: {
-    ...mapGetters(['getDictValue']),
-    // tableHeader() {
-    //   return tableHeader(this.infoData?.extInfo?.assetType);
-    // }
-  },
-
-  created() {
-    //
-    // this.getUser();
-    // this._getInfo();
-    // this.requestDict('类型用途');
-  },
-  methods: {
-    async init(row = {}) {
-      const data = await getOutInByIdAPI(row.sendNo)
-      this.infoData = deepClone(data)
-      //出库物料明细
-      this.warehousingMaterialList = this.infoData?.outInDetailVOList || []
-      //出库包装明细
-      if (this.warehousingMaterialList.length) {
-        this.materialCodeReqList = []
-        this.warehousingMaterialList.forEach(item => {
-          if (item.outInDetailRecordVOList?.length) {
-            item.outInDetailRecordVOList = item.outInDetailRecordVOList.map(i => {
-              return {
-                ...i,
-                outInCode: this.infoData.bizNo,
-                outInId: item.outInId,
-                measurementCount: i.totalCount,
-                outboundDetailId:i.id,
-                outboundType:1,
-                packageCount:i.packingCount,
-                packingUnit:i.packingUnit,
-                weight:i.weight,
-                specification:item.specification,
-                name:i.name,
-                categoryCode:i.categoryCode,
-                id:''
-              }
-            })
-            this.materialCodeReqList.push(...item.outInDetailRecordVOList)
-          }
-        })
-        //出库物料明细
-        if (this.materialCodeReqList.length) {
-          this.metaList = []
-          this.materialCodeReqList.forEach(item => {
-            if (item.outInDetailRecordMaterialDetailVOList?.length) {
-              item.outInDetailRecordMaterialDetailVOList = item.outInDetailRecordMaterialDetailVOList.map(i => {
-                return {
-                  ...i,
-                  outInId: item.outInId,
-                  outInCode: item.outInCode,
-                  measurementCount: 1,
-                  outboundDetailId:i.id,
-                  outboundType:2,
-                  packageCount:i.packingCount,
-                  packingUnit:i.packingUnit,
-                  weight:i.weight,
-                  weightUtil:i.weightUnit,
-                  specification:item.specification,
-                  categoryCode:i.assetCode,
-                  name:i.assetName,
-                  id:''
-                }
-              })
-              this.metaList.push(...item.outInDetailRecordMaterialDetailVOList)
-            }
-          })
-        }
+  // import { getInfo } from '@/api/stockManagement/outgoingManagement' '@/components/PageHeader'
+  // import PageHeader from '@/components/PageHeader';
+  // import { tableHeader } from '../common';
+  import { mapGetters, mapActions } from 'vuex';
+  //import warehouseDefinition from '@/api/warehouseManagement/warehouseDefinition';
+
+  // import {
+  //   materialType,
+  //   warehousingType,
+  //   useDict,
+  //   useDictLabel,
+  //   inputStatus,
+  //   outputSceneState,
+  //   auditStatus
+  // } from '@/utils/dict/index';
+  import { getUser } from '@/api/system/user';
+  import { getOutInByIdAPI } from '@/api/bpm/components/saleManage/saleorder';
+  import { deepClone } from '@/utils';
+
+  export default {
+    props: {
+      outboundDetailsDialogFlag: {
+        type: Boolean,
+        default: false
       }
-
-    },
-    getUserName(id) {
-      let obj = this.fromUserList.find((x) => x.id == id);
-      return obj && obj.name;
-    },
-    async getUser() {
-      let res22 = await warehouseDefinition.getUserPage({
-        groupId: 1,
-        size: 9999,
-        page: 1
-      });
-      this.fromUserList = res22.list;
-    },
-    // selectionChange(val){
-    //   this.selectionChangeList = val
-    // },
-    selectionChange2(val) {
-      this.selectionChangeList2 = val
-      console.log(this.selectionChangeList2);
     },
-    selectionChange3(val) {
-      this.selectionChangeList3 = val
-      console.log(this.selectionChangeList3);
-    },
-    handleSave() {
-      if (!this.selectionChangeList2.length && !this.selectionChangeList3.length) return this.$message.warning('请选择退货明细')
-      let params = [
-        ...this.selectionChangeList2,
-        ...this.selectionChangeList3
-      ]
-      this.$emit('saveDate',params)
-      this.cancel()
+    data() {
+      return {
+        title: '信息',
+        selectionChangeList: [],
+        selectionChangeList2: [],
+        selectionChangeList3: [],
+        metaList: [],
+        infoData: {},
+        warehousingMaterialList: [],
+        materialCodeReqList: [],
+        tableData2: [],
+        fromUserList: [],
+
+        num: 1,
+        stepsList: [
+          { status: 'Done', nodeName: '创建' },
+          { status: 'Done', nodeName: '暂存', time: '2023-01-06' },
+          { status: 'Done', nodeName: '收货中' },
+          { status: 'Processing', nodeName: '已收货' }
+        ],
+        list: [
+          {
+            name: '紧急',
+            color: 'red'
+          },
+          {
+            name: '重要',
+            color: 'blue'
+          },
+          {
+            name: '已催办',
+            color: 'red'
+          }
+        ],
+        stepsTitle: '已完成',
+        stepsStatus: 'success',
+        active: 0
+      };
     },
-    cancel() {
-      this.$emit('update:outboundDetailsDialogFlag', false)
+    watch: {},
+    computed: {
+      ...mapGetters(['getDictValue'])
+      // tableHeader() {
+      //   return tableHeader(this.infoData?.extInfo?.assetType);
+      // }
     },
-    ...mapActions('dict', ['requestDict']),
 
-  }
-};
+    created() {
+      //
+      // this.getUser();
+      // this._getInfo();
+      // this.requestDict('类型用途');
+    },
+    methods: {
+      async init(row = {}) {
+        const data = await getOutInByIdAPI(row.sendNo);
+        this.infoData = deepClone(data);
+        //出库物料明细
+        this.warehousingMaterialList = this.infoData?.outInDetailVOList || [];
+        //出库包装明细
+        if (this.warehousingMaterialList.length) {
+          this.materialCodeReqList = [];
+          this.warehousingMaterialList.forEach((item) => {
+            if (item.outInDetailRecordVOList?.length) {
+              item.outInDetailRecordVOList = item.outInDetailRecordVOList.map(
+                (i) => {
+                  return {
+                    ...i,
+                    outInCode: this.infoData.bizNo,
+                    outInId: item.outInId,
+                    measurementCount: i.totalCount,
+                    outboundDetailId: i.id,
+                    outboundType: 1,
+                    packageCount: i.packingCount,
+                    packingUnit: i.packingUnit,
+                    weight: i.weight,
+                    specification: item.specification,
+                    name: i.name,
+                    categoryCode: i.categoryCode,
+                    id: ''
+                  };
+                }
+              );
+              this.materialCodeReqList.push(...item.outInDetailRecordVOList);
+            }
+          });
+          //出库物料明细
+          if (this.materialCodeReqList.length) {
+            this.metaList = [];
+            this.materialCodeReqList.forEach((item) => {
+              if (item.outInDetailRecordMaterialDetailVOList?.length) {
+                item.outInDetailRecordMaterialDetailVOList =
+                  item.outInDetailRecordMaterialDetailVOList.map((i) => {
+                    return {
+                      ...i,
+                      outInId: item.outInId,
+                      outInCode: item.outInCode,
+                      measurementCount: 1,
+                      outboundDetailId: i.id,
+                      outboundType: 2,
+                      packageCount: i.packingCount,
+                      packingUnit: i.packingUnit,
+                      weight: i.weight,
+                      weightUtil: i.weightUnit,
+                      specification: item.specification,
+                      categoryCode: i.assetCode,
+                      name: i.assetName,
+                      id: ''
+                    };
+                  });
+                this.metaList.push(
+                  ...item.outInDetailRecordMaterialDetailVOList
+                );
+              }
+            });
+          }
+        }
+      },
+      getUserName(id) {
+        let obj = this.fromUserList.find((x) => x.id == id);
+        return obj && obj.name;
+      },
+      async getUser() {
+        let res22 = await warehouseDefinition.getUserPage({
+          groupId: 1,
+          size: 9999,
+          page: 1
+        });
+        this.fromUserList = res22.list;
+      },
+      // selectionChange(val){
+      //   this.selectionChangeList = val
+      // },
+      selectionChange2(val) {
+        this.selectionChangeList2 = val;
+        console.log(this.selectionChangeList2);
+      },
+      selectionChange3(val) {
+        this.selectionChangeList3 = val;
+        console.log(this.selectionChangeList3);
+      },
+      handleSave() {
+        if (
+          !this.selectionChangeList2.length &&
+          !this.selectionChangeList3.length
+        )
+          return this.$message.warning('请选择退货明细');
+        let params = [
+          ...this.selectionChangeList2,
+          ...this.selectionChangeList3
+        ];
+        this.$emit('saveDate', params);
+        this.cancel();
+      },
+      cancel() {
+        this.$emit('update:outboundDetailsDialogFlag', false);
+      },
+      ...mapActions('dict', ['requestDict'])
+    }
+  };
 </script>
 
 <style lang="scss" scoped>
-.stepsStatus {
-  width: 40%;
-  margin: 0 auto;
-}
-
-.p20 {
-  padding: 20px;
-}
-
-.flex {
-  display: flex;
-}
-
-.title {
-  justify-content: space-between;
-  border-bottom: 1px solid #ccc;
-  padding-bottom: 5px;
-
-  span {
-    font-size: 16px;
+  .stepsStatus {
+    width: 40%;
+    margin: 0 auto;
   }
 
-  .col {
-    padding-left: 40px;
-    font-size: 14px;
-    color: #aaaaaa;
-  }
-}
-
-.degree {
-  margin-right: 10px;
-  padding: 0px 15px;
-  color: #fff;
-  font-size: 13px;
-  line-height: 23px;
-  border-radius: 23px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-
-  span {
-    width: 5px;
-    height: 5px;
-    border-radius: 100%;
-    margin-right: 6px;
-    background-color: #fff;
+  .p20 {
+    padding: 20px;
   }
-}
 
-.red {
-  background-color: rgb(163, 0, 20);
-}
-
-.blue {
-  background-color: #1989fa;
-}
+  .flex {
+    display: flex;
+  }
 
-.createdInfo {
-  justify-content: space-around;
-  margin-top: 10px;
-  font-size: 14px;
+  .title {
+    justify-content: space-between;
+    border-bottom: 1px solid #ccc;
+    padding-bottom: 5px;
 
-  .col {
-    color: #6e6e6e;
-    padding-right: 10px;
-  }
-}
-
-.mt40 {
-  margin-top: 40px;
-}
-
-.custSteps {
-  margin-top: 20px;
-  margin-left: 70px;
-
-  .box {
-    width: 158px;
-    border: 1px solid #ccc;
-    padding: 10px;
-    flex-direction: row;
-    flex-wrap: wrap;
-    // justify-content: space-between;
-    font-size: 12px;
-    color: #9e9e9e;
-
-    .x {
-      width: 20px;
-      height: 15px;
-      margin-right: 5px;
+    span {
+      font-size: 16px;
     }
 
-    .q {
-      background-color: #d0e4d5;
+    .col {
+      padding-left: 40px;
+      font-size: 14px;
+      color: #aaaaaa;
     }
+  }
 
-    .b {
-      background-color: #1989fa;
-    }
+  .degree {
+    margin-right: 10px;
+    padding: 0px 15px;
+    color: #fff;
+    font-size: 13px;
+    line-height: 23px;
+    border-radius: 23px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
 
-    .g {
-      background-color: #157a2c;
+    span {
+      width: 5px;
+      height: 5px;
+      border-radius: 100%;
+      margin-right: 6px;
+      background-color: #fff;
     }
+  }
 
-    .r {
-      background-color: #a30014;
-    }
+  .red {
+    background-color: rgb(163, 0, 20);
+  }
 
-    .a {
-      align-items: center;
-      margin-bottom: 10px;
-    }
+  .blue {
+    background-color: #1989fa;
+  }
 
-    .mr10 {
-      margin-right: 10px;
-    }
+  .createdInfo {
+    justify-content: space-around;
+    margin-top: 10px;
+    font-size: 14px;
 
-    .mb0 {
-      margin-bottom: 0;
+    .col {
+      color: #6e6e6e;
+      padding-right: 10px;
     }
   }
 
-  .stepsInfo {
-    // flex: 1;
-    width: 483px;
+  .mt40 {
+    margin-top: 40px;
   }
-}
 
-.mt20 {
-  margin-top: 20px;
-}
+  .custSteps {
+    margin-top: 20px;
+    margin-left: 70px;
+
+    .box {
+      width: 158px;
+      border: 1px solid #ccc;
+      padding: 10px;
+      flex-direction: row;
+      flex-wrap: wrap;
+      // justify-content: space-between;
+      font-size: 12px;
+      color: #9e9e9e;
+
+      .x {
+        width: 20px;
+        height: 15px;
+        margin-right: 5px;
+      }
+
+      .q {
+        background-color: #d0e4d5;
+      }
+
+      .b {
+        background-color: #1989fa;
+      }
 
-.content-detail {
-  overflow: hidden;
-}
+      .g {
+        background-color: #157a2c;
+      }
 
-.executor {
-  font-size: 14px;
+      .r {
+        background-color: #a30014;
+      }
 
-  .col {
-    color: #6e6e6e;
-    padding-right: 10px;
+      .a {
+        align-items: center;
+        margin-bottom: 10px;
+      }
+
+      .mr10 {
+        margin-right: 10px;
+      }
+
+      .mb0 {
+        margin-bottom: 0;
+      }
+    }
+
+    .stepsInfo {
+      // flex: 1;
+      width: 483px;
+    }
   }
-}
 
-.result {
-  justify-content: space-around;
-}
+  .mt20 {
+    margin-top: 20px;
+  }
 
-.mr20 {
-  margin-right: 20px;
-}
+  .content-detail {
+    overflow: hidden;
+  }
 
-.details {
-  font-size: 14px;
-  margin-bottom: 10px;
-}
+  .executor {
+    font-size: 14px;
 
-.customSteps {
-  margin-top: 40px;
-  font-size: 14px;
-  margin-left: 80px;
+    .col {
+      color: #6e6e6e;
+      padding-right: 10px;
+    }
+  }
 
-  .time {
-    font-size: 12px;
-    color: #6e6e6e;
+  .result {
+    justify-content: space-around;
+  }
+
+  .mr20 {
     margin-right: 20px;
-    position: relative;
+  }
 
-    &::after {
-      content: '';
-      width: 1px;
-      height: 100%;
-      background-color: #157a2c;
-      position: absolute;
-      right: -26px;
-    }
+  .details {
+    font-size: 14px;
+    margin-bottom: 10px;
   }
 
-  .flex:last-child {
+  .customSteps {
+    margin-top: 40px;
+    font-size: 14px;
+    margin-left: 80px;
+
     .time {
+      font-size: 12px;
+      color: #6e6e6e;
+      margin-right: 20px;
+      position: relative;
+
       &::after {
-        display: none;
+        content: '';
+        width: 1px;
+        height: 100%;
+        background-color: #157a2c;
+        position: absolute;
+        right: -26px;
       }
     }
-  }
 
-  .round {
-    margin-right: 20px;
-    width: 10px;
-    height: 10px;
-    border-radius: 100%;
-    background-color: #157a2c;
-    position: relative;
+    .flex:last-child {
+      .time {
+        &::after {
+          display: none;
+        }
+      }
+    }
 
-    span {
-      position: absolute;
-      top: 50%;
-      left: 50%;
-      width: 4px;
-      height: 4px;
-      background-color: #fff;
+    .round {
+      margin-right: 20px;
+      width: 10px;
+      height: 10px;
       border-radius: 100%;
-      transform: translate(-2px, -2px);
+      background-color: #157a2c;
+      position: relative;
+
+      span {
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        width: 4px;
+        height: 4px;
+        background-color: #fff;
+        border-radius: 100%;
+        transform: translate(-2px, -2px);
+      }
     }
-  }
 
-  .text {
-    .info {
-      margin-top: 10px;
-      width: 955px;
-      background-color: #f0f3f3;
-      overflow: hidden;
-      padding: 10px;
-      margin-bottom: 10px;
+    .text {
+      .info {
+        margin-top: 10px;
+        width: 955px;
+        background-color: #f0f3f3;
+        overflow: hidden;
+        padding: 10px;
+        margin-bottom: 10px;
+      }
     }
   }
-}
 </style>

+ 5 - 1
src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/outboundToOutsourcing.vue

@@ -289,7 +289,11 @@
                   label="计量单位"
                   prop="measuringUnit"
                 ></el-table-column>
-                <el-table-column label="物料代号" prop="meterielCode">
+                <el-table-column
+                  label="物料代号"
+                  prop="meterielCode"
+                  width="130"
+                >
                 </el-table-column>
                 <el-table-column
                   label="客户代号"

+ 9 - 12
src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/outerFillWeight.vue

@@ -816,7 +816,7 @@
               label="计量单位"
               prop="measuringUnit"
             ></el-table-column>
-            <el-table-column label="物料代号" prop="materielCode">
+            <el-table-column label="物料代号" prop="materielCode" width="130">
               <template slot-scope="{ row }">
                 <span>{{ row.materielCode }}</span>
               </template>
@@ -1779,14 +1779,12 @@
         }
       },
       packNum(row, value) {
-        console.log(value);
-        console.log(row);
-        row.outInNum = value;
         const total = {
-          packingCount: Number(row.minPackingCount),
-          outInNum: Number(row.outInNum)
+          packingCount: Number(
+            row.minPackingCount > 0 ? row.minPackingCount : 0
+          ),
+          outInNum: Number(row.outInNum > 0 ? row.outInNum : 0)
         };
-        console.log(total);
         if (row.measuringUnit == row.weightUnit) {
           row.weight = Number(
             this.$math.format(
@@ -1795,15 +1793,14 @@
             )
           );
         } else {
-          console.log('-----------------');
-          if (!row.netWeight) {
-            row.netWeight = 0;
-          }
           const totals = Number(
             this.$math.format(total.packingCount * total.outInNum, 14)
           );
           row.weight = Number(
-            this.$math.format(totals * row.netWeight.toFixed(2), 14)
+            this.$math.format(
+              totals * (row.netWeight > 0 ? row.netWeight.toFixed(2) : 0),
+              14
+            )
           );
         }
         return (row.outInNum = value.replace(/^(0+)|[^\d]+/g, ''));

+ 5 - 1
src/views/bpm/handleTask/components/saleOrder/invoice/saleShipmentsOutbound.vue

@@ -537,7 +537,11 @@
                   label="计量单位"
                   prop="measuringUnit"
                 ></el-table-column>
-                <el-table-column label="物料代号" prop="meterielCode">
+                <el-table-column
+                  label="物料代号"
+                  prop="meterielCode"
+                  width="130"
+                >
                 </el-table-column>
                 <el-table-column
                   label="客户代号"

+ 5 - 1
src/views/bpm/outgoingManagement/add.vue

@@ -535,7 +535,11 @@
                   label="计量单位"
                   prop="measuringUnit"
                 ></el-table-column>
-                <el-table-column label="物料代号" prop="meterielCode">
+                <el-table-column
+                  label="物料代号"
+                  prop="meterielCode"
+                  width="130"
+                >
                 </el-table-column>
                 <el-table-column
                   label="客户代号"

+ 5 - 1
src/views/bpm/outgoingManagement/components/batchDetail.vue

@@ -21,7 +21,11 @@
         prop="availableCountBase"
       ></el-table-column>
       <el-table-column label="计量单位" prop="measuringUnit"></el-table-column>
-      <el-table-column label="物料代号" prop="materielCode"></el-table-column>
+      <el-table-column
+        label="物料代号"
+        prop="materielCode"
+        width="130"
+      ></el-table-column>
       <el-table-column label="客户代号" prop="clientCode"></el-table-column>
       <el-table-column label="重量" prop="weight"></el-table-column>
       <el-table-column label="重量单位" prop="weightUnit"></el-table-column>

+ 10 - 5
src/views/bpm/stockManagement/add.vue

@@ -865,7 +865,7 @@
               label="计量单位"
               prop="measuringUnit"
             ></el-table-column>
-            <el-table-column label="物料代号" prop="materielCode">
+            <el-table-column label="物料代号" prop="materielCode" width="130">
               <template slot-scope="{ row }">
                 <el-input
                   v-if="!row.isPack"
@@ -1036,7 +1036,7 @@
               label="计量单位"
               prop="measuringUnit"
             ></el-table-column>
-            <el-table-column label="物料代号" prop="meterielCode">
+            <el-table-column label="物料代号" prop="meterielCode" width="130">
               <template slot-scope="{ row }">
                 <el-input
                   v-model="row.materielCode"
@@ -1590,8 +1590,10 @@
       },
       packNum(row, value) {
         const total = {
-          packingCount: Number(row.minPackingCount),
-          outInNum: Number(row.outInNum)
+          packingCount: Number(
+            row.minPackingCount > 0 ? row.minPackingCount : 0
+          ),
+          outInNum: Number(row.outInNum > 0 ? row.outInNum : 0)
         };
         if (row.measuringUnit == row.weightUnit) {
           row.weight = Number(
@@ -1605,7 +1607,10 @@
             this.$math.format(total.packingCount * total.outInNum, 14)
           );
           row.weight = Number(
-            this.$math.format(totals * row.netWeight.toFixed(2), 14)
+            this.$math.format(
+              totals * (row.netWeight > 0 ? row.netWeight.toFixed(2) : 0),
+              14
+            )
           );
         }
         return (row.outInNum = value.replace(/^(0+)|[^\d]+/g, ''));