update:修改工作单、开始刷新的问题

pages/mes/prodReport/index.vue

@@ -171,7 +171,7 @@
                   </u-form-item>
                 </u-col>
               </u-row>
-              <u-row>
+              <u-row v-if="!feedback.isLastProcess">
                 <u-col span="6">
                   <u-form-item label="是否打印:" prop="print">
                     <view class="uni-list-item__extra">
@@ -611,7 +611,6 @@
 	<!-- //查询图片生产工单 -->
     <u-modal
       title="生产工单"
-      @confirm="materialReturnSave()"
       show-cancel-button
       :show-confirm-button="false"
       cancel-text="返回"
@@ -1148,7 +1147,7 @@ export default {
             } else {
               this.$u.api.changeCheckMachineTool({
                 taskWorkunitId: item.taskWorkunitId
-              }).then(res => {
+              }).then((res) => {
                 // console.log(res, '刀模板')
                 if (res.code === 500) {
                   this.$u.toast(res.msg)
@@ -1161,7 +1160,6 @@ export default {
             this.$u.toast('该任务已开工，请勿重复开工');
             return;
           }
-          this.getTaskList();
           break;
         case 'StopTask':
 		  this.stopCause();
@@ -1172,7 +1170,6 @@ export default {
           this.tableSelectData.forEach((item) => {
             this.changeStatus(item.taskId, item.taskWorkunitId,'FINISHED',item.workunitId);
           });
-          this.getTaskList();
           break;
         case 'Prod':
           this.doFeedback();
@@ -1543,7 +1540,6 @@ export default {
             if(showToast) {
               this.$u.toast('变更成功');
             }
-            uni.$emit('taskStatusChanged'); //任务状态变更
             this.getTaskList();
           }
         });
@@ -1563,7 +1559,6 @@ export default {
           .then((res) => {
             if (res.code === 200) {
               this.$u.toast('变更成功');
-              uni.$emit('taskStatusChanged'); //任务状态变更
               this.getTaskList();
             }
           });
@@ -2050,30 +2045,31 @@ export default {
     },
     materialReturnSave() {
       const taskInfo = this.tableSelectData[0];
-      const rst = [];
-      const t = this;
-      this.materialReturnList.forEach((s) => {
-        if (s.applyNum) {
-          rst.push({
-            itemId: s.itemId,
-            taskId: taskInfo.taskId,
-            backNum: s.applyNum,
-            issueLineId: s.lineId,
-		    taskWorkunitId: this.curTaskInfo.taskWorkunitId,
-            workOrderId: s.workorderId,
-            batchNo: s.batchCode,
-            packNo: s.packNo,
-            isQualified: s.isQualified,
-            workorderCode: t.materialReturnFormData.workorderCode
-          });
+      const rst = this.materialReturnList.map((s) => {
+        let data = {
+          itemId: s.itemId,
+          taskId: taskInfo.taskId,
+          backNum: s.applyNum,
+          issueLineId: s.lineId,
+          taskWorkunitId: this.curTaskInfo.taskWorkunitId,
+          workOrderId: s.workorderId,
+          batchNo: s.batchCode,
+          packNo: s.packNo,
+          isQualified: s.isQualified,
+          workorderCode: this.materialReturnFormData.workorderCode,
+        }
+        if (this.materialReturnFormData.workorderCode) {
+          data.workorderCodes = this.materialReturnFormData.workorderCode
+        } else {
+          data.workorderCodes = this.curTaskInfo.workorderOption.flatMap(it => it.value).join(',')
         }
+        return data
       });
-      if (rst.length === 0) {
-        this.$u.toast('数量不存在，无法保存')
+      if (this.materialReturnList.length === 0) {
         return
       }
       this.$u.api.addMaterialReturn(rst).then((res) => {
-        t.materialReturnFormVisible = false;
+        this.materialReturnFormVisible = false;
         if (res.code === 200) {
           t.$u.toast('保存成功');
         }