From e02d48192fd39f20fbbfcdaeddd8ae15c994cce7 Mon Sep 17 00:00:00 2001
From: Harry Yang <i.take.today@gmail.com>
Date: Thu, 5 Jan 2023 18:31:37 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=91=E9=A2=9D=E6=A0=BC=E5=BC=8F=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/business/process-completed.ftl          |  4 ++--
 .../templates/admin/business/process-detail.ftl   | 15 ++++++++++++---
 .../templates/admin/business/process-edit.ftl     |  5 ++++-
 3 files changed, 18 insertions(+), 6 deletions(-)

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 @@
                 </el-button>
                   <#if isAdmin>
                   <#--判断是不是管理员本人的-->
-                    <el-button v-if="scope.row.applyPersonId==='${adminId}'" type="text" @click="editProcess(scope.row, scope)">编辑
+                    <el-button v-if="scope.row.applyPersonId===${adminId}" type="text" @click="editProcess(scope.row, scope)">编辑
                     </el-button>
                   <#else>
                     <el-button v-if="scope.row.status==='draft' || scope.row.status==='audit_not_passed'"
@@ -144,7 +144,7 @@
 
                   <#if isAdmin>
                   <#--判断是不是管理员本人的-->
-                    <el-button v-if="scope.row.applyPersonId==='${adminId}'" type="text"
+                    <el-button v-if="scope.row.applyPersonId===${adminId}" type="text"
                                @click="deleteProcess(scope.row, scope)">删除
                     </el-button>
                   <#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),  // 存在相同字段转换一下
                 }
               }