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/order/index.vue | 119 +++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 98 insertions(+), 21 deletions(-)
diff --git a/src/views/erp/purchase/order/index.vue b/src/views/erp/purchase/order/index.vue
index c56c84d..e260992 100644
--- a/src/views/erp/purchase/order/index.vue
+++ b/src/views/erp/purchase/order/index.vue
@@ -7,6 +7,7 @@
import { Page, useVbenModal } from '@vben/common-ui';
import { downloadFileFromBlobPart, isEmpty } from '@vben/utils';
+import { useUserStore } from '@vben/stores';
import { message, Tag } from 'ant-design-vue';
@@ -15,21 +16,34 @@
confirmReceipt,
deletePurchaseOrder,
exportPurchaseOrder,
+ getPurchaseOrderApproverUserIds,
getPurchaseOrderPage,
- updatePurchaseOrderStatus,
+ submitPurchaseOrder,
} from '#/api/erp/purchase/order';
import { $t } from '#/locales';
import { useGridColumns, useGridFormSchema } from './data';
+import AuditModal from './modules/audit-modal.vue';
import Form from './modules/form.vue';
/** ERP 閲囪喘璁㈠崟鍒楄〃 */
defineOptions({ name: 'ErpPurchaseOrder' });
const route = useRoute();
+const userStore = useUserStore();
+
+/** 褰撳墠涓氬姟绫诲瀷鐨勫鎵逛汉缂栧彿闆嗗悎锛岀敤浜庡垽鏂槸鍚﹀睍绀哄鏍告寜閽� */
+const approverIds = ref<number[]>([]);
+/** 褰撳墠鐧诲綍鐢ㄦ埛缂栧彿 */
+const currentUserId = userStore.userInfo?.id;
const [FormModal, formModalApi] = useVbenModal({
connectedComponent: Form,
+ destroyOnClose: true,
+});
+
+const [AuditModalComp, auditModalApi] = useVbenModal({
+ connectedComponent: AuditModal,
destroyOnClose: true,
});
@@ -69,21 +83,60 @@
}
}
-/** 瀹℃壒/鍙嶅鎵规搷浣� */
-async function handleUpdateStatus(
- row: ErpPurchaseOrderApi.PurchaseOrder,
- status: number,
-) {
+/** 鎻愪氦瀹℃牳 - 鍚庣鎸夊鎵归厤缃牎楠屽鎵逛汉锛屾棤闇�鍓嶇閫夋嫨娴佺▼ */
+async function handleSubmit(row: ErpPurchaseOrderApi.PurchaseOrder) {
const hideLoading = message.loading({
- content: `纭畾${status === 20 ? '瀹℃壒' : '鍙嶅鎵�'}璇ヨ鍗曞悧锛焋,
+ content: '姝ｅ湪鎻愪氦瀹℃牳...',
duration: 0,
});
try {
- await updatePurchaseOrderStatus(row.id!, status);
- message.success(`${status === 20 ? '瀹℃壒' : '鍙嶅鎵�'}鎴愬姛`);
+ await submitPurchaseOrder(row.id!);
+ message.success('鎻愪氦鎴愬姛锛岀瓑寰呭鎵逛汉瀹℃牳');
handleRefresh();
} finally {
hideLoading();
+ }
+}
+
+/** 瀹℃牳 - 閫氳繃 / 涓嶉�氳繃 */
+function handleAudit(row: ErpPurchaseOrderApi.PurchaseOrder, pass: boolean) {
+ auditModalApi.setData({ pass, row }).open();
+}
+
+/** 褰撳墠鐢ㄦ埛鏄惁涓鸿涓氬姟绫诲瀷鐨勫鎵逛汉 */
+function canAudit(row: ErpPurchaseOrderApi.PurchaseOrder) {
+ return (
+ row.status === 10 && approverIds.value.includes(currentUserId as number)
+ );
+}
+
+/** 鏌ョ湅瀹℃壒璇︽儏 - 鏀归�犱负杞婚噺绾у鎵瑰悗灞曠ず瀹℃牳璁板綍锛屼笉鍐嶈烦杞� BPM 娴佺▼璇︽儏 */
+function handleViewProcess(row: ErpPurchaseOrderApi.PurchaseOrder) {
+ 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;
+ }
+ message.info(parts.join('銆�'));
+}
+
+/** 鍔犺浇褰撳墠涓氬姟绫诲瀷鐨勫鎵逛汉缂栧彿闆嗗悎 */
+async function loadApproverIds() {
+ try {
+ approverIds.value = (await getPurchaseOrderApproverUserIds()) ?? [];
+ } catch {
+ approverIds.value = [];
}
}
@@ -151,6 +204,7 @@
});
onMounted(() => {
+ loadApproverIds();
const id = route.query.id;
if (id) {
formModalApi.setData({ formType: 'detail', id: Number(id) }).open();
@@ -159,7 +213,9 @@
</script>
<template>
- <Page auto-content-height><FormModal @success="handleRefresh" />
+ <Page auto-content-height>
+ <FormModal @success="handleRefresh" />
+ <AuditModalComp @success="handleRefresh" />
<Grid table-title="閲囪喘璁㈠崟鍒楄〃">
<template #toolbar-tools>
<TableAction
@@ -213,22 +269,43 @@
type: 'link',
icon: ACTION_ICON.EDIT,
auth: ['erp:purchase-order:update'],
- ifShow: () => row.status !== 20,
+ // 瀹℃壒涓笉鍙慨鏀癸細闇�鍏堛�屽鏍镐笉閫氳繃銆嶉��鍥烇紱宸插鏍镐笉鍙慨鏀�
+ ifShow: () => row.status === 0 || row.status === 30,
onClick: handleEdit.bind(null, row),
},
{
- label: row.status === 10 ? '瀹℃壒' : '鍙嶅鎵�',
+ label: '鎻愪氦',
+ type: 'link',
+ auth: ['erp:purchase-order:update-status'],
+ // 鏈彁浜や笌瀹℃牳涓嶉�氳繃鍧囧彲鎻愪氦锛屽鏍镐笉閫氳繃闇�淇敼鍚庨噸鏂版彁浜�
+ ifShow: () => row.status === 0 || row.status === 30,
+ onClick: handleSubmit.bind(null, row),
+ },
+ {
+ label: '瀹℃牳',
type: 'link',
icon: ACTION_ICON.AUDIT,
- auth: ['erp:purchase-order:update-status'],
- popConfirm: {
- title: `纭${row.status === 10 ? '瀹℃壒' : '鍙嶅鎵�'}${row.no}鍚楋紵`,
- confirm: handleUpdateStatus.bind(
- null,
- row,
- row.status === 10 ? 20 : 10,
- ),
- },
+ auth: ['erp:purchase-order:audit'],
+ // 浠呫�屽鎵逛腑 + 褰撳墠鐧诲綍鐢ㄦ埛鏄鎵逛汉銆嶆墠鏄剧ず锛屽叾浠栦汉鐪嬩笉鍒拌鎸夐挳
+ ifShow: canAudit(row),
+ onClick: handleAudit.bind(null, row, true),
+ },
+ {
+ label: '瀹℃牳涓嶉�氳繃',
+ type: 'link',
+ danger: true,
+ icon: ACTION_ICON.AUDIT,
+ auth: ['erp:purchase-order:audit'],
+ ifShow: canAudit(row),
+ onClick: handleAudit.bind(null, row, false),
+ },
+ {
+ label: '鏌ョ湅瀹℃壒',
+ type: 'link',
+ icon: ACTION_ICON.VIEW,
+ auth: ['erp:purchase-order:query'],
+ ifShow: () => row.status === 20 || row.status === 30,
+ onClick: handleViewProcess.bind(null, row),
},
{
label: '纭鏀惰揣',
--
Gitblit v1.9.3