Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-pad into dev

pages/mes/prodReport/index.vue

@@ -719,9 +719,9 @@ export default {
           width: 140
         },
         {
-          name: 'quantity',
+          name: 'quantityWait',
           label: '待加工数量',
-          width: 140
+          width: 80
         },
         {
           name: 'status',
@@ -767,20 +767,20 @@ export default {
         },
         {
           name: 'quantity',
-          label: '数量',
-          width: 60,
+          label: '排产数量',
+          width: 80,
           align: 'center'
         },
         {
           name: 'quantityQuanlify',
           label: '合格数量',
-          width: 60,
+          width: 80,
           align: 'center'
         },
         {
           name: 'quantityUnquanlify',
           label: '不合格数量',
-          width: 60,
+          width: 80,
           align: 'center'
         },
         {
@@ -1319,13 +1319,7 @@ export default {
       this.open = false;
     },
     feedback() {
-      // this.$refs.feedbackForm.validate(valid => {
-      //   // if (valid) {
-      //   // 	console.log('验证通过');
-      //   // } else {
-      //   // 	console.log('验证失败');
-      //   // }
-      // });
+      this.open = true;
       this.feedbackForms.forEach((item) => {
         if (item.quantityQualify === 0 && item.quantityUnqualify === 0) {
           this.$u.toast('请填写合格/不合格产品数量！');
@@ -1335,7 +1329,7 @@ export default {
           .feedback({
             taskId: item.taskId,
             taskCode: item.taskCode,
-            quantityFeedback: item.quantity,
+            quantityFeedback: item.quantityQualify+item.quantityUnqualify,
             quantityQualified: item.quantityQualify,
             quantityUnquanlified: item.quantityUnqualify,
             userName: this.vuex_user.userName,
@@ -1357,6 +1351,7 @@ export default {
           })
           .then((res) => {
             if (res.code === 200) {
+              this.open = false;
               if (res.msg === '') {
                 this.$u.toast('上报成功');
               } else {
@@ -1366,7 +1361,6 @@ export default {
             }
           });
       });
-      this.open = false;
     },
     feedingInspectionShow() {
       this.feedingInspectionVisible = true;