From 5af665569d0cc093184f99b70ac38745ef53b911 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 21 九月 2026 20:39:04 +0800
Subject: [PATCH] 新疆-融邦环保 1.油品出库表单改「多台账分摊绑定」:各台账数量之和必须等于出库吨位,产品取各台账明细交集,代储不锁行可自由增删 2.新增到货记录模块:销售台账页入口,车辆随出库单联动,到货上限=该台账分摊量,附件走永久链接 3.发货台账改层级父行:油品出库为父行,children 为到货记录,来源列区分发货单/油品出库/到货 4.开票/收款候选按「出库单×客户」拆行,bindingId 与出库单 id 分两串回传,防重复开票/收款 5.销售台账下拉补产品/规格型号 6.代储入库绑定销售订单:油品入库表单加销售订单下拉,入库台账列表加「销售订单」列 7.采购申请补齐台账字段(油库、采购合同号、提货方式、物流方式、最佳到站日期、采购类别、付款方式、预警数量、附件等) 8.修复采购申请「转订单后跳转无反应」 9.采购台账删掉「销售合同号」的搜索条件、列表列和表单字段 10.公海客户新增「信托基金(元)」,代储金额合计超限标红提示
---
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