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 | 148 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 138 insertions(+), 10 deletions(-)
diff --git a/src/views/mes/workbench/components/tabs/FeedbackTab.vue b/src/views/mes/workbench/components/tabs/FeedbackTab.vue
index 22e58f9..f867d68 100644
--- a/src/views/mes/workbench/components/tabs/FeedbackTab.vue
+++ b/src/views/mes/workbench/components/tabs/FeedbackTab.vue
@@ -4,20 +4,23 @@
import { computed, ref, watch } from 'vue';
+import dayjs from 'dayjs';
+
import {
MesAutoCodeRuleCode,
MesProFeedbackStatusEnum,
} from '@vben/constants';
import { useUserStore } from '@vben/stores';
-import { Button, message, Popconfirm } from 'ant-design-vue';
+import { Button, message, Modal, Popconfirm } from 'ant-design-vue';
import { useVbenForm } from '#/adapter/form';
import { generateAutoCode } from '#/api/mes/md/autocode/record';
import {
approveFeedback,
- createFeedback,
+ createFeedback, getBatchRequirements,
getFeedback,
+ getFeedbackPage,
rejectFeedback,
submitFeedback,
updateFeedback,
@@ -26,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<{
@@ -115,7 +121,7 @@
await formApi.setValues({
code,
type: 1,
- feedbackTime: Date.now(),
+ feedbackTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
feedbackUserId: userStore.userInfo?.id,
taskId: task.id,
workOrderId: task.workOrderId,
@@ -128,9 +134,9 @@
itemSpecification: task.itemSpecification,
unitMeasureName: task.unitMeasureName,
scheduledQuantity: task.quantity,
+ feedbackApprove: task.feedbackApprove,
checkFlag,
});
-
originalSnapshot.value = JSON.stringify(await getAlignedData());
}
@@ -140,6 +146,7 @@
if (!valid) return;
const data = await getAlignedData();
+ const code = data.code as string;
if (formType.value === 'create') {
const id = await createFeedback(data);
@@ -148,12 +155,78 @@
formType.value = 'update';
formApi.setState({ schema: useFormSchema(formType.value, formApi) });
await formApi.setFieldValue('id', id);
- message.success($t('common.createSuccess'));
} else {
await updateFeedback(data);
- message.success($t('common.updateSuccess'));
}
originalSnapshot.value = JSON.stringify(data);
+
+ // 鏄剧ず鏄剧溂鐨勬垚鍔熸彁绀�
+ Modal.success({
+ title: '淇濆瓨鎴愬姛',
+ content: `鎶ュ伐鍗� ${code} 宸蹭繚瀛榒,
+ centered: true,
+ });
+
+ // 閲嶇疆琛ㄥ崟涓烘柊寤烘ā寮忥紝閲嶆柊鐢熸垚鎶ヨ鍗曞彿
+ if (props.task) {
+ await resetForTask(props.task);
+ }
+
+ emit('reported');
+}
+
+/** 淇濆瓨骞舵彁浜わ紙鍏堜繚瀛橈紝鍐嶆煡璇㈠苟鎻愪氦锛� */
+async function handleSaveAndSubmit() {
+ const { valid } = await formApi.validate();
+ if (!valid) return;
+
+ const data = await getAlignedData();
+ const code = data.code as string;
+
+ // 1. 鍏堜繚瀛�
+ if (formType.value === 'create') {
+ const id = await createFeedback(data);
+ feedbackId.value = id;
+ feedbackStatus.value = MesProFeedbackStatusEnum.PREPARE;
+ formType.value = 'update';
+ formApi.setState({ schema: useFormSchema(formType.value, formApi) });
+ await formApi.setFieldValue('id', id);
+ } else {
+ await updateFeedback(data);
+ }
+ originalSnapshot.value = JSON.stringify(data);
+
+ // 2. 鏌ヨ鎶ュ伐璁板綍锛屽尮閰嶈鎶ュ伐鍗曞彿
+ const pageResult = await getFeedbackPage({ code, pageNo: 1, pageSize: 1 });
+ const record = pageResult.list?.[0];
+
+ // 3. 妫�鏌ユ槸鍚﹀彲鎻愪氦锛堣崏绋跨姸鎬侊級
+ if (!record || record.status !== MesProFeedbackStatusEnum.PREPARE) {
+ message.warning('淇濆瓨鎴愬姛锛屼絾褰撳墠鎶ュ伐鍗曠姸鎬佷笉鍙彁浜�');
+ emit('reported');
+ return;
+ }
+
+ pendingSubmitMode.value = 'saveAndSubmit';
+
+ // 4. 璋冪敤鎻愪氦鎺ュ彛
+ const isDone = await handleOnSubmit(feedbackId.value!,props.task.feedbackApprove);
+ if (!isDone) return;
+
+ feedbackId.value = record.id;
+ feedbackStatus.value = record.status;
+
+ // 鏄剧ず鏄剧溂鐨勬垚鍔熸彁绀�
+ Modal.success({
+ title: '淇濆瓨骞舵彁浜ゆ垚鍔�',
+ content: `鎶ュ伐鍗� ${code} 宸叉彁浜,
+ centered: true,
+ });
+
+ // 閲嶇疆琛ㄥ崟涓烘柊寤烘ā寮忥紝閲嶆柊鐢熸垚鎶ヨ鍗曞彿
+ if (props.task) {
+ await resetForTask(props.task);
+ }
emit('reported');
}
@@ -167,8 +240,12 @@
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);
@@ -176,10 +253,53 @@
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');
+ }
+}
+
/** 瀹℃壒閫氳繃 */
async function handleApprove() {
if (!feedbackId.value) return;
- const finished = await approveFeedback(feedbackId.value);
+ const finished = await approveFeedback({ id: feedbackId.value });
message.success(
finished ? '鎶ヨ鍗曞凡瀹℃壒瀹屾垚' : '鎶ュ伐鎴愬姛锛岃绛夊緟璐ㄩ噺妫�楠屽畬鎴愶紒',
);
@@ -229,6 +349,7 @@
<template>
<div class="feedback-tab">
+ <BatchInputDialog ref="batchDialogRef" @confirm="handleBatchConfirm" />
<div v-if="!task" class="feedback-tab__empty">
璇蜂粠宸︿晶宸ュ崟鍒楄〃閫夋嫨涓�鏉′换鍔�
</div>
@@ -252,6 +373,13 @@
>
淇濆瓨
</Button>
+ <Button
+ v-if="isEditable"
+ type="primary"
+ @click="handleSaveAndSubmit"
+ >
+ 淇濆瓨骞舵彁浜�
+ </Button>
<Popconfirm
v-if="canSubmit"
title="纭鎻愪氦璇ユ姤璁㈠崟锛熸彁浜ゅ悗灏嗕笉鑳戒慨鏀广��"
--
Gitblit v1.9.3