修复报销进度审批节点覆盖（07-27-yang-jun-reimbursement-readiness）
这个提交包含在：
@@ -341,16 +341,52 @@ function isoDateTimeOrNull(value) {
|
||||
return value?.toISOString?.() ?? null;
|
||||
}
|
||||
|
||||
function classifyApprovalTask(task, index) {
|
||||
function isOrdinalApprovalLabel(value) {
|
||||
const label = String(value ?? "").trim();
|
||||
if (!label) return true;
|
||||
const ordinal = "(?:\\d+|[一二三四五六七八九十百]+)";
|
||||
return new RegExp(`^(?:第\\s*)?${ordinal}\\s*(?:步|步骤|节点)$`, "i").test(label)
|
||||
|| new RegExp(`^(?:审批)?(?:步骤?|节点|step)\\s*[-_#:：]?\\s*${ordinal}$`, "i").test(label);
|
||||
}
|
||||
|
||||
function resolveApprovalStageLabel(task) {
|
||||
const stepName = String(task?.step_name ?? "").trim();
|
||||
const stepId = String(task?.step_id ?? "").trim();
|
||||
const isTechnicalIdentifier = /^[a-z][a-z0-9]*(?:[_-][a-z0-9]+)+$/i.test(stepName);
|
||||
const isGenericLabel = ["审批", "审核", "复核"].includes(stepName);
|
||||
if (stepName && stepName !== stepId && !isOrdinalApprovalLabel(stepName) && !isTechnicalIdentifier && !isGenericLabel) {
|
||||
return stepName;
|
||||
}
|
||||
|
||||
const role = String(task?.assignee_role ?? "").toLowerCase();
|
||||
const text = `${task?.step_id ?? ""} ${task?.step_name ?? ""}`.toLowerCase();
|
||||
if (["finance", "finance_mgr"].includes(role) || /财务|finance/.test(text)) {
|
||||
return "finance_review";
|
||||
}
|
||||
if (["manager", "ceo"].includes(role) || /主管|经理|manager|ceo/.test(text)) {
|
||||
return "manager_approval";
|
||||
}
|
||||
return index === 0 ? "manager_approval" : index === 1 ? "finance_review" : null;
|
||||
if (role === "manager") return "主管审批";
|
||||
if (["finance", "finance_mgr"].includes(role)) return "财务复核";
|
||||
if (role === "ceo") return "负责人复核";
|
||||
return "审批";
|
||||
}
|
||||
|
||||
function resolveSnapshotApprovalRole(step) {
|
||||
if (step?.assignee_rule?.type === "department_manager") return "manager";
|
||||
if (step?.assignee_rule?.type === "role") return step.assignee_rule.value ?? null;
|
||||
return null;
|
||||
}
|
||||
|
||||
function buildPendingSnapshotApprovalStage(step, index) {
|
||||
return {
|
||||
key: `approval_pending_${index + 1}`,
|
||||
label: resolveApprovalStageLabel({
|
||||
step_id: step?.id,
|
||||
step_name: step?.name,
|
||||
assignee_role: resolveSnapshotApprovalRole(step),
|
||||
}),
|
||||
state: "pending",
|
||||
actorName: null,
|
||||
occurredAt: null,
|
||||
result: null,
|
||||
comment: null,
|
||||
detail: "待处理",
|
||||
targetHref: null,
|
||||
};
|
||||
}
|
||||
|
||||
function buildApprovalProcessingStage(task, fallback) {
|
||||
@@ -436,10 +472,34 @@ function buildProcessingProgress({ reimbursement, workflowInstance, paymentBatch
|
||||
});
|
||||
}
|
||||
|
||||
for (const [index, task] of (workflowInstance?.workflow_tasks ?? []).entries()) {
|
||||
const stageKey = classifyApprovalTask(task, index);
|
||||
if (!stageKey || !stageByKey.has(stageKey)) continue;
|
||||
stageByKey.set(stageKey, buildApprovalProcessingStage(task, stageByKey.get(stageKey)));
|
||||
const approvalStages = [];
|
||||
const workflowTasks = workflowInstance?.workflow_tasks ?? [];
|
||||
for (const [index, task] of workflowTasks.entries()) {
|
||||
const fallback = {
|
||||
key: `approval_${task.id ?? index + 1}`,
|
||||
label: resolveApprovalStageLabel(task),
|
||||
state: "pending",
|
||||
actorName: null,
|
||||
occurredAt: null,
|
||||
result: null,
|
||||
comment: null,
|
||||
detail: "待处理",
|
||||
targetHref: null,
|
||||
};
|
||||
approvalStages.push(buildApprovalProcessingStage(task, fallback));
|
||||
}
|
||||
|
||||
if (workflowInstance) {
|
||||
const snapshotSteps = getWorkflowStepsSnapshot(workflowInstance);
|
||||
const currentStepIndex = snapshotSteps.findIndex((step) => step.id === workflowInstance.current_step_id);
|
||||
const materializedStepIds = new Set(workflowTasks.map((task) => task.step_id).filter(Boolean));
|
||||
const pendingStartIndex = workflowTasks.length === 0 ? 0 : currentStepIndex + 1;
|
||||
for (let index = Math.max(pendingStartIndex, 0); index < snapshotSteps.length; index += 1) {
|
||||
const step = snapshotSteps[index];
|
||||
if (!materializedStepIds.has(step.id)) {
|
||||
approvalStages.push(buildPendingSnapshotApprovalStage(step, index));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const batch = paymentBatchItem?.payment_batch ?? null;
|
||||
@@ -516,7 +576,16 @@ function buildProcessingProgress({ reimbursement, workflowInstance, paymentBatch
|
||||
});
|
||||
}
|
||||
|
||||
return { stages: PROCESSING_STAGE_DEFINITIONS.map(({ key }) => stageByKey.get(key)) };
|
||||
return {
|
||||
stages: [
|
||||
stageByKey.get("submitted"),
|
||||
...(approvalStages.length > 0
|
||||
? approvalStages
|
||||
: [stageByKey.get("manager_approval"), stageByKey.get("finance_review")]),
|
||||
stageByKey.get("payment_batch_review"),
|
||||
stageByKey.get("payment_and_receipt"),
|
||||
],
|
||||
};
|
||||
}
|
||||
|
||||
function ensureApplicantOrAdmin(request, reimbursement) {
|
||||
|
||||
@@ -320,8 +320,8 @@ describe("GET /api/reimbursements/:id detail enhancements", () => {
|
||||
});
|
||||
expect(response.json().data.processingProgress.stages).toEqual([
|
||||
expect.objectContaining({ key: "submitted", state: "completed", actorName: "李四", result: "已提交" }),
|
||||
expect.objectContaining({ key: "manager_approval", state: "completed", actorName: "王经理", result: "通过" }),
|
||||
expect.objectContaining({ key: "finance_review", state: "current", actorName: "财务专员", result: "处理中" }),
|
||||
expect.objectContaining({ key: "approval_manager-task", label: "主管审批", state: "completed", actorName: "王经理", result: "通过" }),
|
||||
expect.objectContaining({ key: "approval_finance-task", label: "财务审批", state: "current", actorName: "财务专员", result: "处理中" }),
|
||||
expect.objectContaining({ key: "payment_batch_review", state: "pending", actorName: null, detail: "待财务创建付款批次" }),
|
||||
expect.objectContaining({ key: "payment_and_receipt", state: "pending", actorName: null }),
|
||||
]);
|
||||
@@ -360,6 +360,243 @@ describe("GET /api/reimbursements/:id detail enhancements", () => {
|
||||
await app.close();
|
||||
});
|
||||
|
||||
it("keeps a third approval task and uses the role label when its configured name is only an ordinal", async () => {
|
||||
const { app } = await buildApp({
|
||||
latestWorkflowInstance: {
|
||||
id: PENDING_INSTANCE_ID,
|
||||
current_step_id: "ceo_approve",
|
||||
current_status: "pending",
|
||||
created_at: new Date("2026-04-10T10:00:00.000Z"),
|
||||
started_at: new Date("2026-04-10T10:00:00.000Z"),
|
||||
context_data: {
|
||||
workflow_steps_snapshot: [
|
||||
{ id: "manager_approve", name: "主管审批" },
|
||||
{ id: "finance_approve", name: "财务复核" },
|
||||
{ id: "ceo_approve", name: "步骤3" },
|
||||
],
|
||||
},
|
||||
workflow_definition: {
|
||||
definition_json: {
|
||||
steps: [
|
||||
{ id: "manager_approve", name: "主管审批" },
|
||||
{ id: "finance_approve", name: "财务复核" },
|
||||
{ id: "ceo_approve", name: "步骤3" },
|
||||
],
|
||||
},
|
||||
},
|
||||
workflow_tasks: [
|
||||
{
|
||||
id: "manager-task",
|
||||
step_id: "manager_approve",
|
||||
step_name: "主管审批",
|
||||
assignee_role: "manager",
|
||||
status: "completed",
|
||||
outcome: "approved",
|
||||
comment: null,
|
||||
created_at: new Date("2026-04-10T10:00:00.000Z"),
|
||||
completed_at: new Date("2026-04-10T11:00:00.000Z"),
|
||||
assignee_employee: { name: "主管" },
|
||||
completer_employee: { name: "主管" },
|
||||
},
|
||||
{
|
||||
id: "finance-task",
|
||||
step_id: "finance_approve",
|
||||
step_name: "财务复核",
|
||||
assignee_role: "finance",
|
||||
status: "completed",
|
||||
outcome: "approved",
|
||||
comment: null,
|
||||
created_at: new Date("2026-04-10T11:00:00.000Z"),
|
||||
completed_at: new Date("2026-04-10T12:00:00.000Z"),
|
||||
assignee_employee: { name: "财务" },
|
||||
completer_employee: { name: "财务" },
|
||||
},
|
||||
{
|
||||
id: "ceo-task",
|
||||
step_id: "ceo_approve",
|
||||
step_name: "步骤3",
|
||||
assignee_role: "ceo",
|
||||
status: "pending",
|
||||
outcome: null,
|
||||
comment: null,
|
||||
created_at: new Date("2026-04-10T12:00:00.000Z"),
|
||||
completed_at: null,
|
||||
assignee_employee: { name: "负责人" },
|
||||
completer_employee: null,
|
||||
},
|
||||
],
|
||||
},
|
||||
});
|
||||
|
||||
const response = await app.inject({
|
||||
method: "GET",
|
||||
url: `/api/reimbursements/${REIMBURSEMENT_ID}`,
|
||||
headers: { authorization: "Bearer test" },
|
||||
});
|
||||
expect(response.statusCode).toBe(200);
|
||||
expect(response.json().data.processingProgress.stages.slice(1, 4)).toEqual([
|
||||
expect.objectContaining({ key: "approval_manager-task", label: "主管审批", state: "completed" }),
|
||||
expect.objectContaining({ key: "approval_finance-task", label: "财务复核", state: "completed" }),
|
||||
expect.objectContaining({ key: "approval_ceo-task", label: "负责人复核", state: "current", actorName: "负责人" }),
|
||||
]);
|
||||
|
||||
await app.close();
|
||||
});
|
||||
|
||||
it("appends future snapshot approvals that do not have workflow tasks yet", async () => {
|
||||
const { app } = await buildApp({
|
||||
latestWorkflowInstance: {
|
||||
id: PENDING_INSTANCE_ID,
|
||||
current_step_id: "manager_approve",
|
||||
current_status: "pending",
|
||||
created_at: new Date("2026-04-10T10:00:00.000Z"),
|
||||
started_at: new Date("2026-04-10T10:00:00.000Z"),
|
||||
context_data: {
|
||||
workflow_steps_snapshot: [
|
||||
{ id: "manager_approve", name: "主管审批", type: "approval", assignee_rule: { type: "department_manager" } },
|
||||
{ id: "finance_approve", name: "财务复核", type: "approval", assignee_rule: { type: "role", value: "finance" } },
|
||||
{ id: "ceo_approve", name: "步骤3", type: "approval", assignee_rule: { type: "role", value: "ceo" } },
|
||||
],
|
||||
},
|
||||
workflow_definition: { definition_json: { steps: [] } },
|
||||
workflow_tasks: [{
|
||||
id: "manager-task",
|
||||
step_id: "manager_approve",
|
||||
step_name: "主管审批",
|
||||
assignee_role: "manager",
|
||||
status: "pending",
|
||||
outcome: null,
|
||||
comment: null,
|
||||
created_at: new Date("2026-04-10T10:00:00.000Z"),
|
||||
completed_at: null,
|
||||
assignee_employee: { name: "主管" },
|
||||
completer_employee: null,
|
||||
}],
|
||||
},
|
||||
});
|
||||
|
||||
const response = await app.inject({
|
||||
method: "GET",
|
||||
url: `/api/reimbursements/${REIMBURSEMENT_ID}`,
|
||||
headers: { authorization: "Bearer test" },
|
||||
});
|
||||
expect(response.statusCode).toBe(200);
|
||||
expect(response.json().data.processingProgress.stages.slice(1, 4)).toEqual([
|
||||
expect.objectContaining({ key: "approval_manager-task", label: "主管审批", state: "current", actorName: "主管" }),
|
||||
expect.objectContaining({ key: "approval_pending_2", label: "财务复核", state: "pending", actorName: null }),
|
||||
expect.objectContaining({ key: "approval_pending_3", label: "负责人复核", state: "pending", actorName: null }),
|
||||
]);
|
||||
|
||||
await app.close();
|
||||
});
|
||||
|
||||
it("keeps multiple tasks with the same role as separate ordered approval stages", async () => {
|
||||
const { app } = await buildApp({
|
||||
latestWorkflowInstance: {
|
||||
id: PENDING_INSTANCE_ID,
|
||||
current_step_id: "finance_final",
|
||||
current_status: "pending",
|
||||
created_at: new Date("2026-04-10T10:00:00.000Z"),
|
||||
started_at: new Date("2026-04-10T10:00:00.000Z"),
|
||||
context_data: {
|
||||
workflow_steps_snapshot: [
|
||||
{ id: "finance_first", name: "财务初审" },
|
||||
{ id: "finance_final", name: "财务终审" },
|
||||
],
|
||||
},
|
||||
workflow_definition: {
|
||||
definition_json: {
|
||||
steps: [
|
||||
{ id: "finance_first", name: "财务初审" },
|
||||
{ id: "finance_final", name: "财务终审" },
|
||||
],
|
||||
},
|
||||
},
|
||||
workflow_tasks: [
|
||||
{
|
||||
id: "finance-first-task",
|
||||
step_id: "finance_first",
|
||||
step_name: "finance_first",
|
||||
assignee_role: "finance",
|
||||
status: "completed",
|
||||
outcome: "approved",
|
||||
comment: "初审通过",
|
||||
created_at: new Date("2026-04-10T10:00:00.000Z"),
|
||||
completed_at: new Date("2026-04-10T11:00:00.000Z"),
|
||||
assignee_employee: { name: "初审人" },
|
||||
completer_employee: { name: "初审人" },
|
||||
},
|
||||
{
|
||||
id: "finance-final-task",
|
||||
step_id: "finance_final",
|
||||
step_name: "财务终审",
|
||||
assignee_role: "finance",
|
||||
status: "pending",
|
||||
outcome: null,
|
||||
comment: null,
|
||||
created_at: new Date("2026-04-10T11:00:00.000Z"),
|
||||
completed_at: null,
|
||||
assignee_employee: { name: "终审人" },
|
||||
completer_employee: null,
|
||||
},
|
||||
],
|
||||
},
|
||||
});
|
||||
|
||||
const response = await app.inject({
|
||||
method: "GET",
|
||||
url: `/api/reimbursements/${REIMBURSEMENT_ID}`,
|
||||
headers: { authorization: "Bearer test" },
|
||||
});
|
||||
expect(response.statusCode).toBe(200);
|
||||
expect(response.json().data.processingProgress.stages.slice(1, 3)).toEqual([
|
||||
expect.objectContaining({ key: "approval_finance-first-task", label: "财务复核", actorName: "初审人", state: "completed" }),
|
||||
expect.objectContaining({ key: "approval_finance-final-task", label: "财务终审", actorName: "终审人", state: "current" }),
|
||||
]);
|
||||
|
||||
await app.close();
|
||||
});
|
||||
|
||||
it("falls back to pending manager and finance placeholders when an instance has no tasks yet", async () => {
|
||||
const { app } = await buildApp({
|
||||
latestWorkflowInstance: {
|
||||
id: PENDING_INSTANCE_ID,
|
||||
current_step_id: null,
|
||||
current_status: "pending",
|
||||
created_at: new Date("2026-04-10T10:00:00.000Z"),
|
||||
started_at: new Date("2026-04-10T10:00:00.000Z"),
|
||||
context_data: {
|
||||
workflow_steps_snapshot: [
|
||||
{ id: "manager_approve", name: "主管审批" },
|
||||
{ id: "finance_approve", name: "财务复核" },
|
||||
],
|
||||
},
|
||||
workflow_definition: {
|
||||
definition_json: {
|
||||
steps: [
|
||||
{ id: "manager_approve", name: "主管审批" },
|
||||
{ id: "finance_approve", name: "财务复核" },
|
||||
],
|
||||
},
|
||||
},
|
||||
workflow_tasks: [],
|
||||
},
|
||||
});
|
||||
|
||||
const response = await app.inject({
|
||||
method: "GET",
|
||||
url: `/api/reimbursements/${REIMBURSEMENT_ID}`,
|
||||
headers: { authorization: "Bearer test" },
|
||||
});
|
||||
expect(response.statusCode).toBe(200);
|
||||
expect(response.json().data.processingProgress.stages.slice(1, 3)).toEqual([
|
||||
expect.objectContaining({ key: "approval_pending_1", label: "主管审批", state: "pending", actorName: null }),
|
||||
expect.objectContaining({ key: "approval_pending_2", label: "财务复核", state: "pending", actorName: null }),
|
||||
]);
|
||||
|
||||
await app.close();
|
||||
});
|
||||
|
||||
it.each([
|
||||
["draft", "current", "pending", "待所在付款批次复核通过"],
|
||||
["reviewed", "completed", "current", "所在付款批次已复核，待执行付款"],
|
||||
|
||||
在新工单中引用
屏蔽一个用户