diff --git a/src/main/resources/templates/admin/business/process-completed.ftl b/src/main/resources/templates/admin/business/process-completed.ftl index b4d1897..8b4028c 100644 --- a/src/main/resources/templates/admin/business/process-completed.ftl +++ b/src/main/resources/templates/admin/business/process-completed.ftl @@ -133,7 +133,7 @@ <#if isAdmin> <#--判断是不是管理员本人的--> - 编辑 + 编辑 <#else> <#--判断是不是管理员本人的--> - 删除 <#else> diff --git a/src/main/resources/templates/admin/business/process-detail.ftl b/src/main/resources/templates/admin/business/process-detail.ftl index 9ec2748..86ad0b0 100644 --- a/src/main/resources/templates/admin/business/process-detail.ftl +++ b/src/main/resources/templates/admin/business/process-detail.ftl @@ -456,13 +456,17 @@ this.cooperationType = cooperationType this.budgetGrossMargin = budgetGrossMargin this.supplierMaterials = supplierMaterials && supplierMaterials.map(item => ({ - ...item, attachment: mapAttachment(item.attachment) + ...item, attachment: mapAttachment(item.attachment), + totalAmount: numberFixed(item.totalAmount), })) const convertCommon = detail => { return { rowKey: rowKey++, feeType: computeFeeType(detail.type), - totalTaxInclude_: detail.totalTaxInclude, // 存在相同字段转换一下 + price: numberFixed(detail.price), + payAmount: numberFixed(detail.payAmount), + totalTaxExclude: numberFixed(detail.totalTaxExclude), + totalTaxInclude_: numberFixed(detail.totalTaxInclude),// 存在相同字段转换一下 } } let rowKey = 0 @@ -497,7 +501,12 @@ this.procurementDetails = computeProcurementDetails(procurementDetails) this.incomeDetails = incomeDetails.map(detail => ({ - ...detail, type: computeType(detail.type) + ...detail, type: computeType(detail.type), + price: numberFixed(detail.price), + totalTax: numberFixed(detail.totalTax), + payAmount: numberFixed(detail.payAmount), + totalTaxExclude: numberFixed(detail.totalTaxExclude), + totalTaxInclude: numberFixed(detail.totalTaxInclude), })) this.attachments = attachments.map(item => ({ diff --git a/src/main/resources/templates/admin/business/process-edit.ftl b/src/main/resources/templates/admin/business/process-edit.ftl index 289d820..ac0d5ec 100644 --- a/src/main/resources/templates/admin/business/process-edit.ftl +++ b/src/main/resources/templates/admin/business/process-edit.ftl @@ -803,7 +803,10 @@ const convertCommon = detail => { return { rowKey: rowKey++, feeType: computeFeeType(detail.type), - totalTaxInclude_: detail.totalTaxInclude, // 存在相同字段转换一下 + price: numberFixed(detail.price), + payAmount: numberFixed(detail.payAmount), + totalTaxExclude: numberFixed(detail.totalTaxExclude), + totalTaxInclude_: numberFixed(detail.totalTaxInclude), // 存在相同字段转换一下 } }