Przeglądaj źródła

修改空格判断

695593266@qq.com 9 miesięcy temu
rodzic
commit
578e3d4dbc

+ 13 - 7
src/views/produce/components/jobBooking/components/batchPackagingGrouping.vue

@@ -1029,12 +1029,12 @@
           taskId: this.taskId,
           taskId: this.taskId,
           tier: '',
           tier: '',
           totalQuantity: this.formedNumLast, //总数量
           totalQuantity: this.formedNumLast, //总数量
-          quantity: v.packageCell, //数量
+          quantity: String(v.packageCell).trim(), //数量
           unit: v.packageUnit, //单位
           unit: v.packageUnit, //单位
           minimumUnit: this.minimumUnit, //最小包装单位
           minimumUnit: this.minimumUnit, //最小包装单位
-          withinQuantity: this.withinQuantity, //内包装数量
+          withinQuantity: String(this.withinQuantity).trim(), //内包装数量
           withinUnit: this.withinUnit, //内包装单位
           withinUnit: this.withinUnit, //内包装单位
-          outsideQuantity: this.outsideQuantity, //外包装数量
+          outsideQuantity: String(this.outsideQuantity).trim(), //外包装数量
           outsideUnit: this.outsideUnit, //外包装单位
           outsideUnit: this.outsideUnit, //外包装单位
           packageUnit: v.conversionUnit,
           packageUnit: v.conversionUnit,
           isNewUnpack: this.isNewUnpack
           isNewUnpack: this.isNewUnpack
@@ -1152,7 +1152,7 @@
       changeInputPack(item, index) {
       changeInputPack(item, index) {
         setTimeout(() => {
         setTimeout(() => {
           if (this.DispositionList[index]) {
           if (this.DispositionList[index]) {
-            if (!this.DispositionList[index].packageCell) {
+            if (!String(this.DispositionList[index].packageCell).trim()) {
               if (index <= this.DispositionList.length - 1) {
               if (index <= this.DispositionList.length - 1) {
                 this.DispositionList[index].formedNumLast = '';
                 this.DispositionList[index].formedNumLast = '';
 
 
@@ -1418,15 +1418,21 @@
               isUnpack: this.objData.isUnpack,
               isUnpack: this.objData.isUnpack,
               packageUnit: this.packageUnit,
               packageUnit: this.packageUnit,
               formedNumLast: this.formedNumLast,
               formedNumLast: this.formedNumLast,
-              minimumPackageCell: this.DispositionList[0].packageCell, // 最小包装
+              minimumPackageCell: this.DispositionList[0].packageCell
+                ? String(this.DispositionList[0].packageCell).trim()
+                : '', // 最小包装
               minimumPackageUnit: this.DispositionList[0].packageUnit, // 最小包装单位
               minimumPackageUnit: this.DispositionList[0].packageUnit, // 最小包装单位
               minimumConversionUnit: this.DispositionList[0].conversionUnit, // 最小包装单位
               minimumConversionUnit: this.DispositionList[0].conversionUnit, // 最小包装单位
               minimumFormedNumLast: this.DispositionList[0].formedNumLast, // 总包装数量
               minimumFormedNumLast: this.DispositionList[0].formedNumLast, // 总包装数量
-              withinPackageCell: this.DispositionList[1].packageCell, // 最小包装名称
+              withinPackageCell: this.DispositionList[1].packageCell
+                ? String(this.DispositionList[1].packageCell).trim()
+                : '', // 最小包装名称
               withinPackageUnit: this.DispositionList[1].packageUnit, // 最小包装单位
               withinPackageUnit: this.DispositionList[1].packageUnit, // 最小包装单位
               withinConversionUnit: this.DispositionList[1].conversionUnit, // 最小包装单位
               withinConversionUnit: this.DispositionList[1].conversionUnit, // 最小包装单位
               withinFormedNumLast: this.DispositionList[1].formedNumLast, // 总包装数量
               withinFormedNumLast: this.DispositionList[1].formedNumLast, // 总包装数量
-              outsidePackageCell: this.DispositionList[2].packageCell, // 最小包装名称
+              outsidePackageCell: this.DispositionList[2].packageCell
+                ? String(this.DispositionList[2].packageCell).trim()
+                : '', // 最小包装名称
               outsidePackageUnit: this.DispositionList[2].packageUnit, // 最小包装单位
               outsidePackageUnit: this.DispositionList[2].packageUnit, // 最小包装单位
               outsideConversionUnit: this.DispositionList[2].conversionUnit, // 最小包装单位
               outsideConversionUnit: this.DispositionList[2].conversionUnit, // 最小包装单位
               outsideFormedNumLast: this.DispositionList[2].formedNumLast,
               outsideFormedNumLast: this.DispositionList[2].formedNumLast,

+ 1 - 1
src/views/produce/components/jobBooking/index.vue

@@ -1418,7 +1418,7 @@
 
 
         console.log(this.List, 'this.List');
         console.log(this.List, 'this.List');
 
 
-        return;
+        // return;
 
 
         // this.List[0].product = this.List[0].semiProductList;
         // this.List[0].product = this.List[0].semiProductList;
         this.loadingBtn = true;
         this.loadingBtn = true;