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 @@ {{process.applyDate}} ${projectType} ${cooperationType} - + + <#if contract.procurementMode??> + ${contract.procurementMode.description} + + {{process?.applyDept?.split(',').join('/')}} {{process.applyPersonName}} - {{process.applyDeptLeaderName}} + {{process.applyDeptLeaderName}} {{contract.applyPersonPhone}} 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 @@ {{processForm.applyPersonName}} - + {{processForm.applyDeptLeaderName}} 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 @@ 未选择项目 - + {{processForm.applyDeptLeaderName}} 未选择部门