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/pro/feedback/modules/form.vue | 63 +++++++++++++++++++++++++++----
1 files changed, 55 insertions(+), 8 deletions(-)
diff --git a/src/views/mes/pro/feedback/modules/form.vue b/src/views/mes/pro/feedback/modules/form.vue
index d0e4edf..92bc22f 100644
--- a/src/views/mes/pro/feedback/modules/form.vue
+++ b/src/views/mes/pro/feedback/modules/form.vue
@@ -1,4 +1,4 @@
-锘�<script lang="ts" setup>
+<script lang="ts" setup>
import type { FormType } from '../data';
import type { MesProFeedbackApi } from '#/api/mes/pro/feedback';
@@ -25,6 +25,7 @@
updateFeedback,
} from '#/api/mes/pro/feedback';
import { getRouteProcessByRouteAndProcess } from '#/api/mes/pro/route/process';
+import { getWorkOrder } from '#/api/mes/pro/workorder';
import { $t } from '#/locales';
import { useFormSchema } from '../data';
@@ -142,6 +143,23 @@
}
}
+const batchDialogRef = ref<InstanceType<typeof BatchInputDialog>>();
+const batchActionType = ref<'submit' | 'approve'>('');
+
+/** 鎵ц鎻愪氦锛堝惈鎵规灞炴�э級 */
+async function doSubmit(batchFields?: Record<string, unknown>) {
+ if (!formData.value?.id) return;
+ modalApi.lock();
+ try {
+ await submitFeedback({ id: formData.value.id, ...batchFields });
+ await modalApi.close();
+ emit('success');
+ message.success('鎶ュ伐鍗曞凡鎻愪氦');
+ } finally {
+ modalApi.unlock();
+ }
+}
+
/** 鎻愪氦锛氫粎褰撹〃鍗曡緝蹇収鏈夊彉鏇存椂鎵嶅厛淇濆瓨锛屽啀璋冪敤鎻愪氦鎺ュ彛 */
async function handleSubmit() {
const { valid } = await formApi.validate();
@@ -156,16 +174,40 @@
await updateFeedback(data);
originalSnapshot.value = JSON.stringify(data);
}
- await submitFeedback(formData.value!.id!);
- await modalApi.close();
- emit('success');
- message.success('鎶ヨ鍗曞凡鎻愪氦');
+
+ // 妫�鏌ユ槸鍚﹂渶瑕佸鎵癸紝鑻ラ渶瑕佸鎵癸紝鍒欎笉闇�瑕佸湪姝ら樁娈靛～鍐欐壒娆″睘鎬э紝鐩存帴鎻愪氦
+ let feedbackApprove = false;
+ if (formData.value?.workOrderId) {
+ try {
+ const workOrder = await getWorkOrder(formData.value.workOrderId);
+ feedbackApprove = workOrder?.feedbackApprove ?? false;
+ } catch {
+ // ignore
+ }
+ }
+
+ if (feedbackApprove) {
+ await doSubmit();
+ return;
+ }
+
+ let checkResult;
+ try {
+ checkResult = await getBatchRequirements(formData.value!.id!);
+ } catch {
+ // ignore
+ }
+
+ if (checkResult?.needBatchInput) {
+ batchActionType.value = 'submit';
+ batchDialogRef.value?.open({ checkResult });
+ } else {
+ await doSubmit();
+ }
} finally {
modalApi.unlock();
}
}
-
-const batchDialogRef = ref<InstanceType<typeof BatchInputDialog>>();
/** 鎵ц瀹℃壒锛堝惈鎵规灞炴�э級 */
async function doApprove(batchFields?: Record<string, unknown>) {
@@ -195,6 +237,7 @@
const checkResult = await getBatchRequirements(formData.value.id);
if (checkResult?.needBatchInput) {
// 闇�瑕佸～鍐欐壒娆″睘鎬э紝寮圭獥鏀堕泦
+ batchActionType.value = 'approve';
batchDialogRef.value?.open({ checkResult });
} else {
await doApprove();
@@ -207,7 +250,11 @@
/** 鎵规寮圭獥纭鍥炶皟 */
function handleBatchConfirm(batchData: Record<string, unknown>) {
- doApprove(batchData);
+ if (batchActionType.value === 'submit') {
+ doSubmit(batchData);
+ } else {
+ doApprove(batchData);
+ }
}
/** 瀹℃壒涓嶉�氳繃 */
--
Gitblit v1.9.3