问题清单87

common/http.api.js

@@ -100,6 +100,11 @@ const install = (Vue, vm) => {
           config.adminPath + '/pro/packagePrintRecord/rePackageInfoPrint',
           params
         ),
+      quantitywaitsum: (params = {}) =>
+        vm.$u.postJson(
+          config.adminPath + '/mes/pro/workorder/quantitywaitsum',
+          params
+        ),
       // 生产指令列表
       workOrderSoDirectiveApi: (params = {}) =>
         vm.$u.postJson(

pages/mes/prodReport/index.vue

@@ -317,14 +317,21 @@
                   </u-col>
                 </u-row>
                 <u-row>
-                  <u-col span="6">
+                  <u-col :span="feedback.taskType&&feedback.taskType===3 ? 6: 4">
                     <u-form-item :label="feedback.taskType&&feedback.taskType===3 ? '委外数量:' : '报工总数量:'" prop="quantity">
-                      {{ feedback.taskType&&feedback.taskType===3 ? (feedback.quantityQualify) : (feedback.quantityQualify + feedback.quantityUnqualify) }}
+                      {{ feedback.taskType&&feedback.taskType===3 ? (feedback.quantityQualify) : (feedback.arrangeFeedbackSum) }}
 
                       <!-- {{ computedQuantityV2 }} -->
                     </u-form-item>
                   </u-col>
-                  <u-col span="6">
+                  <u-col :span="4" v-if="!feedback.taskType || feedback.taskType!==3">
+                    <u-form-item label="工单已报工数:">
+                      {{ feedback.workorderFeedbackSum }}
+
+                      <!-- {{ computedQuantityV2 }} -->
+                    </u-form-item>
+                  </u-col>
+                  <u-col :span="feedback.taskType&&feedback.taskType===3 ? 6: 4">
                     <u-form-item label="报工人:" prop="nickName">
                       <u-input v-model="feedback.nickName"></u-input>
                       <u-button @tap="getCode(feedback)" type="success" size="mini">报工人员</u-button>
@@ -333,12 +340,19 @@
                 </u-row>
 
                 <u-row>
-                  <u-col span="6">
+                  <u-col :span="feedback.taskType&&feedback.taskType===3 ? 6: 4">
                     <u-form-item label="编排单号:" prop="quantity">
                       {{ feedback.arrangeCode }}
                     </u-form-item>
                   </u-col>
-                  <u-col span="6">
+                  <u-col :span="4" v-if="!feedback.taskType || feedback.taskType!==3">
+                    <u-form-item label="工单未报工数:">
+                      {{ feedback.workorderUnfeedbackSum }}
+
+                      <!-- {{ computedQuantityV2 }} -->
+                    </u-form-item>
+                  </u-col>
+                  <u-col :span="feedback.taskType&&feedback.taskType===3 ? 6: 4">
                     <u-form-item label="生产工单:" prop="workorderId">
                       <view v-if="feedback.taskType&&feedback.taskType===3">{{feedback.workorderCode}}</view>
                       <uni-data-select v-model="feedback.workorderId" v-else :localdata="feedback.workorderOption"
@@ -1865,6 +1879,10 @@ export default {
         row.packType = '';
         row.lossIndividuallyWrap = undefined;
         row.currentTabPro = 0;
+        row.workorderFeedbackSum = ''
+        row.workorderUnfeedbackSum = ''
+        row.quantityQualify = row.quantityWait
+        this.$set(this.feedbackForms, index, row)
         return;
       } else {
         if (row.isPackage === '1') {
@@ -1872,6 +1890,18 @@ export default {
           row.mergePack = items.mergePack ? items.mergePack : 0;
           row.encasementNum = items.usageEncasementNum ? items.usageEncasementNum : 0;
           this.getWorkorderDirectiveList(id, index);
+        } else {
+          this.$u.api.quantitywaitsum({
+            workorderCode: items.workorderCode,
+            taskWorkunitId: row.taskWorkunitId
+          }).then((res) => {
+            if (res.code === 200) {
+              row.quantityQualify = res.data.workorderQualify
+              row.workorderFeedbackSum = res.data.workorderFeedbackSum
+              row.workorderUnfeedbackSum = res.data.workorderUnfeedbackSum
+              this.$set(this.feedbackForms, index, row)
+            }
+          })
         }
       }
       row.workorderId = id;
@@ -1955,7 +1985,20 @@ export default {
             item.packByDirective = res.rows[0].packByDirective;
             item.packBySize = res.rows[0].packBySize;
             item.unitOfConvert = res.rows[0].unitOfConvert;
-
+            if ((!item.isPackage || item.isPackage !== '1') && (!item.taskType || item.taskType !== 3)) {
+              // 请求了证明了中间的报工
+              this.$u.api.quantitywaitsum({
+                workorderCode: item.workorderCode,
+                taskWorkunitId: item.taskWorkunitId
+              }).then((res) => {
+                if (res.code === 200) {
+                  item.quantityQualify = res.data.workorderQualify
+                  item.workorderFeedbackSum = res.data.workorderFeedbackSum
+                  item.workorderUnfeedbackSum = res.data.workorderUnfeedbackSum
+                  this.$set(this.feedbackForms, index, item)
+                }
+              })
+            }
           }
           item.workorderOption = res.rows.map((temp) => {
             if (temp.saleDirectiveList != null) {
@@ -2160,17 +2203,6 @@ export default {
           }
         });
     },
-    // reset() {
-    //   this.feedbackForm = {
-    //     workstationId: 0,
-    //     userName: this.vuex_user.userName,
-    //     taskId: this.form.taskId,
-    //     feedbackChannel: 'PAD',
-    //     quantity: 0,
-    //     quantityQualify: 0,
-    //     quantityUnqualify: 0
-    //   }
-    // },
     quantityChanged(val) {
       this.feedbackForm.quantity = this.feedbackForm.quantityQualify + this.feedbackForm.quantityUnqualify;
     },
@@ -2181,14 +2213,12 @@ export default {
     },
 
     quantityChangedV2(feedback, val1, val2) {
-      console.log('asasa', feedback, val1, val2)
       let qq = (val1 === 0 || val1 === null) ? 0 : val1;
       let quq = (val2 === 0 || val2 === null) ? 0 : val2;
 
       if (qq > 0) {
         feedback.quantityQualify = qq / (feedback.unitOfConvert || 1);
       }
-      console.log(qq / feedback.unitOfConvert, qq, feedback.unitOfConvert)
 
       if (quq > 0) {
         feedback.quantityUnqualify = quq / (feedback.unitOfConvert || 1);
@@ -2200,14 +2230,12 @@ export default {
       feedback.quantity = feedback.quantityUnqualify + feedback.quantityQualify;
     },
     quantityChangedV3(feedback, val1, val2) {
-      console.log('asasa', feedback, val1, val2)
       let qq = (val1 === 0 || val1 === null) ? 0 : val1;
       let quq = (val2 === 0 || val2 === null) ? 0 : val2;
 
       if (qq > 0) {
         feedback.quantityQualify = qq / (feedback.unitOfConvert || 1);
       }
-      console.log(qq / feedback.unitOfConvert, qq, feedback.unitOfConvert)
 
       if (quq > 0) {
         feedback.quantityUnqualify = quq / (feedback.unitOfConvert || 1);
@@ -2339,6 +2367,8 @@ export default {
           feedback.quantityUnqualify = item.quantityUnqualify
           feedback.workorderCode = item.workorderCode
           feedback.closeType = ''
+        } else if(!feedback.isPackage || feedback.isPackage !== '1') {
+          feedback.arrangeFeedbackSum = item.arrangeFeedbackSum
         }
         this.getWorkorderWithSizeAndDirective(feedback, index);
         this.feedbackForms.push(feedback);