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/index.vue | 2
src/views/mes/pro/feedback/index.vue | 2
src/views/mes/workbench/components/tabs/FeedbackTab.vue | 76 ++++++++++++++++++++++++++++++++++++-
src/views/mes/pro/feedback/modules/form.vue | 9 +++-
src/packages/locales/src/langs/zh-CN/common.json | 6 ++
src/views/mes/workbench/components/tabs/RecordParamTab.vue | 6 ++-
src/views/mes/workbench/components/TaskListPanel.vue | 11 +----
src/views/mes/workbench/components/tabs/FeedbackHistoryTab.vue | 2
8 files changed, 94 insertions(+), 20 deletions(-)
diff --git a/src/packages/locales/src/langs/zh-CN/common.json b/src/packages/locales/src/langs/zh-CN/common.json
index 9905b47..a64676a 100644
--- a/src/packages/locales/src/langs/zh-CN/common.json
+++ b/src/packages/locales/src/langs/zh-CN/common.json
@@ -24,5 +24,9 @@
"submit": "鎻愪氦",
"approve": "瀹℃壒",
"showSearchPanel": "鏄剧ず鎼滅储闈㈡澘",
- "hideSearchPanel": "闅愯棌鎼滅储闈㈡澘"
+ "hideSearchPanel": "闅愯棌鎼滅储闈㈡澘",
+ "createSuccess": "鍒涘缓鎴愬姛",
+ "updateSuccess": "鏇存柊鎴愬姛",
+ "deleteSuccess": "鍒犻櫎鎴愬姛"
+
}
diff --git a/src/views/mes/pro/feedback/index.vue b/src/views/mes/pro/feedback/index.vue
index 9af967e..b4457b7 100644
--- a/src/views/mes/pro/feedback/index.vue
+++ b/src/views/mes/pro/feedback/index.vue
@@ -40,7 +40,7 @@
/** 缂栬緫鐢熶骇鎶ュ伐 */
function handleEdit(row: MesProFeedbackApi.Feedback) {
- formModalApi.setData({ formType: 'update', id: row.id }).open();
+ formModalApi.setData({ formType: 'update', id: row.id, showSubmitButton: false }).open();
}
/** 鎻愪氦鐢熶骇鎶ュ伐 */
diff --git a/src/views/mes/pro/feedback/modules/form.vue b/src/views/mes/pro/feedback/modules/form.vue
index bc928b7..edfb35c 100644
--- a/src/views/mes/pro/feedback/modules/form.vue
+++ b/src/views/mes/pro/feedback/modules/form.vue
@@ -30,6 +30,7 @@
const emit = defineEmits(['success']);
const formType = ref<FormType>('create');
+const showSubmitButton = ref(true);
const formData = ref<MesProFeedbackApi.Feedback>();
const userStore = useUserStore();
const subTabsName = ref('itemConsume');
@@ -40,6 +41,7 @@
);
const canSubmit = computed(
() =>
+ showSubmitButton.value &&
isEditable.value &&
formData.value?.status === MesProFeedbackStatusEnum.PREPARE,
);
@@ -224,8 +226,9 @@
return;
}
// 鍔犺浇鏁版嵁
- const data = modalApi.getData<{ formType: FormType; id?: number }>();
+ const data = modalApi.getData<{ formType: FormType; id?: number; showSubmitButton?: boolean }>();
formType.value = data.formType;
+ showSubmitButton.value = data.showSubmitButton !== false;
formApi.setState({ schema: useFormSchema(formType.value, formApi) });
// 瀹℃壒/璇︽儏鏁磋〃绂佺敤锛岄伩鍏嶅鏍镐汉璇敼鏈彁浜ょ殑瀛楁
formApi.setDisabled(
@@ -233,7 +236,9 @@
);
modalApi.setState({
showConfirmButton:
- formType.value !== 'detail' && formType.value !== 'approve',
+ formType.value !== 'detail' &&
+ formType.value !== 'approve' &&
+ formType.value !== 'submit',
});
if (!data?.id) {
// 鏂板锛氶粯璁ゆ姤宸ヤ汉鍜屾姤宸ユ椂闂达紝骞惰嚜鍔ㄧ敓鎴愭姤璁㈠崟鍙�
diff --git a/src/views/mes/workbench/components/TaskListPanel.vue b/src/views/mes/workbench/components/TaskListPanel.vue
index be2d5bf..908292a 100644
--- a/src/views/mes/workbench/components/TaskListPanel.vue
+++ b/src/views/mes/workbench/components/TaskListPanel.vue
@@ -11,8 +11,6 @@
list: PendingTask[];
selectedId?: number;
loading?: boolean;
- /** 褰撳墠宸ヤ綔绔欏搴旂殑宸ュ簭鍚嶇О锛屽垪琛ㄥ彧灞曠ず鍖归厤鐨勫伐搴� */
- processName?: string;
}>();
const emit = defineEmits<{
@@ -23,14 +21,9 @@
/** 鍏堟寜宸ヤ綔绔欏伐搴忚繃婊わ紝鍐嶆寜鎼滅储鍏抽敭瀛楀尮閰� */
const filteredList = computed(() => {
- let result = props.list;
- // 鍥哄畾鍙樉绀哄拰褰撳墠宸ヤ綔绔欏伐搴忓尮閰嶇殑浠诲姟
- if (props.processName) {
- result = result.filter((row) => row.processName === props.processName);
- }
const kw = searchKeyword.value.trim().toLowerCase();
- if (!kw) return result;
- return result.filter((row) => {
+ if (!kw) return props.list;
+ return props.list.filter((row) => {
const fields = [
row.code,
row.workOrderCode,
diff --git a/src/views/mes/workbench/components/tabs/FeedbackHistoryTab.vue b/src/views/mes/workbench/components/tabs/FeedbackHistoryTab.vue
index 7ec016e..9c9cad4 100644
--- a/src/views/mes/workbench/components/tabs/FeedbackHistoryTab.vue
+++ b/src/views/mes/workbench/components/tabs/FeedbackHistoryTab.vue
@@ -46,7 +46,7 @@
/** 缂栬緫锛堜粎鑽夌锛� */
function handleEdit(row: MesProFeedbackApi.Feedback) {
- formModalApi.setData({ formType: 'update', id: row.id }).open();
+ formModalApi.setData({ formType: 'update', id: row.id, showSubmitButton: false }).open();
}
/** 鍒犻櫎锛堜粎鑽夌锛� */
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="纭鎻愪氦璇ユ姤璁㈠崟锛熸彁浜ゅ悗灏嗕笉鑳戒慨鏀广��"
diff --git a/src/views/mes/workbench/components/tabs/RecordParamTab.vue b/src/views/mes/workbench/components/tabs/RecordParamTab.vue
index 5cf6271..81b114c 100644
--- a/src/views/mes/workbench/components/tabs/RecordParamTab.vue
+++ b/src/views/mes/workbench/components/tabs/RecordParamTab.vue
@@ -24,6 +24,8 @@
defineOptions({ name: 'WorkbenchRecordParamTab' });
const props = defineProps<{
+ /** 褰撳墠浠诲姟缂栧彿锛堢敤浜庣洃鍚换鍔″垏鎹級 */
+ taskId?: number;
/** 褰撳墠宸ュ崟缂栧彿 */
workOrderId?: number;
/** 褰撳墠宸ヤ綔绔欑紪鍙� */
@@ -295,9 +297,9 @@
}
}
-// 宸ュ崟鎴栧伐浣滅珯鍙樻洿鏃跺姞杞借褰�
+// 浠诲姟/宸ュ崟/宸ヤ綔绔欏彉鏇存椂鍔犺浇璁板綍
watch(
- () => [props.workOrderId, props.workstationId],
+ () => [props.taskId, props.workOrderId, props.workstationId],
() => {
handleCancelForm();
refreshRecordList();
diff --git a/src/views/mes/workbench/index.vue b/src/views/mes/workbench/index.vue
index 2d9072b..9cb719d 100644
--- a/src/views/mes/workbench/index.vue
+++ b/src/views/mes/workbench/index.vue
@@ -167,7 +167,6 @@
:list="taskList"
:selected-id="selectedTask?.id"
:loading="taskLoading"
- :process-name="workstation?.processName"
@select="handleSelectTask"
/>
</aside>
@@ -204,6 +203,7 @@
/>
<RecordParamTab
v-else-if="activeTab === 'record-param'"
+ :task-id="selectedTask?.id"
:work-order-id="selectedTask?.workOrderId"
:workstation-id="workstationId"
/>
--
Gitblit v1.9.3