update:修改开始任务和生产报工

pages/mes/prodReport/index.vue

@@ -239,7 +239,7 @@
                     </template>
                     <template slot="peration" slot-scope="scope">
                       <!-- {{ scope.row }} -->
-                      <u-button @tap="handleSubmitPackageFeedback(feedback, scope.row)" type="success" style="margin-left: 20rpx" size="mini">打印/报工</u-button>
+                      <u-button v-if="Number(scope.row.packageNum) > Number(scope.row.feedbackQuantity)" @tap="handleSubmitPackageFeedback(feedback, scope.row)" type="success" style="margin-left: 20rpx" size="mini">打印/报工</u-button>
                       <!-- <u-input v-model="scope.row.reportQuantity" type="number"></u-input> -->
                     </template>
                   </zb-table>
@@ -1473,8 +1473,11 @@ export default {
             } else {
               this.$u.api.changeCheckMachineTool({
                 taskWorkunitId: item.taskWorkunitId
-              });
-              this.changeStatus(item.taskId, item.taskWorkunitId, 'BEGINNING', item.workunitId, false);
+              }).then(res => {
+                if(res.code === 200) {
+                  this.changeStatus(item.taskId, item.taskWorkunitId, 'BEGINNING', item.workunitId, false);
+                }
+              })
             }
           });
           if (status) {
@@ -1591,28 +1594,28 @@ export default {
     },
     // 新增刀模版上下机记录
     async addDModelRecord(params) {
-      const { data } = await this.$u.api.dModel.getToolsByProcessIdAndArrangeCode(params);
-      if (data?.length) {
+      // const { data } = await this.$u.api.dModel.getToolsByProcessIdAndArrangeCode(params);
+      // if (data?.length) {
         const [selectData] = this.tableSelectData;
         const ps = {
-          toolMachinesCode: '',
-          arrangeCode: selectData.arrangeCode,
-          workunitId: this.vuex_workunit.workunitId,
-          workunitCode: this.vuex_workunit.workunitCode,
-          workunitName: this.vuex_workunit.workunitName,
-          processId: selectData.processId,
-          taskId: selectData.taskId,
+          // toolMachinesCode: '',
+          // arrangeCode: selectData.arrangeCode,
+          // workunitId: this.vuex_workunit.workunitId,
+          // workunitCode: this.vuex_workunit.workunitCode,
+          // workunitName: this.vuex_workunit.workunitName,
+          // processId: selectData.processId,
+          // taskId: selectData.taskId,
           taskWorkunitId: selectData.taskWorkunitId,
-          workorderId: selectData.workorderId,
-          toolRequestUseId: data[0].toolRequestUseId,
-          toolMachinesRecordList: data.map((v) => {
-            return {
-              toolRequestUseItemId: v.toolRequestUseItemId,
-              type: 3,
-              upDate: '',
-              downDate: ''
-            };
-          })
+          // workorderId: selectData.workorderId,
+          // toolRequestUseId: data[0].toolRequestUseId,
+          // toolMachinesRecordList: data.map((v) => {
+          //   return {
+          //     toolRequestUseItemId: v.toolRequestUseItemId,
+          //     type: 3,
+          //     upDate: '',
+          //     downDate: ''
+          //   };
+          // })
         };
         // 新增
         const data2 = await this.$u.api.dModel.tmToolMachines(ps);
@@ -1621,7 +1624,7 @@ export default {
           this.dModelData = records.data || [];
           this.knifeTempVisible = true;
         }
-      }
+      // }
     },
     getIssusLinebyWorkorderCodes() {
       this.issusLineList = [];
@@ -2065,6 +2068,7 @@ export default {
           "mergePack": row.mergePack || 0,
           "packNum": row.packNum,
           "quantity": row.quantity,
+          "taskId": row.taskId,
           "workorderId": row.workorderId
         })
         .then((res) => {
@@ -2076,7 +2080,7 @@ export default {
               row.tableDirectiveData = res.data.directiveList.map(item => {
                 return {
                   ...item,
-                  reportQuantity: item.packageNum
+                  reportQuantity: Number(item.packageNum) || 0 - Number(item.feedbackQuantity) || 0
                 }
               })
               row.listTabPro = [
@@ -2091,7 +2095,7 @@ export default {
               row.tableOrderData = res.data.orderPackageList.map(item => {
                 return {
                   ...item,
-                  reportQuantity: item.packageNum
+                  reportQuantity: Number(item.packageNum) || 0 - Number(item.feedbackQuantity) || 0
                 }
               })
               row.listTabPro = [
@@ -2106,7 +2110,7 @@ export default {
               row.tableSizeData = res.data.sizeList.map(item => {
                 return {
                   ...item,
-                  reportQuantity: item.packageNum
+                  reportQuantity: Number(item.packageNum) || 0 - Number(item.feedbackQuantity) || 0
                 }
               })
               row.listTabPro = [
@@ -2146,9 +2150,11 @@ export default {
             printTemplate: item.printTemplate,
             quantityUnqualify: item.quantityUnqualify,
             taskId: item.taskId,
+            feedbackTime: item.feedbackTime,
             workorderId: item.workorderId,
             'reportData.netWeight': row.netWeight,
             'reportData.reportQuantity': row.reportQuantity,
+            'reportData.packageNum': row.packageNum,
             'reportData.qrcode': row.qrcode,
             'reportData.workorderSoDirectiveId': row.workorderSoDirectiveId,
             'reportData.workorderSoSizeItemId': row.workorderSoSizeItemId