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/FeedbackHistoryTab.vue | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/src/views/mes/workbench/components/tabs/FeedbackHistoryTab.vue b/src/views/mes/workbench/components/tabs/FeedbackHistoryTab.vue
index 8620c70..0372990 100644
--- a/src/views/mes/workbench/components/tabs/FeedbackHistoryTab.vue
+++ b/src/views/mes/workbench/components/tabs/FeedbackHistoryTab.vue
@@ -3,12 +3,14 @@
import type { MesProFeedbackApi } from '#/api/mes/pro/feedback';
import { nextTick, onBeforeUnmount, onMounted, ref, watch } from 'vue';
+import { useRouter } from 'vue-router';
import {
DICT_TYPE,
MesProFeedbackStatusEnum,
} from '@vben/constants';
import { useVbenModal } from '@vben/common-ui';
+import { useAccess } from '@vben/access';
import { Button, message, Popconfirm, Space } from 'ant-design-vue';
@@ -40,6 +42,9 @@
connectedComponent: FeedbackForm,
destroyOnClose: true,
});
+
+const { hasAccessByCodes } = useAccess();
+const router = useRouter();
const batchDialogRef = ref<InstanceType<typeof BatchInputDialog>>();
const approvingRow = ref<MesProFeedbackApi.Feedback>();
@@ -74,7 +79,7 @@
/** 鎻愪氦锛堜粎鑽夌锛� */
async function handleSubmit(row: MesProFeedbackApi.Feedback) {
- await submitFeedback(row.id!);
+ await submitFeedback({ id: row.id! });
message.success('鎶ュ伐鍗曞凡鎻愪氦');
refreshGrid();
emit('reported');
@@ -108,6 +113,15 @@
message.success('鎶ュ伐鍗曞凡椹冲洖');
refreshGrid();
emit('reported');
+}
+
+/** 鏌ョ湅瀹℃壒璇︽儏 */
+function handleViewProcess(row: MesProFeedbackApi.Feedback) {
+ if (!row.processInstanceId) {
+ message.warning('璇ユ姤宸ュ皻鏈彁浜ゅ鎵�');
+ return;
+ }
+ router.push({ path: '/bpm/process-instance/detail', query: { id: row.processInstanceId } });
}
/** 鐘舵�佸父閲忎緵妯℃澘浣跨敤 */
@@ -274,9 +288,18 @@
鍒犻櫎
</Button>
</Popconfirm>
- <!-- 瀹℃壒涓細瀹℃壒閫氳繃銆侀┏鍥� -->
- <Popconfirm
+ <!-- 瀹℃壒涓細鏌ョ湅瀹℃壒 -->
+ <Button
v-if="row.status === STATUS_APPROVING"
+ type="link"
+ size="small"
+ @click="handleViewProcess(row)"
+ >
+ 鏌ョ湅瀹℃壒
+ </Button>
+ <!--
+ <Popconfirm
+ v-if="row.status === STATUS_APPROVING && hasAccessByCodes(['mes:pro-feedback:approve'])"
title="纭瀹℃壒閫氳繃璇ユ姤宸ュ崟锛�"
@confirm="handleApprove(row)"
>
@@ -285,7 +308,7 @@
</Button>
</Popconfirm>
<Popconfirm
- v-if="row.status === STATUS_APPROVING"
+ v-if="row.status === STATUS_APPROVING && hasAccessByCodes(['mes:pro-feedback:approve'])"
title="纭椹冲洖璇ユ姤宸ュ崟锛�"
@confirm="handleReject(row)"
>
@@ -293,6 +316,7 @@
椹冲洖
</Button>
</Popconfirm>
+ -->
</Space>
</template>
</Grid>
--
Gitblit v1.9.3