From b186f5b20c4f83773f51786da0cd3e85130540c2 Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期五, 22 五月 2026 16:32:01 +0800
Subject: [PATCH] feat（审批模板）: 增强审批流程编辑器功能，新增只读模式——为 TemplateFlowEditor 添加了只读属性，以在流程不可编辑时防止进行修改。——更新审批模板表单部分，使其能够根据 flowEditable 状态条件性地显示可编辑选项。——优化了用户反馈机制，通过动态消息显示审批流程是否可进行修改。
---
src/views/officeProcessAutomation/ReimburseManage/cost-reimburse/costReimburseUtils.js | 57 ++++++++++++++++++++++++++++++++-------------------------
1 files changed, 32 insertions(+), 25 deletions(-)
diff --git a/src/views/officeProcessAutomation/ReimburseManage/cost-reimburse/costReimburseUtils.js b/src/views/officeProcessAutomation/ReimburseManage/cost-reimburse/costReimburseUtils.js
index 012e4d8..1736b3e 100644
--- a/src/views/officeProcessAutomation/ReimburseManage/cost-reimburse/costReimburseUtils.js
+++ b/src/views/officeProcessAutomation/ReimburseManage/cost-reimburse/costReimburseUtils.js
@@ -107,30 +107,23 @@
}
export function statusLabel(v) {
+ if (v === "draft") return "鑽夌";
if (v === "approved") return "宸查�氳繃";
+ if (v === "paid") return "宸蹭粯娆�";
if (v === "rejected") return "宸查┏鍥�";
+ if (v === "cancelled") return "宸叉挙鍥�";
return "瀹℃牳涓�";
}
export function statusTagType(v) {
- if (v === "approved") return "success";
+ if (v === "draft") return "info";
+ if (v === "approved" || v === "paid") return "success";
if (v === "rejected") return "danger";
+ if (v === "cancelled") return "info";
return "warning";
}
-export function formatApprovalFlowSummary(row) {
- const nodes = row?.approvalFlowNodes || [];
- if (!nodes.length) return "鈥�";
- return nodes
- .map((n, i) => {
- const name = (n.approverName || "").trim() || `鑺傜偣${i + 1}`;
- if (n.nodeStatus === "finish") return `${name}鉁揱;
- if (n.nodeStatus === "error") return `${name}鉁梎;
- if (n.nodeStatus === "process") return `${name}鈥;
- return name;
- })
- .join(" 鈫� ");
-}
+export { formatApprovalFlowSummary } from "../shared/finReimbursementMappers.js";
export function resolveApprovalRoles(amount, expenseCategory) {
const amt = Number(amount) || 0;
@@ -149,18 +142,32 @@
return roles;
}
-export function buildAutoApprovalFlow(amount, expenseCategory) {
+export function buildAutoApprovalFlow(amount, expenseCategory, previousNodes = []) {
const roles = resolveApprovalRoles(amount, expenseCategory);
- return roles.map((role, i) => ({
- approverId: null,
- approverName: APPROVAL_ROLE_LABELS[role] || role,
- roleKey: role,
- sortOrder: i + 1,
- nodeOrder: i + 1,
- nodeStatus: i === 0 ? "process" : "wait",
- approveOpinion: "",
- approveTime: "",
- }));
+ const prevByRole = new Map();
+ (previousNodes || []).forEach((n, idx) => {
+ if (n?.roleKey) prevByRole.set(n.roleKey, n);
+ else if (n?.approverId != null && n.approverId !== "") {
+ prevByRole.set(`__idx_${idx}`, n);
+ }
+ });
+ return roles.map((role, i) => {
+ const prev = prevByRole.get(role) || prevByRole.get(`__idx_${i}`);
+ const hasApprover = prev?.approverId != null && prev.approverId !== "";
+ return {
+ approverId: hasApprover ? prev.approverId : null,
+ approverName: hasApprover
+ ? prev.approverName || ""
+ : APPROVAL_ROLE_LABELS[role] || role,
+ roleKey: role,
+ signMode: prev?.signMode || "countersign",
+ sortOrder: i + 1,
+ nodeOrder: i + 1,
+ nodeStatus: i === 0 ? "process" : "wait",
+ approveOpinion: "",
+ approveTime: "",
+ };
+ });
}
export function getApprovalRuleHint(amount, expenseCategory) {
--
Gitblit v1.9.3