生产报工

pages/mes/prodReport/index.vue

@@ -317,21 +317,21 @@
                   </u-col>
                 </u-row>
                 <u-row>
-                  <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.arrangeFeedbackSum) }}
+                  <u-col :span="6">
+                    <u-form-item :label="feedback.taskType&&feedback.taskType===3 ? '委外数量:' : '已报工数:'" prop="quantity">
+                      {{ feedback.taskType&&feedback.taskType===3 ? (feedback.quantityQualify) : (feedback.workorderFeedbackSum) }}
 
                       <!-- {{ computedQuantityV2 }} -->
                     </u-form-item>
                   </u-col>
-                  <u-col :span="4" v-if="!feedback.taskType || feedback.taskType!==3">
-                    <u-form-item label="工单已报工数:">
-                      {{ feedback.workorderFeedbackSum }}
+                  <u-col :span="6" 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-col :span="6" v-else>
                     <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>
@@ -340,19 +340,13 @@
                 </u-row>
 
                 <u-row>
-                  <u-col :span="feedback.taskType&&feedback.taskType===3 ? 6: 4">
+                  <u-col :span="6">
                     <u-form-item label="编排单号:" prop="quantity">
                       {{ feedback.arrangeCode }}
                     </u-form-item>
                   </u-col>
-                  <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-col :span="6">
                     <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"
@@ -439,6 +433,14 @@
                     </u-form-item>
                   </u-col>
                 </u-row>
+                <u-row v-if="!feedback.taskType || feedback.taskType!==3">
+                  <u-col :span="6">
+                    <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>
+                    </u-form-item>
+                  </u-col>
+                </u-row>
 
                 <!-- <u-row> -->
                 <!-- <u-col span="3" width: max-content>
@@ -782,7 +784,7 @@
               <uni-th width="80px" align="center">领料数量</uni-th>
               <uni-th width="80px" align="center">本次退料数</uni-th>
               <uni-th width="80px" align="center">累计退料数</uni-th>
-			  <uni-th width="100px" align="center">版号</uni-th>
+			        <uni-th width="100px" align="center">版号</uni-th>
               <uni-th width="110px" align="center">批次号</uni-th>
               <uni-th width="60" align="center">合格</uni-th>
             </uni-tr>
@@ -932,6 +934,7 @@ import UButton from '../../../uview-ui/components/u-button/u-button.vue';
 import cameraAuthMixin from '@/components/AppScan/appScanMixins.js';
 import { handleError } from 'vue';
 import AppScan from '../../../components/AppScan/AppScan.vue';
+import URow from '../../../uview-ui/components/u-row/u-row.vue';
 export default {
   name: 'ProdReport',
   dicts: ['pro_pack_type', 'sap_yes_no'],
@@ -946,7 +949,8 @@ export default {
     workunitList,
     AppScan,
     User,
-    ProogingSpecificationSheet
+    ProogingSpecificationSheet,
+    URow
   },
   data() {
     return {
@@ -1876,8 +1880,8 @@ export default {
         row.packType = '';
         row.lossIndividuallyWrap = undefined;
         row.currentTabPro = 0;
-        row.workorderFeedbackSum = ''
-        row.workorderUnfeedbackSum = ''
+        row.workorderFeedbackSum = row.workorderFeedback
+        row.workorderUnfeedbackSum = row.workorderUnfeedback
         row.quantityQualify = row.quantityWait
         this.$set(this.feedbackForms, index, row)
         return;
@@ -2269,6 +2273,8 @@ export default {
         defQualify = defQualify > item.quantityWait ? item.quantityWait : defQualify;
         const feedback = {
           ...item,
+          workorderFeedback: 0,
+          workorderUnfeedback: 0,
           workstationId: item.workstationId,
           userName: this.vuex_user.userName,
           taskId: item.taskId,
@@ -2365,7 +2371,17 @@ export default {
           feedback.workorderCode = item.workorderCode
           feedback.closeType = ''
         } else if(!feedback.isPackage || feedback.isPackage !== '1') {
-          feedback.arrangeFeedbackSum = item.arrangeFeedbackSum
+          this.$u.api.quantitywaitsum({
+            taskWorkunitId: item.taskWorkunitId
+          }).then((res) => {
+            if (res.code === 200) {
+              // row.quantityQualify = res.data.workorderQualify
+              feedback.workorderFeedbackSum = res.data.workorderFeedbackSum
+              feedback.workorderUnfeedbackSum = res.data.workorderUnfeedbackSum
+              feedback.workorderFeedback = res.data.workorderFeedbackSum
+              feedback.workorderUnfeedback = res.data.workorderUnfeedbackSum
+            }
+          })
         }
         this.getWorkorderWithSizeAndDirective(feedback, index);
         this.feedbackForms.push(feedback);