diff --git a/frontend/src/pages/approval/detail.tsx b/frontend/src/pages/approval/detail.tsx
index 4d603fb..dce2be4 100644
--- a/frontend/src/pages/approval/detail.tsx
+++ b/frontend/src/pages/approval/detail.tsx
@@ -244,12 +244,36 @@ export default function ApprovalDetail() {
approver: '审批人',
and_approve: '会签',
or_approve: '或签',
- notify: '通知',
- single_approve: '单人审批',
+ notify: '抄送人',
+ single_approve: '审批人',
}
return typeMap[nodeType] || nodeType
}
+ // 获取节点的审批人姓名
+ const getNodeApproversNames = (nodeId: number, nodeType: string): string => {
+ // 从审批记录中获取已审批的审批人姓名
+ const approverRecords = detail.records.filter(r => r.node_id === nodeId && r.action !== 'submit')
+ if (approverRecords.length > 0) {
+ return approverRecords.map(r => r.approver?.name).join('、')
+ }
+
+ // 对于通知节点,显示节点名称
+ if (nodeType === 'notify') {
+ return '待通知'
+ }
+
+ // 未审批的节点,显示节点名称
+ return '待审批'
+ }
+
+ // 获取节点显示名称(格式:审批人-姓名 或 抄送人-姓名)
+ const getNodeDisplayName = (node: any): string => {
+ const typeLabel = getNodeTypeName(node.type)
+ const approversNames = getNodeApproversNames(node.id, node.type)
+ return `${typeLabel}-${approversNames}`
+ }
+
// 获取当前审批人
const getCurrentApprovers = () => {
const currentNodeIds = detail.current_nodes || []
@@ -260,7 +284,8 @@ export default function ApprovalDetail() {
const node = nodes.find((n) => n.id === nodeId)
if (node) {
approvers.push({
- name: node.name,
+ nodeId: node.id,
+ nodeType: node.type,
type: getNodeTypeName(node.type),
approvers: node.approvers,
})
@@ -313,8 +338,7 @@ export default function ApprovalDetail() {