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/pro/feedback/modules/form.vue | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/src/views/mes/pro/feedback/modules/form.vue b/src/views/mes/pro/feedback/modules/form.vue
index f7e2e8f..be59a78 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';
@@ -11,7 +11,7 @@
import { MesAutoCodeRuleCode, MesProFeedbackStatusEnum } from '@vben/constants';
import { useUserStore } from '@vben/stores';
-import { Button, message, Popconfirm, Tabs } from 'ant-design-vue';
+import { Alert, Button, message, Popconfirm, Tabs } from 'ant-design-vue';
import { useVbenForm } from '#/adapter/form';
import { generateAutoCode } from '#/api/mes/md/autocode/record';
@@ -233,7 +233,15 @@
}
/** 鍔犺浇宸ュ簭鐨� checkFlag 鐢ㄤ簬鍥炴樉鏁伴噺鍖哄煙 */
-async function resolveCheckFlag(routeId?: number, processId?: number) {
+async function resolveCheckFlag(
+ routeId?: number,
+ processId?: number,
+ taskCheckFlag?: boolean,
+) {
+ // 鏄惁璐ㄦ浠ヤ换鍔★紙宸ュ崟宸ュ簭蹇収锛変负鍑�
+ if (typeof taskCheckFlag === 'boolean') {
+ return taskCheckFlag;
+ }
if (!routeId || !processId) {
return true;
}
@@ -302,6 +310,7 @@
const checkFlag = await resolveCheckFlag(
formData.value.routeId,
formData.value.processId,
+ formData.value.checkFlag,
);
// 璁剧疆鍒� values
await formApi.setValues({ ...formData.value, checkFlag });
@@ -316,6 +325,14 @@
<template>
<Modal :title="getTitle" class="w-3/5">
+ <Alert
+ v-if="canApprove"
+ class="mx-4 mb-4"
+ type="info"
+ show-icon
+ message="瀹℃壒鍓嶈鏍稿鐢熶骇涓庡簱瀛橀厤缃�"
+ description="鑷姩鎵f枡宸ュ簭闇�瑕佺嚎杈瑰簱鏈夎冻澶熺墿鏂欙紱闇�妫�宸ュ簭闇�瑕侀厤缃繃绋嬫楠屾柟妗堛�傛湯閬撳伐搴忚鍏堥厤缃垚鍝佸叆搴撲粨浣嶃��"
+ />
<Form class="mx-4" />
<FeedbackParamFields ref="paramFields" :task-id="paramTaskId" :snapshot="paramSnapshot" :readonly="!isEditable" />
<Tabs
--
Gitblit v1.9.3