diff --git a/src/main/java/cn/palmte/work/service/ProjectService.java b/src/main/java/cn/palmte/work/service/ProjectService.java index 0fe2f64..96767c2 100644 --- a/src/main/java/cn/palmte/work/service/ProjectService.java +++ b/src/main/java/cn/palmte/work/service/ProjectService.java @@ -179,8 +179,14 @@ public class ProjectService { public Project editProject(Project project, Project projectInDb) { - //只有如下可以修改 + projectInDb.setName(project.getName()); + projectInDb.setCustomer(project.getCustomer()); + projectInDb.setTerminalCustomer(project.getTerminalCustomer()); + projectInDb.setIndustryScenario(project.getIndustryScenario()); + projectInDb.setType(project.getType()); + projectInDb.setUnderwrittenMode(project.getUnderwrittenMode()); + projectInDb.setStartDate(project.getStartDate()); projectInDb.setEndDate(project.getEndDate()); projectInDb.setContractAmount(project.getContractAmount()); diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl index 1173e40..db0d773 100644 --- a/src/main/resources/templates/admin/project_budget_edit.ftl +++ b/src/main/resources/templates/admin/project_budget_edit.ftl @@ -92,7 +92,7 @@
+ value="${project.name}" required/>
@@ -100,19 +100,23 @@
*项目类型
- value="工程集成类"<#elseif project.type=2>value="设备集成类"<#else>value="战略合作类" - required readonly/> +
*垫资模式
- value="A类-不垫资(战略合作)"<#elseif project.underwrittenMode=2>value="B类-不垫资(背靠背)" - <#elseif project.underwrittenMode=3>value="C类-垫资(账期覆盖)"<#else>value="D类-垫资(账期不覆盖)" /> +
@@ -122,7 +126,7 @@
+ value="${project.customer}" required/>
@@ -131,7 +135,7 @@
+ value="${project.terminalCustomer}" required/>
@@ -167,7 +171,7 @@
+ value="${project.industryScenario}" required/>
diff --git a/src/main/resources/templates/admin/project_estimate_edit.ftl b/src/main/resources/templates/admin/project_estimate_edit.ftl index 1c3e0cf..8166a48 100644 --- a/src/main/resources/templates/admin/project_estimate_edit.ftl +++ b/src/main/resources/templates/admin/project_estimate_edit.ftl @@ -69,15 +69,15 @@
+ value="${project.name}" required/>
*项目类型
-
- @@ -87,8 +87,8 @@
*垫资模式
-
- @@ -103,7 +103,7 @@
+ value="${project.customer}" required/>
@@ -112,7 +112,7 @@
+ value="${project.terminalCustomer}" required/>
@@ -148,7 +148,7 @@
+ value="${project.industryScenario}" required/>