From aeff21aec6b954ce4dbd68513cae3049db0a3a16 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 28 Feb 2026 17:42:27 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=98=BE=E7=A4=BA=E9=BB=98=E8=AE=A4=E6=8A=84?= =?UTF-8?q?=E9=80=81=E4=BA=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改审批流程显示逻辑，从 form_data 获取实际选择的审批人和抄送人 - 之前从 flow.nodes（模板）获取，显示的是默认值 - 现在正确显示用户重新选择的审批人和抄送人列表 注意：数据库节点类型已更新为 and_approve（会签） Co-Authored-By: Claude Opus 4.6 --- frontend/src/pages/approval/detail.tsx | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/frontend/src/pages/approval/detail.tsx b/frontend/src/pages/approval/detail.tsx index 33e0e5d..6218b1b 100644 --- a/frontend/src/pages/approval/detail.tsx +++ b/frontend/src/pages/approval/detail.tsx @@ -610,12 +610,26 @@ export default function ApprovalDetail() { const typeLabel = node.type === 'notify' ? '抄送人' : '审批人' const typeClass = node.type === 'notify' ? styles.typeNotify : styles.typeApprover - // 获取显示名称和审批时间 - let displayName = node.name || '待定' + // 从 form_data 获取实际选择的审批人/抄送人列表 + const formDataApprovers = detail.form_data?.approvers || [] + const formDataCcUsers = detail.form_data?.cc_users || [] + + // 根据节点类型获取显示名称列表 + let displayNames: string[] = [] + if (node.type === 'notify') { + // 抄送节点：显示 form_data 中的抄送人 + displayNames = formDataCcUsers.map((u: any) => typeof u === 'object' ? u.name : u) + } else { + // 审批节点：显示 form_data 中的审批人 + displayNames = formDataApprovers.map((u: any) => typeof u === 'object' ? u.name : u) + } + + // 如果已审批，优先显示已审批的人员名称 + let displayName = displayNames.length > 0 ? displayNames.join('、') : (node.name || '待定') let approvalTime = '' if (hasApproved && records[0]) { - displayName = records[0].approver?.name || displayName + displayName = displayNames.length > 0 ? displayNames.join('、') : (records[0].approver?.name || displayName) approvalTime = formatTime(records[0].created_at) }