From f984f80ff5d6c36af7860a17d762fe92731e28bd Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 07 十一月 2026 19:16:04 +0800
Subject: [PATCH] feat(feedback): 优化报工审批流程并增加报工人校验
---
src/views/mes/workbench/components/tabs/FeedbackTab.vue | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/views/mes/workbench/components/tabs/FeedbackTab.vue b/src/views/mes/workbench/components/tabs/FeedbackTab.vue
index a5dc6e4..1296ec6 100644
--- a/src/views/mes/workbench/components/tabs/FeedbackTab.vue
+++ b/src/views/mes/workbench/components/tabs/FeedbackTab.vue
@@ -101,8 +101,13 @@
return data;
}
-/** 鍔犺浇 checkFlag */
-async function resolveCheckFlag(routeId?: number, processId?: number) {
+/** 鍔犺浇 checkFlag锛氫换鍔★紙宸ュ崟宸ュ簭蹇収锛変紭鍏堬紝缂哄け鏃跺洖閫�宸ヨ壓璺嚎宸ュ簭 */
+async function resolveCheckFlag(
+ routeId?: number,
+ processId?: number,
+ taskCheckFlag?: boolean,
+) {
+ if (typeof taskCheckFlag === 'boolean') return taskCheckFlag;
if (!routeId || !processId) return true;
try {
const rp = await getRouteProcessByRouteAndProcess(routeId, processId);
@@ -124,7 +129,11 @@
formApi.setState({ schema: useFormSchema(formType.value, formApi) });
const code = await generateAutoCode(MesAutoCodeRuleCode.PRO_FEEDBACK_CODE);
- const checkFlag = await resolveCheckFlag(task.routeId, task.processId);
+ const checkFlag = await resolveCheckFlag(
+ task.routeId,
+ task.processId,
+ task.checkFlag,
+ );
await formApi.setValues({
code,
@@ -285,7 +294,11 @@
feedbackStatus.value = data.status;
formType.value = 'update';
formApi.setState({ schema: useFormSchema(formType.value, formApi) });
- const checkFlag = await resolveCheckFlag(data.routeId, data.processId);
+ const checkFlag = await resolveCheckFlag(
+ data.routeId,
+ data.processId,
+ data.checkFlag,
+ );
await formApi.setValues({ ...data, checkFlag });
originalSnapshot.value = JSON.stringify(await getAlignedData(false));
}
--
Gitblit v1.9.3