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/wls/stocktaking/task/index.vue | 130 +++++++++++++++++++++++++++++-------------
1 files changed, 89 insertions(+), 41 deletions(-)
diff --git a/src/views/wls/stocktaking/task/index.vue b/src/views/wls/stocktaking/task/index.vue
index 30c46cc..d770142 100644
--- a/src/views/wls/stocktaking/task/index.vue
+++ b/src/views/wls/stocktaking/task/index.vue
@@ -3,10 +3,10 @@
import type { MesWmStockTakingTaskApi } from '#/api/mes/wm/stocktaking/task';
import { ref } from 'vue';
-import { useRouter } from 'vue-router';
import { Page, useVbenModal } from '@vben/common-ui';
import { MesWmStockTakingTaskStatusEnum } from '@vben/constants';
+import { useUserStore } from '@vben/stores';
import { downloadFileFromBlobPart } from '@vben/utils';
import { Button, message } from 'ant-design-vue';
@@ -16,7 +16,7 @@
cancelStockTaking,
deleteStockTaking,
exportStockTaking,
- getStockTakingApproveProcessList,
+ getStockTakingApproverIds,
getStockTakingPage,
submitStockTakingApproval,
} from '#/api/mes/wm/stocktaking/task';
@@ -26,25 +26,70 @@
} from '#/api/wls/stocktaking/task/line';
import { $t } from '#/locales';
-import ProcessSelectModal from '#/views/wls/components/process-select-modal.vue';
import { useGridColumns, useGridFormSchema } from './data';
+import AuditModal from './modules/audit-modal.vue';
import Form from './modules/form.vue';
-const router = useRouter();
+const userStore = useUserStore();
+const currentUserId = userStore.userInfo?.id; // 褰撳墠鐧诲綍鐢ㄦ埛 ID锛岀敤浜庡鏍镐汉鏉冮檺鍒ゆ柇
+
+/** 瀹℃壒閰嶇疆涓涓氬姟鐨勫鏍镐汉缂栧彿闆嗗悎锛屽喅瀹氥�屽鏍� / 瀹℃牳涓嶉�氳繃銆嶆寜閽槸鍚﹀睍绀� */
+const approverIds = ref<number[]>([]);
+
+/** 鎷夊彇瀹℃牳浜洪泦鍚堬紱澶辫触鏃朵繚鎸佷负绌猴紙鎸夐挳涓嶅睍绀猴級锛屼笉闃绘柇鍒楄〃鍔犺浇 */
+async function loadApproverIds() {
+ try {
+ approverIds.value = (await getStockTakingApproverIds()) ?? [];
+ } catch {
+ approverIds.value = [];
+ }
+}
+
+/**
+ * 鏈疆鐩樼偣缁撴灉瀹℃壒鏄惁宸叉彁浜ゃ�佹鍦ㄧ瓑寰呭鏍�
+ *
+ * 浠诲姟鐘舵�併�岀洏鐐逛腑銆嶅悓鏃舵壙杞界洏鐐逛腑涓庣粨鏋滃鎵逛腑涓や釜闃舵锛�
+ * reviewTime 闈炵┖涓� reviewerId 涓虹┖琛ㄧず缁撴灉宸叉彁浜ゃ�佺瓑寰呭鏍革紱
+ * 瀹℃牳涓嶉�氳繃鍚� reviewerId 闈炵┖锛屼换鍔″洖鍒板彲閲嶆柊鎻愪氦缁撴灉瀹℃壒鐨勭姸鎬併��
+ */
+function isResultApprovalPending(row: MesWmStockTakingTaskApi.StockTakingTask) {
+ return !row.reviewerId && !!row.reviewTime;
+}
+
+/** 褰撳墠鐧诲綍鐢ㄦ埛鏄惁涓鸿涓氬姟鐨勫鏍镐汉锛屼笖缁撴灉瀹℃壒宸叉彁浜ょ瓑寰呭鏍� */
+function canAudit(row: MesWmStockTakingTaskApi.StockTakingTask) {
+ return (
+ row.status === MesWmStockTakingTaskStatusEnum.APPROVING &&
+ isResultApprovalPending(row) &&
+ !!currentUserId &&
+ approverIds.value.includes(currentUserId)
+ );
+}
+
+/** 鏄惁鍙彁浜ょ粨鏋滃鎵癸細鐩樼偣涓笖鏈疆缁撴灉瀹℃壒灏氭湭鎻愪氦 */
+function canSubmitApproval(
+ row: MesWmStockTakingTaskApi.StockTakingTask,
+) {
+ return (
+ row.status === MesWmStockTakingTaskStatusEnum.APPROVING &&
+ !isResultApprovalPending(row)
+ );
+}
const [FormModal, formModalApi] = useVbenModal({
connectedComponent: Form,
destroyOnClose: true,
});
-const [ProcessModal, processModalApi] = useVbenModal({
- connectedComponent: ProcessSelectModal,
+const [AuditModalComp, auditModalApi] = useVbenModal({
+ connectedComponent: AuditModal,
destroyOnClose: true,
});
-/** 鍒锋柊琛ㄦ牸 */
+/** 鍒锋柊琛ㄦ牸涓庡鏍镐汉闆嗗悎 */
function handleRefresh() {
gridApi.query();
+ loadApproverIds();
}
/** 鍒涘缓鐩樼偣浠诲姟 */
@@ -67,41 +112,24 @@
formModalApi.setData({ formType: 'submit', id: row.id }).open();
}
-/** 鎻愪氦缁撴灉瀹℃壒 - 鍏堣幏鍙栨祦绋嬪垪琛� */
+/** 鎻愪氦缁撴灉瀹℃壒 - 瀹℃牳浜虹敱銆岀郴缁熺鐞� - 瀹℃壒閰嶇疆銆嶇粺涓�鎸囧畾锛屾澶勬棤闇�閫夋嫨 */
async function handleSubmitApproval(row: MesWmStockTakingTaskApi.StockTakingTask) {
const hideLoading = message.loading({
- content: '鑾峰彇瀹℃壒娴佺▼...',
+ content: '姝ｅ湪鎻愪氦缁撴灉瀹℃壒...',
duration: 0,
});
try {
- const processList = await getStockTakingApproveProcessList();
- hideLoading();
- if (!processList || processList.length === 0) {
- message.warning('鏆傛棤鍙敤瀹℃壒娴佺▼锛岃鍏堥厤缃� BPM 娴佺▼');
- return;
- }
- processModalApi
- .setData({
- id: row.id,
- processList,
- submitFn: submitStockTakingApproval,
- })
- .open();
- } catch {
+ await submitStockTakingApproval(row.id!);
+ message.success('鎻愪氦缁撴灉瀹℃壒鎴愬姛');
+ handleRefresh();
+ } finally {
hideLoading();
}
}
-/** 鏌ョ湅瀹℃壒璇︽儏 */
-function handleProcessDetail(row: MesWmStockTakingTaskApi.StockTakingTask) {
- if (!row.processInstanceId) {
- message.warning('璇ヤ换鍔″皻鏈彁浜ょ粨鏋滃鎵�');
- return;
- }
- router.push({
- name: 'BpmProcessInstanceDetail',
- query: { id: row.processInstanceId },
- });
+/** 瀹℃牳 - 閫氳繃 / 涓嶉�氳繃 */
+function handleAudit(row: MesWmStockTakingTaskApi.StockTakingTask, pass: boolean) {
+ auditModalApi.setData({ pass, row }).open();
}
/** 鍙栨秷鐩樼偣浠诲姟 */
@@ -198,11 +226,15 @@
});
const StatusEnum = MesWmStockTakingTaskStatusEnum;
+
+// 杩涘叆椤甸潰鍗虫媺鍙栧鏍镐汉闆嗗悎锛岀敤浜庢帶鍒跺鏍告寜閽樉闅�
+loadApproverIds();
</script>
<template>
- <Page auto-content-height><FormModal @success="handleRefresh" />
- <ProcessModal @success="handleRefresh" />
+ <Page auto-content-height>
+ <FormModal @success="handleRefresh" />
+ <AuditModalComp @success="handleRefresh" />
<Grid table-title="鐩樼偣浠诲姟鍒楄〃">
<template #toolbar-tools>
@@ -279,15 +311,31 @@
label: '鎻愪氦缁撴灉瀹℃壒',
type: 'link',
auth: ['mes:wm-stock-taking-task:update'],
- ifShow: row.status === StatusEnum.APPROVING,
- onClick: handleSubmitApproval.bind(null, row),
+ // 鐩樼偣涓笖鏈疆缁撴灉瀹℃壒灏氭湭鎻愪氦鏃舵墠鍙彁浜�
+ ifShow: canSubmitApproval(row),
+ // 瀹℃牳浜虹敱瀹℃壒閰嶇疆缁熶竴鎸囧畾锛屾彁浜ゅ墠浠呬簩娆＄‘璁わ紝涓嶅啀寮归�夋祦绋嬫
+ popConfirm: {
+ title: '纭鎻愪氦缁撴灉瀹℃壒锛熸彁浜ゅ悗鐢卞鎵归厤缃腑鎸囧畾鐨勫鏍镐汉澶勭悊銆�',
+ confirm: handleSubmitApproval.bind(null, row),
+ },
},
{
- label: '鏌ョ湅瀹℃壒',
+ label: '瀹℃牳',
type: 'link',
- auth: ['mes:wm-stock-taking-task:query'],
- ifShow: row.status === StatusEnum.APPROVING,
- onClick: handleProcessDetail.bind(null, row),
+ icon: ACTION_ICON.AUDIT,
+ auth: ['mes:wm-stock-taking-task:audit'],
+ // 浠呫�岀粨鏋滃鎵逛腑 + 褰撳墠鐧诲綍鐢ㄦ埛鍦ㄥ鎵归厤缃殑瀹℃牳浜哄悕鍗曞唴銆嶆墠鏄剧ず
+ ifShow: canAudit(row),
+ onClick: handleAudit.bind(null, row, true),
+ },
+ {
+ label: '瀹℃牳涓嶉�氳繃',
+ type: 'link',
+ danger: true,
+ auth: ['mes:wm-stock-taking-task:audit'],
+ // 鍚屼笂锛屼笌銆屽鏍搞�嶆垚瀵瑰嚭鐜�
+ ifShow: canAudit(row),
+ onClick: handleAudit.bind(null, row, false),
},
{
label: '鍙栨秷',
--
Gitblit v1.9.3