From 9646ba4b026e4dbee0c0d5ac3d52b428bfef7b29 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 28 八月 2026 10:49:44 +0800
Subject: [PATCH] 新疆-新聚 1.销售台账中的销售合同按框架合同处理 2.设备台账需按车间/区域汇总设备,车间/位置可自行新增,且支持子父级递归 3.计量器具台账支持通过 Excel 文件批量新增数据 4.设备保养定时任务新增“年度保养”任务频率
---
src/views/officeProcessAutomation/ReimburseManage/shared/finReimbursementDetailExtras.js | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/views/officeProcessAutomation/ReimburseManage/shared/finReimbursementDetailExtras.js b/src/views/officeProcessAutomation/ReimburseManage/shared/finReimbursementDetailExtras.js
index dd9a1ac..c72633b 100644
--- a/src/views/officeProcessAutomation/ReimburseManage/shared/finReimbursementDetailExtras.js
+++ b/src/views/officeProcessAutomation/ReimburseManage/shared/finReimbursementDetailExtras.js
@@ -127,10 +127,17 @@
const approvalRecords = tasks.length
? mapTasksToApprovalRecords(tasks)
: mapRecordsFromApi(source.records || source.approvalRecords);
- const approvalFlowNodes = tasks.length
+ /** 琛ㄥ崟缂栬緫鍥炴樉锛氫繚鐣� nodes 鏄犲皠锛堝惈 approverId锛夛紝鍕跨敤 tasks 瑕嗙洊 */
+ const approvalFlowNodes = Array.isArray(mapped.approvalFlowNodes)
+ ? mapped.approvalFlowNodes
+ : [];
+ /** 璇︽儏/杩涘害鏉″睍绀猴細鏈� tasks 鏃剁敤浠诲姟鐘舵�佽妭鐐� */
+ const approvalFlowProgressNodes = tasks.length
? mapTasksToApprovalFlowNodes(tasks)
- : mapped.approvalFlowNodes || [];
- const currentNodeIndex = computeApprovalFlowCurrentIndex(approvalFlowNodes);
+ : approvalFlowNodes;
+ const currentNodeIndex = computeApprovalFlowCurrentIndex(
+ approvalFlowProgressNodes.length ? approvalFlowProgressNodes : approvalFlowNodes
+ );
const rejectReason =
approvalRecords.find(r => r.result === "rejected")?.opinion ||
source.rejectReason ||
@@ -145,6 +152,7 @@
approvalRecords,
records: tasks.length ? tasks : source.records,
approvalFlowNodes,
+ approvalFlowProgressNodes,
currentNodeIndex,
rejectReason,
flowNodes: tasks.length ? mapTasksToFlowNodes(tasks) : mapped.flowNodes,
--
Gitblit v1.9.3