From b7ea73950a9acd4111ebd5bfba0983d9e9eb4186 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期四, 16 七月 2026 10:42:30 +0800
Subject: [PATCH] 工作台报工相关修改
---
src/views/mes/workbench/components/tabs/FeedbackTab.vue | 76 ++++++++++++++++++++++++++++++++++++-
1 files changed, 73 insertions(+), 3 deletions(-)
diff --git a/src/views/mes/workbench/components/tabs/FeedbackTab.vue b/src/views/mes/workbench/components/tabs/FeedbackTab.vue
index 22e58f9..e7e449a 100644
--- a/src/views/mes/workbench/components/tabs/FeedbackTab.vue
+++ b/src/views/mes/workbench/components/tabs/FeedbackTab.vue
@@ -10,7 +10,7 @@
} 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';
@@ -18,6 +18,7 @@
approveFeedback,
createFeedback,
getFeedback,
+ getFeedbackPage,
rejectFeedback,
submitFeedback,
updateFeedback,
@@ -140,6 +141,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 +150,73 @@
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;
+ }
+
+ // 4. 璋冪敤鎻愪氦鎺ュ彛
+ await submitFeedback(record.id!);
+ feedbackId.value = record.id;
+ feedbackStatus.value = record.status;
+
+ // 鏄剧ず鏄剧溂鐨勬垚鍔熸彁绀�
+ Modal.success({
+ title: '淇濆瓨骞舵彁浜ゆ垚鍔�',
+ content: `鎶ュ伐鍗� ${code} 宸叉彁浜,
+ centered: true,
+ });
+
+ // 閲嶇疆琛ㄥ崟涓烘柊寤烘ā寮忥紝閲嶆柊鐢熸垚鎶ヨ鍗曞彿
+ if (props.task) {
+ await resetForTask(props.task);
+ }
emit('reported');
}
@@ -252,6 +315,13 @@
>
淇濆瓨
</Button>
+ <Button
+ v-if="isEditable"
+ type="primary"
+ @click="handleSaveAndSubmit"
+ >
+ 淇濆瓨骞舵彁浜�
+ </Button>
<Popconfirm
v-if="canSubmit"
title="纭鎻愪氦璇ユ姤璁㈠崟锛熸彁浜ゅ悗灏嗕笉鑳戒慨鏀广��"
--
Gitblit v1.9.3