Merge remote-tracking branch 'origin/master'

src/views/bpm/handleTask/components/inoutBound/detailDialog_new.vue

@@ -256,6 +256,7 @@
                       required
                     >
                       <el-input
+                        type="number"
                         v-model="row.minPackingCount"
                         @input="minPackingCountChange(row, $event)"
                       >
@@ -1198,7 +1199,12 @@
       getAuditStatus: useDictLabel(auditStatus),
       // 包装维度最小包装单元改变——>总重量
       minPackingCountChange(row, value) {
-        row.minPackingCount = value.replace(/^(0+)|[^\d]+/g, '');
+        if (value >= 0) {
+          row.minPackingCount = value;
+        } else {
+          row.minPackingCount = 0;
+        }
+        // row.minPackingCount = value.replace(/^(0+)|[^\d]+/g, '');
         if (row.outInNum >= 0 && value >= 0) {
           this.packNum(row, row.outInNum);
         }

src/views/bpm/handleTask/components/productionWarehousing/productionWarehousing.vue

@@ -280,6 +280,7 @@
                       required
                     >
                       <el-input
+                        type="number"
                         v-model="row.minPackingCount"
                         @input="minPackingCountChange(row, $event)"
                       >
@@ -321,7 +322,7 @@
               </el-table-column>
               <el-table-column label="计量数量" prop="counts">
                 <template slot-scope="{ row, $index }">
-                  {{ row.minPackingCount * row.outInNum }}
+                  {{ $math.format(row.minPackingCount * row.outInNum, 14) }}
                 </template>
               </el-table-column>
               <el-table-column
@@ -612,7 +613,7 @@
             <el-table-column label="重量" prop="weight" width="100">
               <template slot-scope="{ row }">
                 <el-input
-                  v-if="!row.isPack"
+                  v-if="!row.isPack && row.measuringUnit != row.weightUtil"
                   v-model="row.weight"
                   @input="weightInput($event, row)"
                 ></el-input>
@@ -787,7 +788,10 @@
             </el-table-column>
             <el-table-column width="100" label="重量" prop="weight">
               <template slot-scope="{ row }">
-                <el-input v-model="row.weight" v-if="!row.isPack"></el-input>
+                <el-input
+                  v-model="row.weight"
+                  v-if="!row.isPack && row.measuringUnit != row.weightUnit"
+                ></el-input>
                 <span v-else>{{ row.weight }}</span>
               </template>
             </el-table-column>
@@ -968,7 +972,12 @@
     methods: {
       // 包装维度最小包装单元改变——>总重量
       minPackingCountChange(row, value) {
-        row.minPackingCount = value.replace(/^(0+)|[^\d]+/g, '');
+        if (value >= 0) {
+          row.minPackingCount = value;
+        } else {
+          row.minPackingCount = 0;
+        }
+        // row.minPackingCount = value.replace(/^(0+)|[^\d]+/g, '');
         if (row.outInNum >= 0 && value >= 0) {
           this.packNum(row, row.outInNum);
         }
@@ -1364,7 +1373,12 @@
           outInNum: Number(outInNum > 0 ? outInNum : 0),
           univalence: Number(univalence == undefined ? 0 : univalence)
         };
-        return total.PackingCount * total.outInNum * total.univalence;
+        return Number(
+          this.$math.format(
+            total.PackingCount * total.outInNum * total.univalence,
+            14
+          )
+        );
       },
       handleRowUnit(row) {
         return row.measuringUnit;
@@ -1729,11 +1743,10 @@
               let arr = this.warehousingMaterialList.map((item) => {
                 console.log(item, 'item');
                 return {
-                  netWeight: item.netWeight,
-                  num: item.num,
+                  netWeight: item.netWeight > 0 ? item.netWeight : 0,
+                  num: item.num > 0 ? item.num : 0,
                   manualBatchNo: item.manualBatchNo,
                   batchNo: item.batchNo,
-                  code: item.productCode,
                   categoryId:
                     this.formData.bizType == 2
                       ? item.categoryId
@@ -1741,21 +1754,37 @@
                         : item.id
                       : item.id,
                   count:
-                    parseInt(item.outInNum) * parseInt(item.minPackingCount),
-                  minPackingCount: item.minPackingCount,
-                  packingCount: item.outInNum,
-                  price: item.univalence,
+                    item.outInNum > 0 && item.minPackingCount > 0
+                      ? this.$math.format(
+                          parseInt(item.outInNum) *
+                            parseInt(item.minPackingCount),
+                          14
+                        )
+                      : 0,
+                  minPackingCount:
+                    item.minPackingCount > 0 ? item.minPackingCount : 0,
+                  packingCount: item.outInNum > 0 ? item.outInNum : 0,
+                  price: item.univalence > 0 ? item.univalence : 0,
                   outInDetailRecordAddPOList: item.warehouseLedgerDetails,
                   position: `${item.warehouseName}-${item.areaName}-${item.shelfCode}-${item.cargoSpaceCode}`,
                   remark: '',
                   pathIds: `${item.warehouseId},${item.areaId},${item.shelfId},${item.cargoSpaceId}`,
                   pathName: `${item.warehouseName},${item.areaName},${item.shelfCode},${item.cargoSpaceCode}`,
                   totalMoney:
-                    item.outInNum * item.minPackingCount * item.univalence,
+                    item.outInNum > 0 &&
+                    item.minPackingCount > 0 &&
+                    item.univalence > 0
+                      ? this.$math.format(
+                          item.outInNum *
+                            item.minPackingCount *
+                            item.univalence,
+                          14
+                        )
+                      : 0,
                   weightUnit: item.weightUnit,
                   customCode: item.customCode,
                   supplierCode: item.supplierCode,
-                  weight: item.weight,
+                  weight: item.weight > 0 ? item.weight : 0,
                   houseList: [
                     `${item.warehouseName},${item.areaName},${item.shelfCode},${item.cargoSpaceCode}`
                   ]

src/views/bpm/handleTask/components/purchaseOrder/invoice/detailDialog.vue

@@ -169,6 +169,14 @@
       type="sourceBizNo"
       @success="success"
     ></add>
+    <!-- <add
+      ref="add"
+      v-if="activeComp == 'inoutBound'"
+      :inboundType="form.sourceType"
+      :form="form"
+      type="productiveOrUnproductiveStorage"
+      @success="success"
+    ></add> -->
   </div>
 </template>
 

src/views/bpm/handleTask/components/purchaseOrder/invoice/procurementStorage.vue

@@ -234,6 +234,7 @@
                       required
                     >
                       <el-input
+                        type="number"
                         v-model="row.minPackingCount"
                         @input="minPackingCountChange(row, $event)"
                       >
@@ -275,7 +276,7 @@
               </el-table-column>
               <el-table-column label="计量数量" prop="counts">
                 <template slot-scope="{ row, $index }">
-                  {{ row.minPackingCount * row.outInNum }}
+                  {{ $math.format(row.minPackingCount * row.outInNum, 14) }}
                 </template>
               </el-table-column>
               <el-table-column
@@ -566,7 +567,7 @@
             <el-table-column label="重量" prop="weight" width="100">
               <template slot-scope="{ row }">
                 <el-input
-                  v-if="!row.isPack"
+                  v-if="!row.isPack && row.measuringUnit != row.weightUtil"
                   v-model="row.weight"
                   @input="weightInput($event, row)"
                 ></el-input>
@@ -741,7 +742,10 @@
             </el-table-column>
             <el-table-column width="100" label="重量" prop="weight">
               <template slot-scope="{ row }">
-                <el-input v-model="row.weight" v-if="!row.isPack"></el-input>
+                <el-input
+                  v-model="row.weight"
+                  v-if="!row.isPack && row.measuringUnit != row.weightUnit"
+                ></el-input>
                 <span v-else>{{ row.weight }}</span>
               </template>
             </el-table-column>
@@ -922,7 +926,12 @@
     methods: {
       // 包装维度最小包装单元改变——>总重量
       minPackingCountChange(row, value) {
-        row.minPackingCount = value.replace(/^(0+)|[^\d]+/g, '');
+        if (value >= 0) {
+          row.minPackingCount = value;
+        } else {
+          row.minPackingCount = 0;
+        }
+        // row.minPackingCount = value.replace(/^(0+)|[^\d]+/g, '');
         if (row.outInNum >= 0 && value >= 0) {
           this.packNum(row, row.outInNum);
         }
@@ -1316,7 +1325,12 @@
           outInNum: Number(outInNum > 0 ? outInNum : 0),
           univalence: Number(univalence == undefined ? 0 : univalence)
         };
-        return total.PackingCount * total.outInNum * total.univalence;
+        return Number(
+          this.$math.format(
+            total.PackingCount * total.outInNum * total.univalence,
+            14
+          )
+        );
       },
       handleRowUnit(row) {
         return row.measuringUnit;
@@ -1681,11 +1695,10 @@
               let arr = this.warehousingMaterialList.map((item) => {
                 console.log(item, 'item');
                 return {
-                  netWeight: item.netWeight,
-                  num: item.num,
+                  netWeight: item.netWeight > 0 ? item.netWeight : 0,
+                  num: item.num > 0 ? item.num : 0,
                   manualBatchNo: item.manualBatchNo,
                   batchNo: item.batchNo,
-                  code: item.productCode,
                   categoryId:
                     this.formData.bizType == 2
                       ? item.categoryId
@@ -1693,21 +1706,37 @@
                         : item.id
                       : item.id,
                   count:
-                    parseInt(item.outInNum) * parseInt(item.minPackingCount),
-                  minPackingCount: item.minPackingCount,
-                  packingCount: item.outInNum,
-                  price: item.univalence,
+                    item.outInNum > 0 && item.minPackingCount > 0
+                      ? this.$math.format(
+                          parseInt(item.outInNum) *
+                            parseInt(item.minPackingCount),
+                          14
+                        )
+                      : 0,
+                  minPackingCount:
+                    item.minPackingCount > 0 ? item.minPackingCount : 0,
+                  packingCount: item.outInNum > 0 ? item.outInNum : 0,
+                  price: item.univalence > 0 ? item.univalence : 0,
                   outInDetailRecordAddPOList: item.warehouseLedgerDetails,
                   position: `${item.warehouseName}-${item.areaName}-${item.shelfCode}-${item.cargoSpaceCode}`,
                   remark: '',
                   pathIds: `${item.warehouseId},${item.areaId},${item.shelfId},${item.cargoSpaceId}`,
                   pathName: `${item.warehouseName},${item.areaName},${item.shelfCode},${item.cargoSpaceCode}`,
                   totalMoney:
-                    item.outInNum * item.minPackingCount * item.univalence,
+                    item.outInNum > 0 &&
+                    item.minPackingCount > 0 &&
+                    item.univalence > 0
+                      ? this.$math.format(
+                          item.outInNum *
+                            item.minPackingCount *
+                            item.univalence,
+                          14
+                        )
+                      : 0,
                   weightUnit: item.weightUnit,
                   customCode: item.customCode,
                   supplierCode: item.supplierCode,
-                  weight: item.weight,
+                  weight: item.weight > 0 ? item.weight : 0,
                   houseList: [
                     `${item.warehouseName},${item.areaName},${item.shelfCode},${item.cargoSpaceCode}`
                   ]

src/views/bpm/handleTask/components/purchaseOrder/invoice/procurementStorage_new.vue

@@ -183,6 +183,7 @@
                       required
                     >
                       <el-input
+                        type="number"
                         v-model="row.minPackingCount"
                         @input="minPackingCountChange(row, $event)"
                       >
@@ -890,7 +891,12 @@
       },
       // 包装维度最小包装单元改变——>总重量
       minPackingCountChange(row, value) {
-        row.minPackingCount = value.replace(/^(0+)|[^\d]+/g, '');
+        if (value >= 0) {
+          row.minPackingCount = value;
+        } else {
+          row.minPackingCount = 0;
+        }
+        // row.minPackingCount = value.replace(/^(0+)|[^\d]+/g, '');
         if (row.outInNum >= 0 && value >= 0) {
           this.packNum(row, row.outInNum);
         }
@@ -1571,13 +1577,12 @@
                   this.$set(i, 'minPackingCount ', item.minPackingCount);
                   this.$set(i, 'measuringUnit', item.measuringUnit);
                   this.$set(i, 'isPack', false);
-                  console.log('inboundType------------', this.inboundType);
-                  if (this.inboundType == '1') {
+                  if (this.form.inboundType == '1') {
                     // 生产性采购(未检)
                     this.$set(i, 'result', '');
                     this.$set(i, 'status', '0');
                   } else {
-                    // 非生产性采购(已检合格)
+                    // 非生产性采购以及其他(已检合格)
                     this.$set(i, 'result', '0');
                     this.$set(i, 'status', '1');
                   }

src/views/bpm/handleTask/components/purchaseOrder/invoice/procurementWarehousing copy 2.vue

@@ -241,6 +241,7 @@
                       required
                     >
                       <el-input
+                        type="number"
                         v-model="row.minPackingCount"
                         @input="minPackingCountChange(row, $event)"
                       >
@@ -1272,7 +1273,12 @@
       getAuditStatus: useDictLabel(auditStatus),
       // 包装维度最小包装单元改变——>总重量
       minPackingCountChange(row, value) {
-        row.minPackingCount = value.replace(/^(0+)|[^\d]+/g, '');
+        if (value >= 0) {
+          row.minPackingCount = value;
+        } else {
+          row.minPackingCount = 0;
+        }
+        // row.minPackingCount = value.replace(/^(0+)|[^\d]+/g, '');
         if (row.outInNum >= 0 && value >= 0) {
           this.packNum(row, row.outInNum);
         }

src/views/bpm/handleTask/components/purchaseOrder/invoice/procurementWarehousing copy.vue

@@ -241,6 +241,7 @@
                       required
                     >
                       <el-input
+                        type="number"
                         v-model="row.minPackingCount"
                         @input="minPackingCountChange(row, $event)"
                       >
@@ -1323,7 +1324,12 @@
       getAuditStatus: useDictLabel(auditStatus),
       // 包装维度最小包装单元改变——>总重量
       minPackingCountChange(row, value) {
-        row.minPackingCount = value.replace(/^(0+)|[^\d]+/g, '');
+        if (value >= 0) {
+          row.minPackingCount = value;
+        } else {
+          row.minPackingCount = 0;
+        }
+        // row.minPackingCount = value.replace(/^(0+)|[^\d]+/g, '');
         if (row.outInNum >= 0 && value >= 0) {
           this.packNum(row, row.outInNum);
         }

src/views/bpm/handleTask/components/purchaseOrder/invoice/procurementWarehousing.vue

@@ -271,6 +271,7 @@
                       required
                     >
                       <el-input
+                        type="number"
                         v-model="row.minPackingCount"
                         @input="minPackingCountChange(row, $event)"
                       >
@@ -312,7 +313,7 @@
               </el-table-column>
               <el-table-column label="计量数量" prop="counts">
                 <template slot-scope="{ row, $index }">
-                  {{ row.minPackingCount * row.outInNum }}
+                  {{ $math.format(row.minPackingCount * row.outInNum, 14) }}
                 </template>
               </el-table-column>
               <el-table-column
@@ -712,7 +713,7 @@
             <el-table-column label="重量" prop="weight" width="100">
               <template slot-scope="{ row }">
                 <el-input
-                  v-if="!row.isPack"
+                  v-if="!row.isPack && row.measuringUnit != row.weightUtil"
                   v-model="row.weight"
                   @input="weightInput($event, row)"
                 ></el-input>
@@ -908,7 +909,10 @@
             </el-table-column>
             <el-table-column width="100" label="重量" prop="weight">
               <template slot-scope="{ row }">
-                <el-input v-model="row.weight" v-if="!row.isPack"></el-input>
+                <el-input
+                  v-model="row.weight"
+                  v-if="!row.isPack && row.measuringUnit != row.weightUnit"
+                ></el-input>
                 <span v-else>{{ row.weight }}</span>
               </template>
             </el-table-column>
@@ -1471,9 +1475,12 @@
       getAuditStatus: useDictLabel(auditStatus),
       // 包装维度最小包装单元改变——>总重量
       minPackingCountChange(row, value) {
-        row.minPackingCount = value.replace(/^(0+)|[^\d]+/g, '');
-        console.log(row);
-        console.log(value);
+        if (value >= 0) {
+          row.minPackingCount = value;
+        } else {
+          row.minPackingCount = 0;
+        }
+        // row.minPackingCount = value.replace(/^(0+)|[^\d]+/g, '');
         if (row.outInNum > 0 && value > 0) {
           this.packNum(row, row.outInNum);
         }
@@ -2579,31 +2586,45 @@
         let arr = this.warehousingMaterialList.map((item) => {
           console.log(item, 'item');
           return {
-            netWeight: item.netWeight,
-            num: item.num,
+            netWeight: item.netWeight > 0 ? item.netWeight : 0,
+            num: item.num > 0 ? item.num : 0,
             manualBatchNo: item.manualBatchNo,
             batchNo: item.batchNo,
-            code: item.productCode,
             categoryId:
               this.formData.bizType == 2
                 ? item.categoryId
                   ? item.categoryId
                   : item.id
                 : item.id,
-            count: parseInt(item.outInNum) * parseInt(item.minPackingCount),
-            minPackingCount: item.minPackingCount,
-            packingCount: item.outInNum,
-            price: item.univalence,
+            count:
+              item.outInNum > 0 && item.minPackingCount > 0
+                ? this.$math.format(
+                    parseInt(item.outInNum) * parseInt(item.minPackingCount),
+                    14
+                  )
+                : 0,
+            minPackingCount:
+              item.minPackingCount > 0 ? item.minPackingCount : 0,
+            packingCount: item.outInNum > 0 ? item.outInNum : 0,
+            price: item.univalence > 0 ? item.univalence : 0,
             outInDetailRecordAddPOList: item.warehouseLedgerDetails,
             position: `${item.warehouseName}-${item.areaName}-${item.shelfCode}-${item.cargoSpaceCode}`,
             remark: '',
             pathIds: `${item.warehouseId},${item.areaId},${item.shelfId},${item.cargoSpaceId}`,
             pathName: `${item.warehouseName},${item.areaName},${item.shelfCode},${item.cargoSpaceCode}`,
-            totalMoney: item.outInNum * item.minPackingCount * item.univalence,
+            totalMoney:
+              item.outInNum > 0 &&
+              item.minPackingCount > 0 &&
+              item.univalence > 0
+                ? this.$math.format(
+                    item.outInNum * item.minPackingCount * item.univalence,
+                    14
+                  )
+                : 0,
             weightUnit: item.weightUnit,
             customCode: item.customCode,
             supplierCode: item.supplierCode,
-            weight: item.weight
+            weight: item.weight > 0 ? item.weight : 0
           };
         });
         arr.forEach((item) => {

src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/inboundDetails.vue

@@ -201,6 +201,7 @@
                       required
                     >
                       <el-input
+                        type="number"
                         v-model="row.minPackingCount"
                         @input="minPackingCountChange(row, $event)"
                       >
@@ -248,9 +249,11 @@
               <el-table-column label="计量数量" prop="counts">
                 <template slot-scope="{ row, $index }">
                   <span v-if="formData.isStorage">{{
-                    row.packingCount * row.minPackingCount
+                    $math.format(row.packingCount * row.minPackingCount, 14)
+                  }}</span>
+                  <span v-else>{{
+                    $math.format(row.minPackingCount * row.outInNum, 14)
                   }}</span>
-                  <span v-else>{{ row.minPackingCount * row.outInNum }}</span>
                 </template>
               </el-table-column>
               <el-table-column
@@ -543,7 +546,7 @@
             <el-table-column label="重量" prop="weight" width="100">
               <template slot-scope="{ row }">
                 <el-input
-                  v-if="!row.isPack"
+                  v-if="!row.isPack && row.measuringUnit != row.weightUtil"
                   v-model="row.weight"
                   @input="weightInput($event, row)"
                 ></el-input>
@@ -709,7 +712,10 @@
             </el-table-column>
             <el-table-column width="100" label="重量" prop="weight">
               <template slot-scope="{ row }">
-                <el-input v-model="row.weight" v-if="!row.isPack"></el-input>
+                <el-input
+                  v-model="row.weight"
+                  v-if="!row.isPack && row.measuringUnit != row.weightUnit"
+                ></el-input>
                 <span v-else>{{ row.weight }}</span>
               </template>
             </el-table-column>
@@ -990,7 +996,12 @@
       },
       // 包装维度最小包装单元改变——>总重量
       minPackingCountChange(row, value) {
-        row.minPackingCount = value.replace(/^(0+)|[^\d]+/g, '');
+        if (value >= 0) {
+          row.minPackingCount = value;
+        } else {
+          row.minPackingCount = 0;
+        }
+        // row.minPackingCount = value.replace(/^(0+)|[^\d]+/g, '');
         if (row.outInNum >= 0 && value >= 0) {
           this.packNum(row, row.outInNum);
         }
@@ -1318,7 +1329,12 @@
           outInNum: Number(outInNum >= 0 ? outInNum : 0),
           univalence: Number(univalence >= 0 ? univalence : 0)
         };
-        return total.PackingCount * total.outInNum * total.univalence;
+        return Number(
+          this.$math.format(
+            total.PackingCount * total.outInNum * total.univalence,
+            14
+          )
+        );
       },
       handleRowUnit(row) {
         return row.measuringUnit;
@@ -1785,11 +1801,10 @@
               let arr = this.warehousingMaterialList.map((item) => {
                 console.log(item, 'item');
                 return {
-                  netWeight: item.netWeight,
-                  num: item.num,
+                  netWeight: item.netWeight > 0 ? item.netWeight : 0,
+                  num: item.num > 0 ? item.num : 0,
                   manualBatchNo: item.manualBatchNo,
                   batchNo: item.batchNo,
-                  code: item.productCode,
                   categoryId:
                     this.formData.bizType == 2
                       ? item.categoryId
@@ -1797,21 +1812,37 @@
                         : item.id
                       : item.id,
                   count:
-                    parseInt(item.outInNum) * parseInt(item.minPackingCount),
-                  minPackingCount: item.minPackingCount,
-                  packingCount: item.outInNum,
-                  price: item.univalence,
+                    item.outInNum > 0 && item.minPackingCount > 0
+                      ? this.$math.format(
+                          parseInt(item.outInNum) *
+                            parseInt(item.minPackingCount),
+                          14
+                        )
+                      : 0,
+                  minPackingCount:
+                    item.minPackingCount > 0 ? item.minPackingCount : 0,
+                  packingCount: item.outInNum > 0 ? item.outInNum : 0,
+                  price: item.univalence > 0 ? item.univalence : 0,
                   outInDetailRecordAddPOList: item.warehouseLedgerDetails,
                   position: `${item.warehouseName}-${item.areaName}-${item.shelfCode}-${item.cargoSpaceCode}`,
                   remark: '',
                   pathIds: `${item.warehouseId},${item.areaId},${item.shelfId},${item.cargoSpaceId}`,
                   pathName: `${item.warehouseName},${item.areaName},${item.shelfCode},${item.cargoSpaceCode}`,
                   totalMoney:
-                    item.outInNum * item.minPackingCount * item.univalence,
+                    item.outInNum > 0 &&
+                    item.minPackingCount > 0 &&
+                    item.univalence > 0
+                      ? this.$math.format(
+                          item.outInNum *
+                            item.minPackingCount *
+                            item.univalence,
+                          14
+                        )
+                      : 0,
                   weightUnit: item.weightUnit,
                   customCode: item.customCode,
                   supplierCode: item.supplierCode,
-                  weight: item.weight,
+                  weight: item.weight > 0 ? item.weight : 0,
                   houseList: [
                     `${item.warehouseName},${item.areaName},${item.shelfCode},${item.cargoSpaceCode}`
                   ]

src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/innerFillWeight.vue

@@ -242,6 +242,7 @@
                       required
                     >
                       <el-input
+                        type="number"
                         v-model="row.minPackingCount"
                         @input="minPackingCountChange(row, $event)"
                       >
@@ -283,7 +284,7 @@
               </el-table-column>
               <el-table-column label="计量数量" prop="counts">
                 <template slot-scope="{ row, $index }">
-                  {{ row.minPackingCount * row.outInNum }}
+                  {{ $math.format(row.minPackingCount * row.outInNum, 14) }}
                 </template>
               </el-table-column>
               <el-table-column
@@ -1381,9 +1382,12 @@
       getAuditStatus: useDictLabel(auditStatus),
       // 包装维度最小包装单元改变——>总重量
       minPackingCountChange(row, value) {
-        row.minPackingCount = value.replace(/^(0+)|[^\d]+/g, '');
-        console.log(row);
-        console.log(value);
+        if (value >= 0) {
+          row.minPackingCount = value;
+        } else {
+          row.minPackingCount = 0;
+        }
+        // row.minPackingCount = value.replace(/^(0+)|[^\d]+/g, '');
         if (row.outInNum > 0 && value > 0) {
           this.packNum(row, row.outInNum);
         }
@@ -2446,31 +2450,45 @@
         let arr = this.warehousingMaterialList.map((item) => {
           console.log(item, 'item');
           return {
-            netWeight: item.netWeight,
-            num: item.num,
+            netWeight: item.netWeight > 0 ? item.netWeight : 0,
+            num: item.num > 0 ? item.num : 0,
             manualBatchNo: item.manualBatchNo,
             batchNo: item.batchNo,
-            code: item.productCode,
             categoryId:
               this.formData.bizType == 2
                 ? item.categoryId
                   ? item.categoryId
                   : item.id
                 : item.id,
-            count: parseInt(item.outInNum) * parseInt(item.minPackingCount),
-            minPackingCount: item.minPackingCount,
-            packingCount: item.outInNum,
-            price: item.univalence,
+            count:
+              item.outInNum > 0 && item.minPackingCount > 0
+                ? this.$math.format(
+                    parseInt(item.outInNum) * parseInt(item.minPackingCount),
+                    14
+                  )
+                : 0,
+            minPackingCount:
+              item.minPackingCount > 0 ? item.minPackingCount : 0,
+            packingCount: item.outInNum > 0 ? item.outInNum : 0,
+            price: item.univalence > 0 ? item.univalence : 0,
             outInDetailRecordAddPOList: item.warehouseLedgerDetails,
             position: `${item.warehouseName}-${item.areaName}-${item.shelfCode}-${item.cargoSpaceCode}`,
             remark: '',
             pathIds: `${item.warehouseId},${item.areaId},${item.shelfId},${item.cargoSpaceId}`,
             pathName: `${item.warehouseName},${item.areaName},${item.shelfCode},${item.cargoSpaceCode}`,
-            totalMoney: item.outInNum * item.minPackingCount * item.univalence,
+            totalMoney:
+              item.outInNum > 0 &&
+              item.minPackingCount > 0 &&
+              item.univalence > 0
+                ? this.$math.format(
+                    item.outInNum * item.minPackingCount * item.univalence,
+                    14
+                  )
+                : 0,
             weightUnit: item.weightUnit,
             customCode: item.customCode,
             supplierCode: item.supplierCode,
-            weight: item.weight
+            weight: item.weight > 0 ? item.weight : 0
           };
         });
         arr.forEach((item) => {

src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/interiorProductionStorage.vue

@@ -209,6 +209,7 @@
                       required
                     >
                       <el-input
+                        type="number"
                         v-model="row.minPackingCount"
                         @input="minPackingCountChange(row, $event)"
                       >
@@ -256,9 +257,11 @@
               <el-table-column label="计量数量" prop="counts">
                 <template slot-scope="{ row, $index }">
                   <span v-if="formData.isStorage">{{
-                    row.packingCount * row.minPackingCount
+                    $math.format(row.packingCount * row.minPackingCount, 14)
+                  }}</span>
+                  <span v-else>{{
+                    $math.format(row.minPackingCount * row.outInNum, 14)
                   }}</span>
-                  <span v-else>{{ row.minPackingCount * row.outInNum }}</span>
                 </template>
               </el-table-column>
               <el-table-column
@@ -554,7 +557,7 @@
             <el-table-column label="重量" prop="weight" width="100">
               <template slot-scope="{ row }">
                 <el-input
-                  v-if="!row.isPack"
+                  v-if="!row.isPack && row.measuringUnit != row.weightUtil"
                   v-model="row.weight"
                   @input="weightInput($event, row)"
                 ></el-input>
@@ -721,7 +724,10 @@
             </el-table-column>
             <el-table-column width="100" label="重量" prop="weight">
               <template slot-scope="{ row }">
-                <el-input v-model="row.weight" v-if="!row.isPack"></el-input>
+                <el-input
+                  v-model="row.weight"
+                  v-if="!row.isPack && row.measuringUnit != row.weightUnit"
+                ></el-input>
                 <span v-else>{{ row.weight }}</span>
               </template>
             </el-table-column>
@@ -1064,7 +1070,12 @@
       },
       // 包装维度最小包装单元改变——>总重量
       minPackingCountChange(row, value) {
-        row.minPackingCount = value.replace(/^(0+)|[^\d]+/g, '');
+        if (value >= 0) {
+          row.minPackingCount = value;
+        } else {
+          row.minPackingCount = 0;
+        }
+        // row.minPackingCount = value.replace(/^(0+)|[^\d]+/g, '');
         if (row.outInNum >= 0 && value >= 0) {
           this.packNum(row, row.outInNum);
         }
@@ -1483,7 +1494,12 @@
           outInNum: Number(outInNum > 0 ? outInNum : 0),
           univalence: Number(univalence > 0 ? univalence : 0)
         };
-        return total.PackingCount * total.outInNum * total.univalence;
+        return Number(
+          this.$math.format(
+            total.PackingCount * total.outInNum * total.univalence,
+            14
+          )
+        );
       },
       handleRowUnit(row) {
         return row.measuringUnit;
@@ -2030,11 +2046,10 @@
               let arr = this.warehousingMaterialList.map((item) => {
                 console.log(item, 'item');
                 return {
-                  netWeight: item.netWeight,
-                  num: item.num,
+                  netWeight: item.netWeight > 0 ? item.netWeight : 0,
+                  num: item.num > 0 ? item.num : 0,
                   manualBatchNo: item.manualBatchNo,
                   batchNo: item.batchNo,
-                  code: item.productCode,
                   categoryId:
                     this.formData.bizType == 2
                       ? item.categoryId
@@ -2042,21 +2057,37 @@
                         : item.id
                       : item.id,
                   count:
-                    parseInt(item.outInNum) * parseInt(item.minPackingCount),
-                  minPackingCount: item.minPackingCount,
-                  packingCount: item.outInNum,
-                  price: item.univalence,
+                    item.outInNum > 0 && item.minPackingCount > 0
+                      ? this.$math.format(
+                          parseInt(item.outInNum) *
+                            parseInt(item.minPackingCount),
+                          14
+                        )
+                      : 0,
+                  minPackingCount:
+                    item.minPackingCount > 0 ? item.minPackingCount : 0,
+                  packingCount: item.outInNum > 0 ? item.outInNum : 0,
+                  price: item.univalence > 0 ? item.univalence : 0,
                   outInDetailRecordAddPOList: item.warehouseLedgerDetails,
                   position: `${item.warehouseName}-${item.areaName}-${item.shelfCode}-${item.cargoSpaceCode}`,
                   remark: '',
                   pathIds: `${item.warehouseId},${item.areaId},${item.shelfId},${item.cargoSpaceId}`,
                   pathName: `${item.warehouseName},${item.areaName},${item.shelfCode},${item.cargoSpaceCode}`,
                   totalMoney:
-                    item.outInNum * item.minPackingCount * item.univalence,
+                    item.outInNum > 0 &&
+                    item.minPackingCount > 0 &&
+                    item.univalence > 0
+                      ? this.$math.format(
+                          item.outInNum *
+                            item.minPackingCount *
+                            item.univalence,
+                          14
+                        )
+                      : 0,
                   weightUnit: item.weightUnit,
                   customCode: item.customCode,
                   supplierCode: item.supplierCode,
-                  weight: item.weight,
+                  weight: item.weight > 0 ? item.weight : 0,
                   houseList: [
                     `${item.warehouseName},${item.areaName},${item.shelfCode},${item.cargoSpaceCode}`
                   ]
@@ -2101,32 +2132,46 @@
             let arr = this.warehousingMaterialList.map((item) => {
               console.log(item, 'item');
               return {
-                netWeight: item.netWeight,
-                num: item.num,
+                netWeight: item.netWeight > 0 ? item.netWeight : 0,
+                num: item.num > 0 ? item.num : 0,
                 manualBatchNo: item.manualBatchNo,
                 batchNo: item.batchNo,
-                code: item.productCode,
                 categoryId:
                   this.formData.bizType == 2
                     ? item.categoryId
                       ? item.categoryId
                       : item.id
                     : item.id,
-                count: parseInt(item.outInNum) * parseInt(item.minPackingCount),
-                minPackingCount: item.minPackingCount,
-                packingCount: item.outInNum,
-                price: item.univalence,
+                count:
+                  item.outInNum > 0 && item.minPackingCount > 0
+                    ? this.$math.format(
+                        parseInt(item.outInNum) *
+                          parseInt(item.minPackingCount),
+                        14
+                      )
+                    : 0,
+                minPackingCount:
+                  item.minPackingCount > 0 ? item.minPackingCount : 0,
+                packingCount: item.outInNum > 0 ? item.outInNum : 0,
+                price: item.univalence > 0 ? item.univalence : 0,
                 outInDetailRecordAddPOList: item.warehouseLedgerDetails,
                 position: `${item.warehouseName}-${item.areaName}-${item.shelfCode}-${item.cargoSpaceCode}`,
                 remark: '',
                 pathIds: `${item.warehouseId},${item.areaId},${item.shelfId},${item.cargoSpaceId}`,
                 pathName: `${item.warehouseName},${item.areaName},${item.shelfCode},${item.cargoSpaceCode}`,
                 totalMoney:
-                  item.outInNum * item.minPackingCount * item.univalence,
+                  item.outInNum > 0 &&
+                  item.minPackingCount > 0 &&
+                  item.univalence > 0
+                    ? this.$math.format(
+                        item.outInNum * item.minPackingCount * item.univalence,
+                        14
+                      )
+                    : 0,
                 weightUnit: item.weightUnit,
                 customCode: item.customCode,
                 supplierCode: item.supplierCode,
-                weight: item.weight
+                weight: item.weight > 0 ? item.weight : 0
               };
             });
             arr.forEach((item) => {

src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/interiorProductionStorageQuality.vue

@@ -239,6 +239,7 @@
                       required
                     >
                       <el-input
+                        type="number"
                         v-model="row.minPackingCount"
                         @input="minPackingCountChange(row, $event)"
                       >
@@ -280,7 +281,7 @@
               </el-table-column>
               <el-table-column label="计量数量" prop="counts">
                 <template slot-scope="{ row, $index }">
-                  {{ row.minPackingCount * row.outInNum }}
+                  {{ $math.format(row.minPackingCount * row.outInNum, 14) }}
                 </template>
               </el-table-column>
               <el-table-column
@@ -680,7 +681,7 @@
             <el-table-column label="重量" prop="weight" width="100">
               <template slot-scope="{ row }">
                 <el-input
-                  v-if="!row.isPack"
+                  v-if="!row.isPack && row.measuringUnit != row.weightUtil"
                   v-model="row.weight"
                   @input="weightInput($event, row)"
                 ></el-input>
@@ -873,7 +874,10 @@
             </el-table-column>
             <el-table-column width="100" label="重量" prop="weight">
               <template slot-scope="{ row }">
-                <el-input v-model="row.weight" v-if="!row.isPack"></el-input>
+                <el-input
+                  v-model="row.weight"
+                  v-if="!row.isPack && row.measuringUnit != row.weightUnit"
+                ></el-input>
                 <span v-else>{{ row.weight }}</span>
               </template>
             </el-table-column>
@@ -1433,9 +1437,12 @@
       getAuditStatus: useDictLabel(auditStatus),
       // 包装维度最小包装单元改变——>总重量
       minPackingCountChange(row, value) {
-        row.minPackingCount = value.replace(/^(0+)|[^\d]+/g, '');
-        console.log(row);
-        console.log(value);
+        if (value >= 0) {
+          row.minPackingCount = value;
+        } else {
+          row.minPackingCount = 0;
+        }
+        // row.minPackingCount = value.replace(/^(0+)|[^\d]+/g, '');
         if (row.outInNum > 0 && value > 0) {
           this.packNum(row, row.outInNum);
         }
@@ -2502,31 +2509,45 @@
         let arr = this.warehousingMaterialList.map((item) => {
           console.log(item, 'item');
           return {
-            netWeight: item.netWeight,
-            num: item.num,
+            netWeight: item.netWeight > 0 ? item.netWeight : 0,
+            num: item.num > 0 ? item.num : 0,
             manualBatchNo: item.manualBatchNo,
             batchNo: item.batchNo,
-            code: item.productCode,
             categoryId:
               this.formData.bizType == 2
                 ? item.categoryId
                   ? item.categoryId
                   : item.id
                 : item.id,
-            count: parseInt(item.outInNum) * parseInt(item.minPackingCount),
-            minPackingCount: item.minPackingCount,
-            packingCount: item.outInNum,
-            price: item.univalence,
+            count:
+              item.outInNum > 0 && item.minPackingCount > 0
+                ? this.$math.format(
+                    parseInt(item.outInNum) * parseInt(item.minPackingCount),
+                    14
+                  )
+                : 0,
+            minPackingCount:
+              item.minPackingCount > 0 ? item.minPackingCount : 0,
+            packingCount: item.outInNum > 0 ? item.outInNum : 0,
+            price: item.univalence > 0 ? item.univalence : 0,
             outInDetailRecordAddPOList: item.warehouseLedgerDetails,
             position: `${item.warehouseName}-${item.areaName}-${item.shelfCode}-${item.cargoSpaceCode}`,
             remark: '',
             pathIds: `${item.warehouseId},${item.areaId},${item.shelfId},${item.cargoSpaceId}`,
             pathName: `${item.warehouseName},${item.areaName},${item.shelfCode},${item.cargoSpaceCode}`,
-            totalMoney: item.outInNum * item.minPackingCount * item.univalence,
+            totalMoney:
+              item.outInNum > 0 &&
+              item.minPackingCount > 0 &&
+              item.univalence > 0
+                ? this.$math.format(
+                    item.outInNum * item.minPackingCount * item.univalence,
+                    14
+                  )
+                : 0,
             weightUnit: item.weightUnit,
             customCode: item.customCode,
             supplierCode: item.supplierCode,
-            weight: item.weight
+            weight: item.weight > 0 ? item.weight : 0
           };
         });
         arr.forEach((item) => {

src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/interiorStorageToOutsourcing.vue

@@ -197,6 +197,7 @@
                       required
                     >
                       <el-input
+                        type="number"
                         v-model="row.minPackingCount"
                         @input="minPackingCountChange(row, $event)"
                       >
@@ -244,9 +245,11 @@
               <el-table-column label="计量数量" prop="counts">
                 <template slot-scope="{ row, $index }">
                   <span v-if="formData.isStorage">{{
-                    row.packingCount * row.minPackingCount
+                    $math.format(row.packingCount * row.minPackingCount, 14)
+                  }}</span>
+                  <span v-else>{{
+                    $math.format(row.minPackingCount * row.outInNum, 14)
                   }}</span>
-                  <span v-else>{{ row.minPackingCount * row.outInNum }}</span>
                 </template>
               </el-table-column>
               <el-table-column
@@ -542,7 +545,7 @@
             <el-table-column label="重量" prop="weight" width="100">
               <template slot-scope="{ row }">
                 <el-input
-                  v-if="!row.isPack"
+                  v-if="!row.isPack && row.measuringUnit != row.weightUtil"
                   v-model="row.weight"
                   @input="weightInput($event, row)"
                 ></el-input>
@@ -707,7 +710,10 @@
             </el-table-column>
             <el-table-column width="100" label="重量" prop="weight">
               <template slot-scope="{ row }">
-                <el-input v-model="row.weight" v-if="!row.isPack"></el-input>
+                <el-input
+                  v-model="row.weight"
+                  v-if="!row.isPack && row.measuringUnit != row.weightUnit"
+                ></el-input>
                 <span v-else>{{ row.weight }}</span>
               </template>
             </el-table-column>
@@ -1029,7 +1035,12 @@
     methods: {
       // 包装维度最小包装单元改变——>总重量
       minPackingCountChange(row, value) {
-        row.minPackingCount = value.replace(/^(0+)|[^\d]+/g, '');
+        if (value >= 0) {
+          row.minPackingCount = value;
+        } else {
+          row.minPackingCount = 0;
+        }
+        // row.minPackingCount = value.replace(/^(0+)|[^\d]+/g, '');
         if (row.outInNum >= 0 && value >= 0) {
           this.packNum(row, row.outInNum);
         }
@@ -1448,7 +1459,12 @@
           outInNum: Number(outInNum > 0 ? outInNum : 0),
           univalence: Number(univalence > 0 ? univalence : 0)
         };
-        return total.PackingCount * total.outInNum * total.univalence;
+        return Number(
+          this.$math.format(
+            total.PackingCount * total.outInNum * total.univalence,
+            14
+          )
+        );
       },
       handleRowUnit(row) {
         return row.measuringUnit;
@@ -1996,11 +2012,10 @@
               let arr = this.warehousingMaterialList.map((item) => {
                 console.log(item, 'item');
                 return {
-                  netWeight: item.netWeight,
-                  num: item.num,
+                  netWeight: item.netWeight > 0 ? item.netWeight : 0,
+                  num: item.num > 0 ? item.num : 0,
                   manualBatchNo: item.manualBatchNo,
                   batchNo: item.batchNo,
-                  code: item.productCode,
                   categoryId:
                     this.formData.bizType == 2
                       ? item.categoryId
@@ -2008,21 +2023,37 @@
                         : item.id
                       : item.id,
                   count:
-                    parseInt(item.outInNum) * parseInt(item.minPackingCount),
-                  minPackingCount: item.minPackingCount,
-                  packingCount: item.outInNum,
-                  price: item.univalence,
+                    item.outInNum > 0 && item.minPackingCount > 0
+                      ? this.$math.format(
+                          parseInt(item.outInNum) *
+                            parseInt(item.minPackingCount),
+                          14
+                        )
+                      : 0,
+                  minPackingCount:
+                    item.minPackingCount > 0 ? item.minPackingCount : 0,
+                  packingCount: item.outInNum > 0 ? item.outInNum : 0,
+                  price: item.univalence > 0 ? item.univalence : 0,
                   outInDetailRecordAddPOList: item.warehouseLedgerDetails,
                   position: `${item.warehouseName}-${item.areaName}-${item.shelfCode}-${item.cargoSpaceCode}`,
                   remark: '',
                   pathIds: `${item.warehouseId},${item.areaId},${item.shelfId},${item.cargoSpaceId}`,
                   pathName: `${item.warehouseName},${item.areaName},${item.shelfCode},${item.cargoSpaceCode}`,
                   totalMoney:
-                    item.outInNum * item.minPackingCount * item.univalence,
+                    item.outInNum > 0 &&
+                    item.minPackingCount > 0 &&
+                    item.univalence > 0
+                      ? this.$math.format(
+                          item.outInNum *
+                            item.minPackingCount *
+                            item.univalence,
+                          14
+                        )
+                      : 0,
                   weightUnit: item.weightUnit,
                   customCode: item.customCode,
                   supplierCode: item.supplierCode,
-                  weight: item.weight,
+                  weight: item.weight > 0 ? item.weight : 0,
                   houseList: [
                     `${item.warehouseName},${item.areaName},${item.shelfCode},${item.cargoSpaceCode}`
                   ]
@@ -2067,32 +2098,46 @@
             let arr = this.warehousingMaterialList.map((item) => {
               console.log(item, 'item');
               return {
-                netWeight: item.netWeight,
-                num: item.num,
+                netWeight: item.netWeight > 0 ? item.netWeight : 0,
+                num: item.num > 0 ? item.num : 0,
                 manualBatchNo: item.manualBatchNo,
                 batchNo: item.batchNo,
-                code: item.productCode,
                 categoryId:
                   this.formData.bizType == 2
                     ? item.categoryId
                       ? item.categoryId
                       : item.id
                     : item.id,
-                count: parseInt(item.outInNum) * parseInt(item.minPackingCount),
-                minPackingCount: item.minPackingCount,
-                packingCount: item.outInNum,
-                price: item.univalence,
+                count:
+                  item.outInNum > 0 && item.minPackingCount > 0
+                    ? this.$math.format(
+                        parseInt(item.outInNum) *
+                          parseInt(item.minPackingCount),
+                        14
+                      )
+                    : 0,
+                minPackingCount:
+                  item.minPackingCount > 0 ? item.minPackingCount : 0,
+                packingCount: item.outInNum > 0 ? item.outInNum : 0,
+                price: item.univalence > 0 ? item.univalence : 0,
                 outInDetailRecordAddPOList: item.warehouseLedgerDetails,
                 position: `${item.warehouseName}-${item.areaName}-${item.shelfCode}-${item.cargoSpaceCode}`,
                 remark: '',
                 pathIds: `${item.warehouseId},${item.areaId},${item.shelfId},${item.cargoSpaceId}`,
                 pathName: `${item.warehouseName},${item.areaName},${item.shelfCode},${item.cargoSpaceCode}`,
                 totalMoney:
-                  item.outInNum * item.minPackingCount * item.univalence,
+                  item.outInNum > 0 &&
+                  item.minPackingCount > 0 &&
+                  item.univalence > 0
+                    ? this.$math.format(
+                        item.outInNum * item.minPackingCount * item.univalence,
+                        14
+                      )
+                    : 0,
                 weightUnit: item.weightUnit,
                 customCode: item.customCode,
                 supplierCode: item.supplierCode,
-                weight: item.weight
+                weight: item.weight > 0 ? item.weight : 0
               };
             });
             arr.forEach((item) => {

src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/interiorStorageToOutsourcingQuality.vue

@@ -239,6 +239,7 @@
                       required
                     >
                       <el-input
+                        type="number"
                         v-model="row.minPackingCount"
                         @input="minPackingCountChange(row, $event)"
                       >
@@ -280,7 +281,7 @@
               </el-table-column>
               <el-table-column label="计量数量" prop="counts">
                 <template slot-scope="{ row, $index }">
-                  {{ row.minPackingCount * row.outInNum }}
+                  {{ $math.format(row.minPackingCount * row.outInNum, 14) }}
                 </template>
               </el-table-column>
               <el-table-column
@@ -680,7 +681,7 @@
             <el-table-column label="重量" prop="weight" width="100">
               <template slot-scope="{ row }">
                 <el-input
-                  v-if="!row.isPack"
+                  v-if="!row.isPack && row.measuringUnit != row.weightUtil"
                   v-model="row.weight"
                   @input="weightInput($event, row)"
                 ></el-input>
@@ -856,7 +857,10 @@
             </el-table-column>
             <el-table-column width="100" label="重量" prop="weight">
               <template slot-scope="{ row }">
-                <el-input v-model="row.weight" v-if="!row.isPack"></el-input>
+                <el-input
+                  v-model="row.weight"
+                  v-if="!row.isPack && row.measuringUnit != row.weightUnit"
+                ></el-input>
                 <span v-else>{{ row.weight }}</span>
               </template>
             </el-table-column>
@@ -1424,9 +1428,12 @@
       getAuditStatus: useDictLabel(auditStatus),
       // 包装维度最小包装单元改变——>总重量
       minPackingCountChange(row, value) {
-        row.minPackingCount = value.replace(/^(0+)|[^\d]+/g, '');
-        console.log(row);
-        console.log(value);
+        if (value >= 0) {
+          row.minPackingCount = value;
+        } else {
+          row.minPackingCount = 0;
+        }
+        // row.minPackingCount = value.replace(/^(0+)|[^\d]+/g, '');
         if (row.outInNum > 0 && value > 0) {
           this.packNum(row, row.outInNum);
         }
@@ -2493,31 +2500,45 @@
         let arr = this.warehousingMaterialList.map((item) => {
           console.log(item, 'item');
           return {
-            netWeight: item.netWeight,
-            num: item.num,
+            netWeight: item.netWeight > 0 ? item.netWeight : 0,
+            num: item.num > 0 ? item.num : 0,
             manualBatchNo: item.manualBatchNo,
             batchNo: item.batchNo,
-            code: item.productCode,
             categoryId:
               this.formData.bizType == 2
                 ? item.categoryId
                   ? item.categoryId
                   : item.id
                 : item.id,
-            count: parseInt(item.outInNum) * parseInt(item.minPackingCount),
-            minPackingCount: item.minPackingCount,
-            packingCount: item.outInNum,
-            price: item.univalence,
+            count:
+              item.outInNum > 0 && item.minPackingCount > 0
+                ? this.$math.format(
+                    parseInt(item.outInNum) * parseInt(item.minPackingCount),
+                    14
+                  )
+                : 0,
+            minPackingCount:
+              item.minPackingCount > 0 ? item.minPackingCount : 0,
+            packingCount: item.outInNum > 0 ? item.outInNum : 0,
+            price: item.univalence > 0 ? item.univalence : 0,
             outInDetailRecordAddPOList: item.warehouseLedgerDetails,
             position: `${item.warehouseName}-${item.areaName}-${item.shelfCode}-${item.cargoSpaceCode}`,
             remark: '',
             pathIds: `${item.warehouseId},${item.areaId},${item.shelfId},${item.cargoSpaceId}`,
             pathName: `${item.warehouseName},${item.areaName},${item.shelfCode},${item.cargoSpaceCode}`,
-            totalMoney: item.outInNum * item.minPackingCount * item.univalence,
+            totalMoney:
+              item.outInNum > 0 &&
+              item.minPackingCount > 0 &&
+              item.univalence > 0
+                ? this.$math.format(
+                    item.outInNum * item.minPackingCount * item.univalence,
+                    14
+                  )
+                : 0,
             weightUnit: item.weightUnit,
             customCode: item.customCode,
             supplierCode: item.supplierCode,
-            weight: item.weight
+            weight: item.weight > 0 ? item.weight : 0
           };
         });
         arr.forEach((item) => {

src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/outerFillWeight.vue

@@ -242,6 +242,7 @@
                       required
                     >
                       <el-input
+                        type="number"
                         v-model="row.minPackingCount"
                         @input="minPackingCountChange(row, $event)"
                       >
@@ -283,7 +284,7 @@
               </el-table-column>
               <el-table-column label="计量数量" prop="counts">
                 <template slot-scope="{ row, $index }">
-                  {{ row.minPackingCount * row.outInNum }}
+                  {{ $math.format(row.minPackingCount * row.outInNum, 14) }}
                 </template>
               </el-table-column>
               <el-table-column
@@ -1381,9 +1382,12 @@
       getAuditStatus: useDictLabel(auditStatus),
       // 包装维度最小包装单元改变——>总重量
       minPackingCountChange(row, value) {
-        row.minPackingCount = value.replace(/^(0+)|[^\d]+/g, '');
-        console.log(row);
-        console.log(value);
+        if (value >= 0) {
+          row.minPackingCount = value;
+        } else {
+          row.minPackingCount = 0;
+        }
+        // row.minPackingCount = value.replace(/^(0+)|[^\d]+/g, '');
         if (row.outInNum > 0 && value > 0) {
           this.packNum(row, row.outInNum);
         }
@@ -2435,31 +2439,45 @@
         let arr = this.warehousingMaterialList.map((item) => {
           console.log(item, 'item');
           return {
-            netWeight: item.netWeight,
-            num: item.num,
+            netWeight: item.netWeight > 0 ? item.netWeight : 0,
+            num: item.num > 0 ? item.num : 0,
             manualBatchNo: item.manualBatchNo,
             batchNo: item.batchNo,
-            code: item.productCode,
             categoryId:
               this.formData.bizType == 2
                 ? item.categoryId
                   ? item.categoryId
                   : item.id
                 : item.id,
-            count: parseInt(item.outInNum) * parseInt(item.minPackingCount),
-            minPackingCount: item.minPackingCount,
-            packingCount: item.outInNum,
-            price: item.univalence,
+            count:
+              item.outInNum > 0 && item.minPackingCount > 0
+                ? this.$math.format(
+                    parseInt(item.outInNum) * parseInt(item.minPackingCount),
+                    14
+                  )
+                : 0,
+            minPackingCount:
+              item.minPackingCount > 0 ? item.minPackingCount : 0,
+            packingCount: item.outInNum > 0 ? item.outInNum : 0,
+            price: item.univalence > 0 ? item.univalence : 0,
             outInDetailRecordAddPOList: item.warehouseLedgerDetails,
             position: `${item.warehouseName}-${item.areaName}-${item.shelfCode}-${item.cargoSpaceCode}`,
             remark: '',
             pathIds: `${item.warehouseId},${item.areaId},${item.shelfId},${item.cargoSpaceId}`,
             pathName: `${item.warehouseName},${item.areaName},${item.shelfCode},${item.cargoSpaceCode}`,
-            totalMoney: item.outInNum * item.minPackingCount * item.univalence,
+            totalMoney:
+              item.outInNum > 0 &&
+              item.minPackingCount > 0 &&
+              item.univalence > 0
+                ? this.$math.format(
+                    item.outInNum * item.minPackingCount * item.univalence,
+                    14
+                  )
+                : 0,
             weightUnit: item.weightUnit,
             customCode: item.customCode,
             supplierCode: item.supplierCode,
-            weight: item.weight
+            weight: item.weight > 0 ? item.weight : 0
           };
         });
         arr.forEach((item) => {

src/views/bpm/outgoingManagement/components/AssetsDialog.vue

@@ -54,7 +54,6 @@
             <template>
               <el-select
                 style="width: 100%"
-                clearable
                 @change="changeDimensionHandler"
                 v-model="dimension"
                 placeholder="请选择"
@@ -62,7 +61,7 @@
                 <el-option label="物料维度" value="4"> </el-option>
                 <el-option label="包装维度" value="3"> </el-option>
                 <el-option label="批次维度" value="2"> </el-option>
-                <el-option label="物品维度" value="1"> </el-option>
+                <!-- <el-option label="物品维度" value="1"> </el-option> -->
               </el-select>
             </template>
           </el-form-item>

src/views/bpm/stockManagement/add.vue

@@ -481,6 +481,7 @@
                       required
                     >
                       <el-input
+                        type="number"
                         v-model="row.minPackingCount"
                         @input="minPackingCountChange(row, $event)"
                       >
@@ -1297,7 +1298,12 @@
     methods: {
       // 包装维度最小包装单元改变——>总重量
       minPackingCountChange(row, value) {
-        row.minPackingCount = value.replace(/^(0+)|[^\d]+/g, '');
+        if (value >= 0) {
+          row.minPackingCount = value;
+        } else {
+          row.minPackingCount = 0;
+        }
+        // row.minPackingCount = value.replace(/^(0+)|[^\d]+/g, '');
         if (row.outInNum >= 0 && value >= 0) {
           this.packNum(row, row.outInNum);
         }