From 63b099f3900dad410be12756f51892de972ff535 Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Thu, 5 Jan 2023 18:28:37 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E5=90=88=E5=90=8C=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E5=90=88=E5=90=8C=E9=87=91=E9=A2=9D=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/palmte/work/controller/backend/ProcessController.java   | 2 +-
 src/main/resources/templates/admin/business/process-new.ftl    | 3 ++-
 2 files changed, 3 insertions(+), 2 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 f27474d..6276c1b 100644
--- a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java
+++ b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java
@@ -382,7 +382,7 @@ public class ProcessController {
     if (process.getProcessType() == ProcessType.sale_contract) {
       contract = processService.findSaleContract(id);
       incomeDetails = projectBudgetService.getBudgetIncomeDetail(project);
-      detail.setContractAmount(project.getContractAmount());
+      detail.setContractAmount(getContractAmount(project.getId()));
     }
     else if (process.getProcessType() == ProcessType.procurement_contract) {
       contract = processService.findProcurementContract(id);
diff --git a/src/main/resources/templates/admin/business/process-new.ftl b/src/main/resources/templates/admin/business/process-new.ftl
index ed6be40..976b8f7 100644
--- a/src/main/resources/templates/admin/business/process-new.ftl
+++ b/src/main/resources/templates/admin/business/process-new.ftl
@@ -255,7 +255,8 @@
               </el-form-item>
 
               <el-form-item label="合同金额">
-                <span v-if="projectSelected">{{processForm.contractAmount}}元</span>
+                <span v-if="projectSelected && isSalesContractMode">{{processForm.contractAmount}}元</span>
+                <span v-else="projectSelected && isProcurementContractMode">0元</span>
                 <span v-else>未选择项目</span>
               </el-form-item>