From 035a5f68bcc6dec1aa5715835ccd4182108c8d3a Mon Sep 17 00:00:00 2001
From: Harry Yang <i.take.today@gmail.com>
Date: Thu, 5 Jan 2023 12:26:16 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E7=B1=BB=E5=9E=8B=20?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=BA=BA=E9=83=A8=E9=97=A8=E9=A2=86=E5=AF=BC?=
 =?UTF-8?q?=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/palmte/work/model/process/ProjectProcess.java | 4 ++--
 .../work/model/process/form/ProcessCreationForm.java      | 4 ++--
 .../resources/templates/admin/business/process-detail.ftl | 8 ++++++--
 .../resources/templates/admin/business/process-edit.ftl   | 2 +-
 .../resources/templates/admin/business/process-new.ftl    | 2 +-
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/main/java/cn/palmte/work/model/process/ProjectProcess.java b/src/main/java/cn/palmte/work/model/process/ProjectProcess.java
index b330ff7..ab3c84a 100644
--- a/src/main/java/cn/palmte/work/model/process/ProjectProcess.java
+++ b/src/main/java/cn/palmte/work/model/process/ProjectProcess.java
@@ -66,10 +66,10 @@ public class ProjectProcess implements Serializable {
   // 申请部门ID(逗号分割)
   private String applyDeptId;
 
-  // 申请人部门领导ID
+  // 申请部门领导ID
   private Integer applyDeptLeaderId;
 
-  // 申请人部门领导
+  // 申请部门领导
   private String applyDeptLeaderName;
 
   // 合同编号
diff --git a/src/main/java/cn/palmte/work/model/process/form/ProcessCreationForm.java b/src/main/java/cn/palmte/work/model/process/form/ProcessCreationForm.java
index a55a06f..1cd3a5e 100644
--- a/src/main/java/cn/palmte/work/model/process/form/ProcessCreationForm.java
+++ b/src/main/java/cn/palmte/work/model/process/form/ProcessCreationForm.java
@@ -44,10 +44,10 @@ public class ProcessCreationForm {
   // 申请部门ID(逗号分割)
   private String applyDeptId;
 
-  // 申请人部门领导ID
+  // 申请部门领导ID
   private Integer applyDeptLeaderId;
 
-  // 申请人部门领导
+  // 申请部门领导
   private String applyDeptLeaderName;
 
   // 申请人电话
diff --git a/src/main/resources/templates/admin/business/process-detail.ftl b/src/main/resources/templates/admin/business/process-detail.ftl
index 76ccc13..e30bade 100644
--- a/src/main/resources/templates/admin/business/process-detail.ftl
+++ b/src/main/resources/templates/admin/business/process-detail.ftl
@@ -62,10 +62,14 @@
           <el-descriptions-item label="申请时间">{{process.applyDate}}</el-descriptions-item>
           <el-descriptions-item label="项目类型">${projectType}</el-descriptions-item>
           <el-descriptions-item label="合作类型">${cooperationType}</el-descriptions-item>
-
+          <el-descriptions-item label="采购类型" v-if="isProcurementContract">
+              <#if contract.procurementMode??>
+                  ${contract.procurementMode.description}
+              </#if>
+          </el-descriptions-item>
           <el-descriptions-item label="申请部门">{{process?.applyDept?.split(',').join('/')}}</el-descriptions-item>
           <el-descriptions-item label="申请人">{{process.applyPersonName}}</el-descriptions-item>
-          <el-descriptions-item label="申请人部门领导">{{process.applyDeptLeaderName}}</el-descriptions-item>
+          <el-descriptions-item label="申请部门领导">{{process.applyDeptLeaderName}}</el-descriptions-item>
           <el-descriptions-item label="申请人电话" v-if="isSaleContract">{{contract.applyPersonPhone}}</el-descriptions-item>
 
           <el-descriptions-item label="合同编号">
diff --git a/src/main/resources/templates/admin/business/process-edit.ftl b/src/main/resources/templates/admin/business/process-edit.ftl
index 846f2da..dd27c8c 100644
--- a/src/main/resources/templates/admin/business/process-edit.ftl
+++ b/src/main/resources/templates/admin/business/process-edit.ftl
@@ -113,7 +113,7 @@
                 <span>{{processForm.applyPersonName}}</span>
               </el-form-item>
 
-              <el-form-item label="申请人部门领导">
+              <el-form-item label="申请部门领导">
                 <span>{{processForm.applyDeptLeaderName}}</span>
               </el-form-item>
 
diff --git a/src/main/resources/templates/admin/business/process-new.ftl b/src/main/resources/templates/admin/business/process-new.ftl
index d0f9e69..c78fd34 100644
--- a/src/main/resources/templates/admin/business/process-new.ftl
+++ b/src/main/resources/templates/admin/business/process-new.ftl
@@ -225,7 +225,7 @@
                 <span v-else>未选择项目</span>
               </el-form-item>
 
-              <el-form-item label="申请人部门领导">
+              <el-form-item label="申请部门领导">
                 <span v-if="processForm.applyDeptLeaderName">{{processForm.applyDeptLeaderName}}</span>
                 <span v-else>未选择部门</span>
               </el-form-item>