From f23bf9e17541368c7b581d7a61a560612f72bf9d Mon Sep 17 00:00:00 2001 From: Harry Yang Date: Thu, 5 Jan 2023 21:16:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=95=8C=E9=9D=A2=20?= =?UTF-8?q?=E5=90=AB=E7=A8=8E=E6=80=BB=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/templates/admin/business/process-detail.ftl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/resources/templates/admin/business/process-detail.ftl b/src/main/resources/templates/admin/business/process-detail.ftl index b1b7762..96b1f1f 100644 --- a/src/main/resources/templates/admin/business/process-detail.ftl +++ b/src/main/resources/templates/admin/business/process-detail.ftl @@ -467,6 +467,7 @@ payAmount: numberFixed(detail.payAmount), totalTaxExclude: numberFixed(detail.totalTaxExclude), totalTaxInclude_: numberFixed(detail.totalTaxInclude),// 存在相同字段转换一下 + totalTaxInclude: numberFixed(detail.totalTaxInclude) } } let rowKey = 0 @@ -485,10 +486,13 @@ const first = purchaseDetails.shift(); // 再处理剩余的子元素 purchaseDetails = purchaseDetails.map(purchase => ({ - ...purchase, rowKey: rowKey++, parent, newRow: true + ...purchase, rowKey: rowKey++, parent, newRow: true, + totalTaxInclude: numberFixed(purchase.totalTaxInclude) })) // 合并第一行到父级 - Object.assign(parent, first) + Object.assign(parent, { + ...first, totalTaxInclude: numberFixed(first.totalTaxInclude) + }) delete parent['parent'] delete parent['purchaseDetails']