包装工序报工BUG修复

pages/mes/prodReport/index.vue

@@ -144,7 +144,7 @@
                   </u-col>
                   <u-col span="4">
                     <u-form-item label="已报工数:" prop="quantity">
-                      {{ feedback.quantityQualify + feedback.quantityUnqualify }}
+                      {{ feedback.reportQualify }}
                     </u-form-item>
                   </u-col>
                   <u-col span="4">
@@ -1698,8 +1698,8 @@ export default {
         return;
       } else {
         if (row.isPackage === '1') {
-          row.packNum = items.usagePackNum;
-          row.encasementNum = items.usageEncasementNum;
+          row.packNum = items.usagePackNum?items.usagePackNum:0;
+          row.encasementNum = items.usageEncasementNum?items.usageEncasementNum:0;
           this.getWorkorderDirectiveList(id, index);
         }
       }
@@ -1807,8 +1807,8 @@ export default {
           });
           if (item.isPackage === '1' && res.rows.length > 0) {
             item.workorderId = res.rows[0].workorderId;
-            item.packNum = res.rows[0].usagePackNum;
-            item.encasementNum = res.rows[0].usageEncasementNum;
+            item.packNum = res.rows[0].usagePackNum?res.rows[0].usagePackNum:0;
+            item.encasementNum = res.rows[0].usageEncasementNum?res.rows[0].usageEncasementNum:0;
             this.getWorkorderDirectiveList(res.rows[0].workorderId, index);
           }
         });
@@ -1983,6 +1983,7 @@ export default {
           quantity: item.quantity,
           quantityQualify: item.quantityWait, //默认为排产数量-合格数-不合格数
           quantityUnqualify: 0,
+          reportQualify: item.quantityQualify+item.quantityUnqualify,
           printName: '',
           lastProcess: item.isLastProcess == 1, //未工序
           nickName: this.vuex_user.nickName,
@@ -2094,7 +2095,7 @@ export default {
               row.tableDirectiveData = res.data.directiveList.map((item) => {
                 return {
                   ...item,
-                  reportQuantity: Number(item.packageNum) || 0 - Number(item.feedbackQuantity) || 0
+                  reportQuantity: (Number(item.packageNum) || 0) - (Number(item.feedbackQuantity) || 0)
                 };
               });
               row.listTabPro = [
@@ -2109,7 +2110,7 @@ export default {
               row.tableOrderData = res.data.orderPackageList.map((item) => {
                 return {
                   ...item,
-                  reportQuantity: Number(item.packageNum) || 0 - Number(item.feedbackQuantity) || 0
+                  reportQuantity: (Number(item.packageNum) || 0) - (Number(item.feedbackQuantity) || 0)
                 };
               });
               row.listTabPro = [
@@ -2124,7 +2125,7 @@ export default {
               row.tableSizeData = res.data.sizeList.map((item) => {
                 return {
                   ...item,
-                  reportQuantity: Number(item.packageNum) || 0 - Number(item.feedbackQuantity) || 0
+                  reportQuantity: (Number(item.packageNum) || 0) - (Number(item.feedbackQuantity) || 0)
                 };
               });
               row.listTabPro = [