From 889d8ddf4c13c1b1bdbabd04c2d80b904020151e Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期三, 19 八月 2026 12:49:24 +0800
Subject: [PATCH] 生产订单与报工模块改造汇总 (Git Commit 文档) feat(mes-pro): 生产订单及报工模块审批流与批次填报改造 1. 生产订单功能增强 (Work Order)

---
 src/views/mes/workbench/components/tabs/FeedbackTab.vue |   68 +++++++++++++++++++++++++++++++---
 1 files changed, 62 insertions(+), 6 deletions(-)

diff --git a/src/views/mes/workbench/components/tabs/FeedbackTab.vue b/src/views/mes/workbench/components/tabs/FeedbackTab.vue
index 8439b83..f867d68 100644
--- a/src/views/mes/workbench/components/tabs/FeedbackTab.vue
+++ b/src/views/mes/workbench/components/tabs/FeedbackTab.vue
@@ -18,7 +18,7 @@
 import { generateAutoCode } from '#/api/mes/md/autocode/record';
 import {
   approveFeedback,
-  createFeedback,
+  createFeedback, getBatchRequirements,
   getFeedback,
   getFeedbackPage,
   rejectFeedback,
@@ -29,7 +29,10 @@
 import { $t } from '#/locales';
 
 import { useFormSchema } from '../../../pro/feedback/data';
-
+import BatchInputDialog from '../../../pro/feedback/modules/batch-input-dialog.vue';
+const batchDialogRef = ref<InstanceType<typeof BatchInputDialog>>();
+const batchActionType = ref<'submit' | 'approve'>('');
+const pendingSubmitMode = ref<'saveAndSubmit' | 'submit'>('submit');
 defineOptions({ name: 'WorkbenchFeedbackTab' });
 
 const props = defineProps<{
@@ -131,9 +134,9 @@
     itemSpecification: task.itemSpecification,
     unitMeasureName: task.unitMeasureName,
     scheduledQuantity: task.quantity,
+    feedbackApprove: task.feedbackApprove,
     checkFlag,
   });
-
   originalSnapshot.value = JSON.stringify(await getAlignedData());
 }
 
@@ -168,6 +171,7 @@
   if (props.task) {
     await resetForTask(props.task);
   }
+
   emit('reported');
 }
 
@@ -203,8 +207,12 @@
     return;
   }
 
+  pendingSubmitMode.value = 'saveAndSubmit';
+
   // 4. 璋冪敤鎻愪氦鎺ュ彛
-  await submitFeedback(record.id!);
+  const isDone = await handleOnSubmit(feedbackId.value!,props.task.feedbackApprove);
+  if (!isDone) return;
+
   feedbackId.value = record.id;
   feedbackStatus.value = record.status;
 
@@ -232,13 +240,60 @@
     await updateFeedback(data);
     originalSnapshot.value = JSON.stringify(data);
   }
-  await submitFeedback(feedbackId.value!);
-  message.success('鎶ヨ鍗曞凡鎻愪氦');
+
+  pendingSubmitMode.value = 'submit';
+  const isDone = await handleOnSubmit(feedbackId.value!,props.task.feedbackApprove);
+  if (!isDone) return;
+
+  message.success('鎶ュ伐鍗曞凡鎻愪氦');
   // 閲嶇疆琛ㄥ崟涓烘柊寤烘ā寮�
   if (props.task) {
     await resetForTask(props.task);
   }
   emit('reported');
+}
+
+
+/** 鎻愪氦鏂规硶 */
+async function handleOnSubmit(id:any,feedbackRate:any): Promise<boolean> {
+  if (feedbackRate&&feedbackRate==true){
+    await submitFeedback({ id: feedbackId.value! });
+    return true;
+  }
+
+  const checkResult = await getBatchRequirements(id);
+  if (checkResult?.needBatchInput) {
+    batchActionType.value = 'submit';
+    batchDialogRef.value?.open({ checkResult });
+    return false;
+  } else {
+    await submitFeedback({ id: feedbackId.value! });
+    return true;
+  }
+}
+
+/** 鎵规纭鍥炶皟 */
+async function handleBatchConfirm(batchData: Record<string, unknown>) {
+  if (batchActionType.value === 'submit') {
+    await submitFeedback({ id: feedbackId.value!, ...batchData });
+    
+    if (pendingSubmitMode.value === 'saveAndSubmit') {
+      const data = await getAlignedData();
+      const code = data.code as string;
+      Modal.success({
+        title: '淇濆瓨骞舵彁浜ゆ垚鍔�',
+        content: `鎶ュ伐鍗� ${code} 宸叉彁浜,
+        centered: true,
+      });
+    } else {
+      message.success('鎶ュ伐鍗曞凡鎻愪氦');
+    }
+
+    if (props.task) {
+      await resetForTask(props.task);
+    }
+    emit('reported');
+  }
 }
 
 /** 瀹℃壒閫氳繃 */
@@ -294,6 +349,7 @@
 
 <template>
   <div class="feedback-tab">
+    <BatchInputDialog ref="batchDialogRef" @confirm="handleBatchConfirm" />
     <div v-if="!task" class="feedback-tab__empty">
       璇蜂粠宸︿晶宸ュ崟鍒楄〃閫夋嫨涓�鏉′换鍔�
     </div>

--
Gitblit v1.9.3