最小包装单元可以输入小数点，重量单位和计量单位相同不允许修改重量

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)"
                       >
@@ -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);
         }

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)"
                       >
@@ -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);
         }

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)"
                       >
@@ -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);
         }

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)"
                       >
@@ -543,7 +544,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 +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>
@@ -990,7 +994,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);
         }

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)"
                       >
@@ -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);
         }

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)"
                       >
@@ -554,7 +555,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 +722,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 +1068,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);
         }

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)"
                       >
@@ -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);
         }

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)"
                       >
@@ -542,7 +543,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 +708,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 +1033,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);
         }

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)"
                       >
@@ -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);
         }

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)"
                       >
@@ -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);
         }

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);
         }