From 91eff4781fa4142d1f62d30a0fa1de5cae424eaf Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期三, 16 九月 2026 18:23:12 +0800
Subject: [PATCH] refactor: 单据审核改为审批配置状态机(前端统一审核弹窗)
---
src/views/mes/pd/tech-confirm/index.vue | 124 +++++++++++++++++++++++++++++++++++-----
1 files changed, 107 insertions(+), 17 deletions(-)
diff --git a/src/views/mes/pd/tech-confirm/index.vue b/src/views/mes/pd/tech-confirm/index.vue
index 88f2bf0..04798eb 100644
--- a/src/views/mes/pd/tech-confirm/index.vue
+++ b/src/views/mes/pd/tech-confirm/index.vue
@@ -2,11 +2,13 @@
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
import type { MesPdTechConfirmApi } from '#/api/mes/pd/tech-confirm';
- import { ref } from 'vue';
-
import { Page, useVbenModal } from '@vben/common-ui';
import { $t } from '@vben/locales';
import { downloadFileFromBlobPart } from '@vben/utils';
+
+ import { ref } from 'vue';
+
+ import { MesPdTechConfirmStatusEnum } from '#/packages/constants/src';
import { Button, message } from 'ant-design-vue';
@@ -14,21 +16,60 @@
import {
deleteTechConfirm,
exportTechConfirm,
+ getTechConfirmApproverIds,
getTechConfirmPage,
- updateTechConfirm,
+ submitTechConfirmAudit,
} from '#/api/mes/pd/tech-confirm';
+ import { useUserStore } from '@vben/stores';
import { useGridColumns, useGridFormSchema } from './data';
+ import AuditModal from './modules/audit-modal.vue';
+ import CustomerConfirmModal from './modules/customer-confirm-modal.vue';
import Form from './modules/form.vue';
+
+ const userStore = useUserStore();
+ const currentUserId = userStore.userInfo?.id; // 褰撳墠鐧诲綍鐢ㄦ埛 ID锛岀敤浜庡鏍镐汉鏉冮檺鍒ゆ柇
+
+ /** 瀹℃壒閰嶇疆涓涓氬姟鐨勫鏍镐汉缂栧彿闆嗗悎锛屽喅瀹氥�屽鏍� / 瀹℃牳涓嶉�氳繃銆嶆寜閽槸鍚﹀睍绀� */
+ const approverIds = ref<number[]>([]);
+
+ /** 鎷夊彇瀹℃牳浜洪泦鍚堬紱澶辫触鏃朵繚鎸佷负绌猴紙鎸夐挳涓嶅睍绀猴級锛屼笉闃绘柇鍒楄〃鍔犺浇 */
+ async function loadApproverIds() {
+ try {
+ approverIds.value = (await getTechConfirmApproverIds()) ?? [];
+ } catch {
+ approverIds.value = [];
+ }
+ }
+
+ /** 褰撳墠鐧诲綍鐢ㄦ埛鏄惁涓鸿涓氬姟鐨勫鏍镐汉锛屼笖鍗曟嵁澶勪簬寰呭鏍哥姸鎬� */
+ function canAudit(row: MesPdTechConfirmApi.TechConfirm) {
+ return (
+ row.status === MesPdTechConfirmStatusEnum.PENDING_AUDIT &&
+ !!currentUserId &&
+ approverIds.value.includes(currentUserId)
+ );
+ }
const [FormModal, formModalApi] = useVbenModal({
connectedComponent: Form,
destroyOnClose: true,
});
- /** 鍒锋柊琛ㄦ牸 */
+ const [AuditModalComp, auditModalApi] = useVbenModal({
+ connectedComponent: AuditModal,
+ destroyOnClose: true,
+ });
+
+ const [CustomerConfirm, customerConfirmApi] = useVbenModal({
+ connectedComponent: CustomerConfirmModal,
+ destroyOnClose: true,
+ });
+
+ /** 鍒锋柊琛ㄦ牸涓庡鏍镐汉闆嗗悎 */
function handleRefresh() {
gridApi.query();
+ loadApproverIds();
}
/** 鏂板 */
@@ -61,16 +102,35 @@
}
}
- /** 鐘舵�佹祦杞� */
- async function handleStatus(row: MesPdTechConfirmApi.TechConfirm, next: number) {
- const hideLoading = message.loading({ content: '鐘舵�佹洿鏂颁腑...', duration: 0 });
+ /** 鎻愪氦瀹℃牳 - 瀹℃牳浜虹敱銆岀郴缁熺鐞� - 瀹℃壒閰嶇疆銆嶇粺涓�鎸囧畾锛屾澶勬棤闇�閫夋嫨 */
+ async function handleSubmitAudit(row: MesPdTechConfirmApi.TechConfirm) {
+ const hideLoading = message.loading({
+ content: '姝e湪鎻愪氦瀹℃牳...',
+ duration: 0,
+ });
try {
- await updateTechConfirm({ ...row, status: next });
- message.success($t('ui.actionMessage.operationSuccess'));
+ await submitTechConfirmAudit(row.id!);
+ message.success('鎻愪氦瀹℃牳鎴愬姛');
handleRefresh();
} finally {
hideLoading();
}
+ }
+
+ /** 瀹℃牳 - 閫氳繃 / 涓嶉�氳繃 */
+ function handleAudit(row: MesPdTechConfirmApi.TechConfirm, pass: boolean) {
+ auditModalApi.setData({ pass, row }).open();
+ }
+
+ /** 瀹㈡埛纭 - 璁板綍瀹㈡埛纭浜猴紝鐢卞悗绔啓鍏ョ‘璁ゆ椂闂� */
+ function handleCustomerConfirm(row: MesPdTechConfirmApi.TechConfirm) {
+ customerConfirmApi
+ .setData({
+ id: row.id,
+ confirmNo: row.confirmNo,
+ customerName: row.customerName,
+ })
+ .open();
}
/** 瀵煎嚭 */
@@ -107,11 +167,16 @@
},
} as VxeTableGridOptions<MesPdTechConfirmApi.TechConfirm>,
});
+
+ // 杩涘叆椤甸潰鍗虫媺鍙栧鏍镐汉闆嗗悎锛岀敤浜庢帶鍒跺鏍告寜閽樉闅�
+ loadApproverIds();
</script>
<template>
<Page auto-content-height>
<FormModal @success="handleRefresh" />
+ <AuditModalComp @success="handleRefresh" />
+ <CustomerConfirm @success="handleRefresh" />
<Grid table-title="浜у搧鎶�鏈‘璁ゅ嚱鍒楄〃">
<template #toolbar-tools>
<TableAction
@@ -146,30 +211,51 @@
type: 'link',
icon: ACTION_ICON.AUDIT,
auth: ['mes:pd-tech-confirm:update'],
- ifShow: row.status === 0,
- onClick: handleStatus.bind(null, row, 1),
+ // 鑽夌涓庡鏍镐笉閫氳繃鍧囧彲鎻愪氦锛屽鏍镐笉閫氳繃闇�淇敼鍚庨噸鏂版彁浜�
+ ifShow:
+ row.status === MesPdTechConfirmStatusEnum.DRAFT ||
+ row.status === MesPdTechConfirmStatusEnum.REJECTED,
+ // 瀹℃牳浜虹敱瀹℃壒閰嶇疆缁熶竴鎸囧畾锛屾彁浜ゅ墠浠呬簩娆$‘璁わ紝涓嶅啀寮归�変汉妗�
+ popConfirm: {
+ title: '纭鎻愪氦瀹℃牳锛熸彁浜ゅ悗鐢卞鎵归厤缃腑鎸囧畾鐨勫鏍镐汉澶勭悊銆�',
+ confirm: handleSubmitAudit.bind(null, row),
+ },
},
{
- label: '瀹℃牳閫氳繃',
+ label: '瀹℃牳',
type: 'link',
icon: ACTION_ICON.AUDIT,
- auth: ['mes:pd-tech-confirm:update'],
- ifShow: row.status === 1,
- onClick: handleStatus.bind(null, row, 2),
+ auth: ['mes:pd-tech-confirm:audit'],
+ // 浠呫�屽緟瀹℃牳 + 褰撳墠鐧诲綍鐢ㄦ埛鍦ㄥ鎵归厤缃殑瀹℃牳浜哄悕鍗曞唴銆嶆墠鏄剧ず
+ ifShow: canAudit(row),
+ onClick: handleAudit.bind(null, row, true),
+ },
+ {
+ label: '瀹℃牳涓嶉�氳繃',
+ type: 'link',
+ danger: true,
+ auth: ['mes:pd-tech-confirm:audit'],
+ // 鍚屼笂锛屼笌銆屽鏍搞�嶆垚瀵瑰嚭鐜�
+ ifShow: canAudit(row),
+ onClick: handleAudit.bind(null, row, false),
},
{
label: '瀹㈡埛纭',
type: 'link',
icon: ACTION_ICON.AUDIT,
auth: ['mes:pd-tech-confirm:update'],
- ifShow: row.status === 2,
- onClick: handleStatus.bind(null, row, 3),
+ ifShow: row.status === MesPdTechConfirmStatusEnum.AUDITED,
+ onClick: handleCustomerConfirm.bind(null, row),
},
{
label: $t('common.edit'),
type: 'link',
icon: ACTION_ICON.EDIT,
auth: ['mes:pd-tech-confirm:update'],
+ // 浠呰崏绋夸笌瀹℃牳涓嶉�氳繃鍙慨鏀癸紝鍏朵綑鐘舵�佸崟鎹凡閿佸畾
+ ifShow:
+ row.status === MesPdTechConfirmStatusEnum.DRAFT ||
+ row.status === MesPdTechConfirmStatusEnum.REJECTED,
onClick: handleEdit.bind(null, row),
},
{
@@ -178,6 +264,10 @@
danger: true,
icon: ACTION_ICON.DELETE,
auth: ['mes:pd-tech-confirm:delete'],
+ // 浠呰崏绋夸笌瀹℃牳涓嶉�氳繃鍙垹闄�
+ ifShow:
+ row.status === MesPdTechConfirmStatusEnum.DRAFT ||
+ row.status === MesPdTechConfirmStatusEnum.REJECTED,
popConfirm: {
title: $t('ui.actionMessage.deleteConfirm', [row.confirmNo ?? '']),
confirm: handleDelete.bind(null, row),
--
Gitblit v1.9.3