From 7fef9ad2195d4b2a399f794221a6fca1b82424d3 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期三, 16 九月 2026 16:53:12 +0800
Subject: [PATCH] refactor(aftersales): 故障赔付/服务补偿单审核改为审批配置状态机
---
/dev/null | 78 -----------
src/views/aftersales/compensation/index.vue | 104 ++++++++------
src/views/aftersales/compensation/modules/audit-modal.vue | 156 +++++++++++----------
src/api/aftersales/compensation.ts | 52 ++++---
4 files changed, 172 insertions(+), 218 deletions(-)
diff --git a/src/api/aftersales/compensation.ts b/src/api/aftersales/compensation.ts
index 4522bd7..329f1e9 100644
--- a/src/api/aftersales/compensation.ts
+++ b/src/api/aftersales/compensation.ts
@@ -17,20 +17,13 @@
reason?: string; // 璧斾粯鍘熷洜
auditStatus?: number; // 瀹℃壒鐘舵�侊細0鏈彁浜� 10瀹℃壒涓� 20瀹℃牳閫氳繃 30瀹℃牳涓嶉�氳繃 40宸插彇娑�
auditStatusName?: string; // 瀹℃壒鐘舵�佸悕绉�
- processInstanceId?: string; // 瀹℃壒娴佺▼瀹炰緥缂栧彿
- auditUserId?: number; // 瀹℃牳浜�
- auditTime?: string; // 瀹℃牳鏃堕棿
- auditRemark?: string; // 瀹℃牳澶囨敞
+ reviewerId?: number; // 瀹℃牳浜虹敤鎴风紪鍙�
+ reviewerName?: string; // 瀹℃牳浜哄鍚�
+ reviewTime?: string; // 瀹℃牳鏃堕棿
+ reviewRemark?: string; // 瀹℃牳鎰忚锛堜笉閫氳繃鏃跺嵆涓嶉�氳繃鍘熷洜锛�
payStatus?: number; // 鏀粯鐘舵�侊紙璐﹀姟鑱斿姩棰勭暀锛�
remark?: string; // 澶囨敞
createTime?: string;
- }
-
- /** 瀹℃壒鍙傛暟 */
- export interface AuditReq {
- id: number;
- auditStatus: number; // 20閫氳繃 30椹冲洖
- remark?: string;
}
}
@@ -66,21 +59,36 @@
);
}
-/** 鎻愪氦璧斾粯/鏈嶅姟琛ュ伩鍗曞鎵� */
-export function submitCompensation(id: number, processDefinitionKey: string) {
+/**
+ * 鎻愪氦璧斾粯/鏈嶅姟琛ュ伩鍗曞鎵癸紙鏈彁浜�/瀹℃牳涓嶉�氳繃 鈫� 瀹℃壒涓級
+ * 瀹℃壒浜虹敱銆岀郴缁熺鐞� - 瀹℃壒閰嶇疆銆嶇粺涓�閰嶇疆锛屾彁浜ゆ椂鏃犻渶鎸囧畾銆�
+ */
+export function submitCompensation(id: number) {
return requestClient.put<boolean>('/aftersales/compensation/submit', null, {
- params: { id, processDefinitionKey },
+ params: { id },
});
}
-/** 瀹℃壒璧斾粯/鏈嶅姟琛ュ伩鍗� */
-export function auditCompensation(data: AfterSaleCompensationApi.AuditReq) {
- return requestClient.put<boolean>('/aftersales/compensation/audit', data);
+/** 鑾峰緱瀹℃壒浜虹紪鍙烽泦鍚堬紝渚涘垪琛ㄩ〉鍒ゆ柇鏄惁灞曠ず瀹℃牳鎸夐挳 */
+export function getCompensationApproverIds() {
+ return requestClient.get<number[]>('/aftersales/compensation/approver-ids');
}
-/** 鑾峰彇璧斾粯/鏈嶅姟琛ュ伩鍗曞鎵规祦绋嬪畾涔夊垪琛� */
-export function getApproveProcessList() {
- return requestClient.get<{ id: string; name: string; version: number; key: string }[]>(
- '/aftersales/compensation/approve-process-list',
- );
+/**
+ * 瀹℃牳璧斾粯/鏈嶅姟琛ュ伩鍗曪紙瀹℃壒涓� 鈫� 瀹℃牳閫氳繃 / 瀹℃牳涓嶉�氳繃锛�
+ *
+ * @param id 璧斾粯鍗曠紪鍙�
+ * @param pass true=瀹℃牳閫氳繃 / false=瀹℃牳涓嶉�氳繃
+ * @param reviewRemark 瀹℃牳鎰忚锛宲ass=false 鏃跺繀濉�
+ */
+export function auditCompensation(
+ id: number,
+ pass: boolean,
+ reviewRemark?: string,
+) {
+ return requestClient.put<boolean>('/aftersales/compensation/audit', {
+ id,
+ pass,
+ reviewRemark,
+ });
}
diff --git a/src/views/aftersales/compensation/index.vue b/src/views/aftersales/compensation/index.vue
index d540693..4e0e9ee 100644
--- a/src/views/aftersales/compensation/index.vue
+++ b/src/views/aftersales/compensation/index.vue
@@ -3,38 +3,54 @@
import type { AfterSaleCompensationApi } from '#/api/aftersales/compensation';
import { ref } from 'vue';
-import { useRouter } from 'vue-router';
import { Page, useVbenModal } from '@vben/common-ui';
-import { isEmpty } from '@vben/utils';
+import { useUserStore } from '@vben/stores';
import { message, Tag } from 'ant-design-vue';
import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
import {
deleteCompensation,
- getApproveProcessList,
+ getCompensationApproverIds,
getCompensationPage,
+ submitCompensation,
} from '#/api/aftersales/compensation';
import { $t } from '#/locales';
import { AUDIT_STATUS, 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';
/** 鍞悗璧斾粯/鏈嶅姟琛ュ伩鍗曞垪琛� */
defineOptions({ name: 'AfterSaleCompensation' });
-const router = useRouter();
+const userStore = useUserStore();
+const currentUserId = userStore.userInfo?.id; // 褰撳墠鐧诲綍鐢ㄦ埛 ID锛岀敤浜庡鎵逛汉鏉冮檺鍒ゆ柇
+
+/** 瀹℃壒閰嶇疆涓涓氬姟鐨勫鎵逛汉缂栧彿闆嗗悎锛屽喅瀹氥�屽鏍� / 瀹℃牳涓嶉�氳繃銆嶆寜閽槸鍚﹀睍绀� */
+const approverIds = ref<number[]>([]);
+
+/** 鎷夊彇瀹℃壒浜洪泦鍚堬紱澶辫触鏃朵繚鎸佷负绌猴紙鎸夐挳涓嶅睍绀猴級锛屼笉闃绘柇鍒楄〃鍔犺浇 */
+async function loadApproverIds() {
+ try {
+ approverIds.value = (await getCompensationApproverIds()) ?? [];
+ } catch {
+ approverIds.value = [];
+ }
+}
+
+/** 褰撳墠鐧诲綍鐢ㄦ埛鏄惁涓鸿涓氬姟鐨勫鎵逛汉锛屼笖璧斾粯鍗曞浜庡鎵逛腑锛�10锛� */
+function canAudit(row: AfterSaleCompensationApi.Compensation) {
+ return (
+ row.auditStatus === AUDIT_STATUS.PROCESS &&
+ !!currentUserId &&
+ approverIds.value.includes(currentUserId)
+ );
+}
const [FormModal, formModalApi] = useVbenModal({
connectedComponent: Form,
- destroyOnClose: true,
-});
-
-const [ProcessModal, processModalApi] = useVbenModal({
- connectedComponent: ProcessSelectModal,
destroyOnClose: true,
});
@@ -43,8 +59,10 @@
destroyOnClose: true,
});
+/** 鍒锋柊琛ㄦ牸涓庡鎵逛汉闆嗗悎 */
function handleRefresh() {
gridApi.query();
+ loadApproverIds();
}
function handleCreate() {
@@ -73,40 +91,24 @@
}
}
-/** 鎻愪氦瀹℃壒 - 鍏堣幏鍙栨祦绋嬪垪琛� */
+/** 鎻愪氦瀹℃壒 - 瀹℃壒浜虹敱銆岀郴缁熺鐞� - 瀹℃壒閰嶇疆銆嶇粺涓�鎸囧畾锛屾澶勬棤闇�閫夋嫨 */
async function handleSubmit(row: AfterSaleCompensationApi.Compensation) {
const hideLoading = message.loading({
- content: '鑾峰彇瀹℃壒娴佺▼...',
+ content: '姝ｅ湪鎻愪氦瀹℃壒...',
duration: 0,
});
try {
- const processList = await getApproveProcessList();
- hideLoading();
- if (!processList || processList.length === 0) {
- message.warning('鏆傛棤鍙敤瀹℃壒娴佺▼锛岃鍏堥厤缃� BPM 娴佺▼');
- return;
- }
- processModalApi.setData({ id: row.id, processList }).open();
- } catch {
+ await submitCompensation(row.id!);
+ message.success('鎻愪氦瀹℃壒鎴愬姛');
+ handleRefresh();
+ } finally {
hideLoading();
}
}
-/** 瀹℃壒锛堥�氳繃/椹冲洖锛� */
-function handleAudit(row: AfterSaleCompensationApi.Compensation) {
- auditModalApi.setData({ id: row.id }).open();
-}
-
-/** 鏌ョ湅瀹℃壒璇︽儏 */
-function handleViewProcess(row: AfterSaleCompensationApi.Compensation) {
- if (!row.processInstanceId) {
- message.warning('璇ュ崟鎹皻鏈彁浜ゅ鎵�');
- return;
- }
- router.push({
- name: 'BpmProcessInstanceDetail',
- query: { id: row.processInstanceId },
- });
+/** 瀹℃牳 - 閫氳繃 / 涓嶉�氳繃 */
+function handleAudit(row: AfterSaleCompensationApi.Compensation, pass: boolean) {
+ auditModalApi.setData({ pass, row }).open();
}
const checkedIds = ref<number[]>([]);
@@ -151,12 +153,14 @@
checkboxChange: handleRowCheckboxChange,
},
});
+
+// 杩涘叆椤甸潰鍗虫媺鍙栧鎵逛汉闆嗗悎锛岀敤浜庡垽鏂�屽鏍搞�嶆寜閽槸鍚﹀睍绀�
+loadApproverIds();
</script>
<template>
<Page auto-content-height>
<FormModal @success="handleRefresh" />
- <ProcessModal @success="handleRefresh" />
<AuditFormModal @success="handleRefresh" />
<Grid table-title="璧斾粯/鏈嶅姟琛ュ伩鍗曞垪琛�">
<template #toolbar-tools>
@@ -204,21 +208,33 @@
label: '鎻愪氦瀹℃壒',
type: 'link',
auth: ['aftersales:compensation:submit'],
- ifShow: row.auditStatus === AUDIT_STATUS.DRAFT || row.auditStatus === AUDIT_STATUS.REJECT,
- onClick: handleSubmit.bind(null, row),
+ // 瀹℃壒浜虹敱瀹℃壒閰嶇疆缁熶竴鎸囧畾锛屾彁浜ゅ墠浠呬簩娆＄‘璁わ紝涓嶅啀寮归�夋祦绋嬫
+ popConfirm: {
+ title: '纭鎻愪氦瀹℃壒锛熸彁浜ゅ悗鐢卞鎵归厤缃腑鎸囧畾鐨勫鎵逛汉澶勭悊銆�',
+ confirm: handleSubmit.bind(null, row),
+ },
+ // 鏈彁浜�(0) 涓� 瀹℃牳涓嶉�氳繃(30) 鍧囧彲鎻愪氦锛屽悗鑰呴渶淇敼鍚庨噸鏂版彁浜�
+ ifShow:
+ row.auditStatus === AUDIT_STATUS.DRAFT ||
+ row.auditStatus === AUDIT_STATUS.REJECT,
},
{
- label: '瀹℃壒',
+ label: '瀹℃牳',
type: 'link',
+ icon: ACTION_ICON.AUDIT,
auth: ['aftersales:compensation:audit'],
- ifShow: row.auditStatus === AUDIT_STATUS.PROCESS,
- onClick: handleAudit.bind(null, row),
+ // 浠呫�屽鎵逛腑 + 褰撳墠鐧诲綍鐢ㄦ埛鍦ㄥ鎵归厤缃殑瀹℃壒浜哄悕鍗曞唴銆嶆墠鏄剧ず
+ ifShow: canAudit(row),
+ onClick: handleAudit.bind(null, row, true),
},
{
- label: '鏌ョ湅瀹℃壒',
+ label: '瀹℃牳涓嶉�氳繃',
type: 'link',
- ifShow: row.auditStatus !== AUDIT_STATUS.DRAFT && !!row.processInstanceId,
- onClick: handleViewProcess.bind(null, row),
+ danger: true,
+ auth: ['aftersales:compensation:audit'],
+ // 鍚屼笂锛屼笌銆屽鏍搞�嶆垚瀵瑰嚭鐜�
+ ifShow: canAudit(row),
+ onClick: handleAudit.bind(null, row, false),
},
{
label: $t('common.delete'),
diff --git a/src/views/aftersales/compensation/modules/audit-modal.vue b/src/views/aftersales/compensation/modules/audit-modal.vue
index 6b8e5ad..5010a98 100644
--- a/src/views/aftersales/compensation/modules/audit-modal.vue
+++ b/src/views/aftersales/compensation/modules/audit-modal.vue
@@ -1,91 +1,99 @@
<script lang="ts" setup>
-import { ref } from 'vue';
+ import type { VbenFormSchema } from '#/adapter/form';
+ import type { AfterSaleCompensationApi } from '#/api/aftersales/compensation';
-import { useVbenModal } from '@vben/common-ui';
+ import { computed, ref } from 'vue';
-import { message } from 'ant-design-vue';
+ import { useVbenModal } from '@vben/common-ui';
-import { useVbenForm } from '#/adapter/form';
-import { auditCompensation } from '#/api/aftersales/compensation';
+ import { message } from 'ant-design-vue';
-const emit = defineEmits(['success']);
+ import { useVbenForm } from '#/adapter/form';
+ import { auditCompensation } from '#/api/aftersales/compensation';
-const compensationId = ref<number>();
+ const emit = defineEmits(['success']);
-const [Form, formApi] = useVbenForm({
- commonConfig: {
- componentProps: {
- class: 'w-full',
- },
- labelWidth: 100,
- },
- wrapperClass: 'grid-cols-1',
- layout: 'vertical',
- schema: [
- {
- fieldName: 'auditStatus',
- label: '瀹℃壒缁撴灉',
- component: 'RadioGroup',
+ const pass = ref(true); // true=瀹℃牳閫氳繃 / false=瀹℃牳涓嶉�氳繃
+ const rowData = ref<AfterSaleCompensationApi.Compensation>();
+ const getTitle = computed(() => (pass.value ? '瀹℃牳閫氳繃' : '瀹℃牳涓嶉�氳繃'));
+
+ const [Form, formApi] = useVbenForm({
+ commonConfig: {
componentProps: {
- options: [
- { label: '閫氳繃', value: 20 },
- { label: '椹冲洖', value: 30 },
- ],
+ class: 'w-full',
},
- rules: 'selectRequired',
+ formItemClass: 'col-span-1',
+ labelWidth: 90,
},
- {
- fieldName: 'remark',
- label: '瀹℃壒澶囨敞',
- component: 'Textarea',
- componentProps: {
- placeholder: '璇疯緭鍏ュ鎵瑰娉�',
- rows: 3,
- },
- },
- ],
- showDefaultActions: false,
-});
+ wrapperClass: 'grid-cols-1',
+ layout: 'horizontal',
+ schema: [],
+ showDefaultActions: false,
+ });
-const [Modal, modalApi] = useVbenModal({
- async onConfirm() {
- const { valid } = await formApi.validate();
- if (!valid) {
- return;
- }
- modalApi.lock();
- try {
- const values = await formApi.getValues<{
- auditStatus: number;
- remark?: string;
+ /** 瀹℃牳琛ㄥ崟瀛楁锛氫笉閫氳繃鏃跺繀椤诲～鍐欏師鍥� */
+ function useAuditSchema(): VbenFormSchema[] {
+ return [
+ {
+ fieldName: 'reviewRemark',
+ label: '瀹℃牳鎰忚',
+ component: 'Textarea',
+ formItemClass: 'col-span-1',
+ componentProps: {
+ rows: 3,
+ placeholder: pass.value
+ ? '璇疯緭鍏ュ鏍告剰瑙侊紙鍙�夛級'
+ : '璇疯緭鍏ヤ笉閫氳繃鍘熷洜锛堝繀濉級',
+ },
+ rules: pass.value ? '' : 'required',
+ },
+ ];
+ }
+
+ const [Modal, modalApi] = useVbenModal({
+ async onConfirm() {
+ const { valid } = await formApi.validate();
+ if (!valid) {
+ return;
+ }
+ modalApi.lock();
+ const values = await formApi.getValues();
+ try {
+ await auditCompensation(
+ rowData.value!.id!,
+ pass.value,
+ values.reviewRemark,
+ );
+ await modalApi.close();
+ emit('success');
+ message.success(pass.value ? '瀹℃牳閫氳繃' : '宸查��鍥烇紝鍙慨鏀瑰悗閲嶆柊鎻愪氦');
+ } finally {
+ modalApi.unlock();
+ }
+ },
+ async onOpenChange(isOpen: boolean) {
+ if (!isOpen) {
+ rowData.value = undefined;
+ return;
+ }
+ const data = modalApi.getData<{
+ pass: boolean;
+ row: AfterSaleCompensationApi.Compensation;
}>();
- await auditCompensation({
- id: compensationId.value!,
- auditStatus: values.auditStatus,
- remark: values.remark,
- });
- await modalApi.close();
- emit('success');
- message.success('瀹℃壒瀹屾垚');
- } finally {
- modalApi.unlock();
- }
- },
- async onOpenChange(isOpen: boolean) {
- if (!isOpen) {
- compensationId.value = undefined;
- await formApi.resetForm();
- return;
- }
- const data = modalApi.getData<{ id: number }>();
- compensationId.value = data?.id;
- await formApi.setValues({ auditStatus: 20 });
- },
-});
+ rowData.value = data.row;
+ pass.value = data.pass;
+ formApi.setState({ schema: useAuditSchema() });
+ formApi.resetForm();
+ },
+ });
</script>
<template>
- <Modal title="瀹℃壒璧斾粯/鏈嶅姟琛ュ伩鍗�" class="w-1/3">
- <Form class="mx-3" />
+ <Modal :title="getTitle" class="w-2/5">
+ <div v-if="rowData" class="mx-4 mb-4 text-sm text-gray-600">
+ <div>璧斾粯鍗曞彿锛歿{ rowData.compensationNo }}</div>
+ <div>璧斾粯閲戦锛歿{ rowData.amount }}</div>
+ </div>
+ <Form class="mx-4" />
</Modal>
</template>
diff --git a/src/views/aftersales/compensation/modules/process-select-modal.vue b/src/views/aftersales/compensation/modules/process-select-modal.vue
deleted file mode 100644
index 9ec118e..0000000
--- a/src/views/aftersales/compensation/modules/process-select-modal.vue
+++ /dev/null
@@ -1,78 +0,0 @@
-<script lang="ts" setup>
-import { computed, ref } from 'vue';
-
-import { useVbenModal } from '@vben/common-ui';
-
-import { message, Select } from 'ant-design-vue';
-
-import { submitCompensation } from '#/api/aftersales/compensation';
-
-interface ProcessDefinition {
- id: string;
- name: string;
- version: number;
- key: string;
-}
-
-const emit = defineEmits(['success']);
-
-const compensationId = ref<number>();
-const processList = ref<ProcessDefinition[]>([]);
-const selectedProcessKey = ref<string>('');
-
-const processOptions = computed(() => {
- return processList.value.map((p) => ({
- label: `${p.name} (V${p.version})`,
- value: p.key,
- }));
-});
-
-const [Modal, modalApi] = useVbenModal({
- async onConfirm() {
- if (!selectedProcessKey.value) {
- message.warning('璇烽�夋嫨瀹℃壒娴佺▼');
- return;
- }
- modalApi.lock();
- try {
- await submitCompensation(compensationId.value!, selectedProcessKey.value);
- await modalApi.close();
- emit('success');
- message.success('鎻愪氦鎴愬姛');
- } finally {
- modalApi.unlock();
- }
- },
- async onOpenChange(isOpen: boolean) {
- if (!isOpen) {
- compensationId.value = undefined;
- selectedProcessKey.value = '';
- processList.value = [];
- return;
- }
- const data = modalApi.getData<{ id: number; processList: ProcessDefinition[] }>();
- if (!data) {
- return;
- }
- compensationId.value = data.id;
- processList.value = data.processList || [];
- if (processList.value.length > 0) {
- selectedProcessKey.value = processList.value[0]?.key ?? '';
- }
- },
-});
-</script>
-
-<template>
- <Modal title="閫夋嫨瀹℃壒娴佺▼" class="w-1/3">
- <div class="mb-4">
- <span class="mr-2">瀹℃壒娴佺▼锛�</span>
- <Select
- v-model:value="selectedProcessKey"
- :options="processOptions"
- style="width: 200px"
- placeholder="璇烽�夋嫨瀹℃壒娴佺▼"
- />
- </div>
- </Modal>
-</template>
--
Gitblit v1.9.3