From c9cc00d09c756f126710168f81eb7ceba0959ec2 Mon Sep 17 00:00:00 2001
From: zhang_nuo <zhang_12370@163.com>
Date: 星期五, 21 八月 2026 11:17:31 +0800
Subject: [PATCH] feat(personnel,production): 新增年龄自动计算及工单数量支持小数
---
src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue b/src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue
index d057f16..9ceb8ea 100644
--- a/src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue
+++ b/src/views/officeProcessAutomation/ApproveManage/approve-list/components/ApproveDetailPanel.vue
@@ -85,7 +85,7 @@
<el-descriptions-item label="浠樻鏂瑰紡">{{ detailData.paymentMethod || "--" }}</el-descriptions-item>
<el-descriptions-item label="鍚堝悓閲戦" :span="2">
<span style="font-size: 18px; color: #e6a23c; font-weight: bold;">
- 楼{{ Number(detailData.contractAmount ?? 0).toFixed(2) }}
+ 楼{{ contractAmount.toFixed(2) }}
</span>
</el-descriptions-item>
</el-descriptions>
@@ -209,6 +209,18 @@
return props.detailData || {};
});
+ // 鍚堝悓閲戦锛氬悗绔鎯呮帴鍙ｆ湭杩斿洖 contractAmount 鏃讹紝鐢ㄤ骇鍝佹槑缁嗗惈绋庢�讳环姹傚拰鍏滃簳
+ const contractAmount = computed(() => {
+ const detail = props.detailData || {};
+ const raw = Number(detail.contractAmount);
+ if (raw > 0) return raw;
+ const products = detail.productData || [];
+ return products.reduce(
+ (sum, p) => sum + Number(p.taxInclusiveTotalPrice || 0),
+ 0
+ );
+ });
+
const attachmentList = computed(() => {
const list = props.row.storageBlobVOList || props.row.storageBlobDTOs || [];
return Array.isArray(list) ? list : [];
--
Gitblit v1.9.3