From e99df7745f202936ad9fa59982e52327fd90e763 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期三, 16 九月 2026 14:29:48 +0800
Subject: [PATCH] refactor(approval): 审批配置页 + 采购计划/采购订单改为状态机审核
---
src/views/erp/purchase/plan/index.vue | 97 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 77 insertions(+), 20 deletions(-)
diff --git a/src/views/erp/purchase/plan/index.vue b/src/views/erp/purchase/plan/index.vue
index 671a09f..916cb2a 100644
--- a/src/views/erp/purchase/plan/index.vue
+++ b/src/views/erp/purchase/plan/index.vue
@@ -2,11 +2,12 @@
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
import type { ErpPurchasePlanApi } from '#/api/erp/purchase/plan';
-import { ref } from 'vue';
+import { onMounted, ref } from 'vue';
import { useRouter } from 'vue-router';
import { confirm, Page, useVbenModal } from '@vben/common-ui';
import { downloadFileFromBlobPart, isEmpty } from '@vben/utils';
+import { useUserStore } from '@vben/stores';
import { message, Tag } from 'ant-design-vue';
@@ -16,27 +17,34 @@
exportPurchasePlan,
generatePlanFromStockAlert,
generatePurchaseRequests,
- getApproveProcessList,
+ getPurchasePlanApproverUserIds,
getPurchasePlanPage,
+ submitPurchasePlan,
} from '#/api/erp/purchase/plan';
import { $t } from '#/locales';
import { useGridColumns, useGridFormSchema } from './data';
+import AuditModal from './modules/audit-modal.vue';
import Form from './modules/form.vue';
-import ProcessSelectModal from './modules/process-select-modal.vue';
/** ERP 閲囪喘璁″垝鍒楄〃 */
defineOptions({ name: 'ErpPurchasePlan' });
const router = useRouter();
+const userStore = useUserStore();
+
+/** 褰撳墠涓氬姟绫诲瀷鐨勫鎵逛汉缂栧彿闆嗗悎锛岀敤浜庡垽鏂槸鍚﹀睍绀哄鏍告寜閽� */
+const approverIds = ref<number[]>([]);
+/** 褰撳墠鐧诲綍鐢ㄦ埛缂栧彿 */
+const currentUserId = userStore.userInfo?.id;
const [FormModal, formModalApi] = useVbenModal({
connectedComponent: Form,
destroyOnClose: true,
});
-const [ProcessModal, processModalApi] = useVbenModal({
- connectedComponent: ProcessSelectModal,
+const [AuditModalComp, auditModalApi] = useVbenModal({
+ connectedComponent: AuditModal,
destroyOnClose: true,
});
@@ -92,23 +100,29 @@
}
}
-/** 鎻愪氦瀹℃壒 - 鍏堣幏鍙栨祦绋嬪垪琛� */
+/** 鎻愪氦瀹℃牳 - 鍚庣鎸夊鎵归厤缃牎楠屽鎵逛汉锛屾棤闇�鍓嶇閫夋嫨娴佺▼ */
async function handleSubmit(row: ErpPurchasePlanApi.PurchasePlan) {
const hideLoading = message.loading({
- content: '鑾峰彇瀹℃壒娴佺▼...',
+ content: '姝ｅ湪鎻愪氦瀹℃牳...',
duration: 0,
});
try {
- const processList = await getApproveProcessList(row.id!);
- hideLoading();
- if (!processList || processList.length === 0) {
- message.warning('鏆傛棤鍙敤瀹℃壒娴佺▼锛岃鍏堥厤缃� BPM 娴佺▼');
- return;
- }
- processModalApi.setData({ id: row.id, processList }).open();
- } catch {
+ await submitPurchasePlan(row.id!);
+ message.success('鎻愪氦鎴愬姛锛岀瓑寰呭鎵逛汉瀹℃牳');
+ handleRefresh();
+ } finally {
hideLoading();
}
+}
+
+/** 瀹℃牳 - 閫氳繃 / 涓嶉�氳繃 */
+function handleAudit(row: ErpPurchasePlanApi.PurchasePlan, pass: boolean) {
+ auditModalApi.setData({ pass, row }).open();
+}
+
+/** 褰撳墠鐢ㄦ埛鏄惁涓鸿涓氬姟绫诲瀷鐨勫鎵逛汉 */
+function canAudit(row: ErpPurchasePlanApi.PurchasePlan) {
+ return row.status === 10 && approverIds.value.includes(currentUserId as number);
}
/** 鐢熸垚閲囪喘鐢宠 */
@@ -145,14 +159,37 @@
formModalApi.setData({ formType: 'detail', id: row.id }).open();
}
-/** 鏌ョ湅瀹℃壒璇︽儏 */
+/** 鏌ョ湅瀹℃壒璇︽儏 - 鏀归�犱负杞婚噺绾у鎵瑰悗灞曠ず瀹℃牳璁板綍锛屼笉鍐嶈烦杞� BPM 娴佺▼璇︽儏 */
function handleViewProcess(row: ErpPurchasePlanApi.PurchasePlan) {
- if (!row.processInstanceId) {
- message.warning('璇ヨ鍒掑皻鏈彁浜ゅ鎵�');
+ const parts: string[] = [];
+ if (row.reviewerName) {
+ parts.push(`瀹℃牳浜猴細${row.reviewerName}`);
+ }
+ if (row.reviewTime) {
+ parts.push(`瀹℃牳鏃堕棿锛�${row.reviewTime}`);
+ }
+ if (row.reviewRemark) {
+ parts.push(`${row.status === 30 ? '涓嶉�氳繃鍘熷洜' : '瀹℃牳鎰忚'}锛�${row.reviewRemark}`);
+ }
+ if (parts.length === 0) {
+ message.info('璇ヨ鍒掓殏鏃犲鏍歌褰�');
return;
}
- router.push({ name: 'BpmProcessInstanceDetail', query: { id: row.processInstanceId } });
+ message.info(parts.join('銆�'));
}
+
+/** 鍔犺浇褰撳墠涓氬姟绫诲瀷鐨勫鎵逛汉缂栧彿闆嗗悎 */
+async function loadApproverIds() {
+ try {
+ approverIds.value = (await getPurchasePlanApproverUserIds()) ?? [];
+ } catch {
+ approverIds.value = [];
+ }
+}
+
+onMounted(() => {
+ loadApproverIds();
+});
const [Grid, gridApi] = useVbenVxeGrid({
formOptions: {
@@ -192,7 +229,7 @@
<template>
<Page auto-content-height>
<FormModal @success="handleRefresh" />
- <ProcessModal @success="handleRefresh" />
+ <AuditModalComp @success="handleRefresh" />
<Grid table-title="閲囪喘璁″垝鍒楄〃">
<template #toolbar-tools>
<TableAction
@@ -264,10 +301,30 @@
{
label: '鎻愪氦',
type: 'link',
+ auth: ['erp:purchase-plan:submit'],
+ // 鑽夌涓庡鏍镐笉閫氳繃鍧囧彲鎻愪氦锛屽鏍镐笉閫氳繃闇�淇敼鍚庨噸鏂版彁浜�
ifShow: () => row.status === 0 || row.status === 30,
onClick: handleSubmit.bind(null, row),
},
{
+ label: '瀹℃牳',
+ type: 'link',
+ icon: ACTION_ICON.AUDIT,
+ auth: ['erp:purchase-plan:audit'],
+ // 浠呫�屽鎵逛腑 + 褰撳墠鐧诲綍鐢ㄦ埛鏄鎵逛汉銆嶆墠鏄剧ず锛屽叾浠栦汉鐪嬩笉鍒拌鎸夐挳
+ ifShow: canAudit(row),
+ onClick: handleAudit.bind(null, row, true),
+ },
+ {
+ label: '瀹℃牳涓嶉�氳繃',
+ type: 'link',
+ danger: true,
+ auth: ['erp:purchase-plan:audit'],
+ // 鍚屼笂锛屼笌銆屽鏍搞�嶆垚瀵瑰嚭鐜帮紝浠呭鎵逛汉鍙
+ ifShow: canAudit(row),
+ onClick: handleAudit.bind(null, row, false),
+ },
+ {
label: '鐢熸垚鐢宠',
type: 'link',
auth: ['erp:purchase-plan:generate-request'],
--
Gitblit v1.9.3