From d975b0adcbec59e3828a732c4d04f2fd4a068751 Mon Sep 17 00:00:00 2001
From: Harry Yang <i.take.today@gmail.com>
Date: Fri, 6 Jan 2023 11:38:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9E=AB=E8=B5=84=E9=87=91=E9=A2=9D=20?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/palmte/work/controller/backend/ProcessController.java  | 4 ++--
 src/main/resources/templates/admin/business/process-new.ftl   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java
index 1104a00..f960345 100644
--- a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java
+++ b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java
@@ -296,7 +296,7 @@ public class ProcessController {
     public String isPrepaid;
 
     // 垫资金额
-    public String repaidAmount;
+    public BigDecimal repaidAmount;
 
     // 预算毛利率
     public BigDecimal budgetGrossMargin;
@@ -340,7 +340,7 @@ public class ProcessController {
             .incomeDetails(incomeDetails)
             .procurementDetails(procurementDetails)
             .projectName(project.getName())
-            .repaidAmount(repaidAmount + "元")
+            .repaidAmount(repaidAmount)
             .budgetGrossMargin(budgetBean.getProjectGrossProfitRate())
             .projectNo(project.getProjectNo())
             .applyPersonName(admin.getRealName())
diff --git a/src/main/resources/templates/admin/business/process-new.ftl b/src/main/resources/templates/admin/business/process-new.ftl
index ee0069c..06e0462 100644
--- a/src/main/resources/templates/admin/business/process-new.ftl
+++ b/src/main/resources/templates/admin/business/process-new.ftl
@@ -305,7 +305,7 @@
               </el-form-item>
 
               <el-form-item label="垫资金额" v-if="processForm.isPrepaid!=='否'">
-                <span v-if="projectSelected">{{processForm.repaidAmount|numberFormat}}</span>
+                <span v-if="projectSelected">{{processForm.repaidAmount|numberFormat}}元</span>
                 <span v-else>未选择项目</span>
               </el-form-item>