From d460a2475ccf345d119701f3c631584f747ce2f5 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 15 六月 2026 17:17:25 +0800
Subject: [PATCH] 君歌 1.不需要bom、生产核算 2.新增销售台账后自动生成一个生产订单,然后对订单进行排产 3.生产排产要求可以选择计划时间,时间格式为年月日+时分秒;也要可以多选报工人 4.web和app生产报工中要细分报工开始和报工结束两个操作,根据操作的提交时间记录实际报工时长展示报工台账中 5.报工人选择的谁,只有在相关账号才能看到可报工的数据 6.不合格管理字段按照单据进行修改。 7.生产工时、质量问题汇总、客户档案、销售及回款都能从各模块中导出数据
---
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