diff --git a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java index c340c46..35d2574 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java @@ -291,9 +291,23 @@ public class ProjectController extends BaseController { return ResponseMsg.buildFailedMsg("业务项目不允许为空"); } else { detail.setName(detail.getName2()); + detail.setIsDiy(1); } } else { - detail.setName(detail.getName1()); + if ("1".equals(detail.getName1())) { + detail.setName("人工费"); + } else if ("2".equals(detail.getName1())) { + detail.setName("总部支撑人力费用"); + } else if ("4".equals(detail.getName1())) { + detail.setName("人员差旅费"); + } else if ("5".equals(detail.getName1())) { + detail.setName("业务费用"); + } else if ("6".equals(detail.getName1())) { + detail.setName("商务及专项验收费用"); + } else if ("7".equals(detail.getName1())) { + detail.setName("办公费用"); + } + detail.setIsDiy(0); } detailList.add(detail); } diff --git a/src/main/java/cn/palmte/work/model/ProjectBudgetCostProjectManageDetailBase.java b/src/main/java/cn/palmte/work/model/ProjectBudgetCostProjectManageDetailBase.java index d9c001c..439093a 100644 --- a/src/main/java/cn/palmte/work/model/ProjectBudgetCostProjectManageDetailBase.java +++ b/src/main/java/cn/palmte/work/model/ProjectBudgetCostProjectManageDetailBase.java @@ -40,6 +40,8 @@ public class ProjectBudgetCostProjectManageDetailBase { private String name1; @Transient private String name2; + @Column(name = "is_diy") + private int isDiy; /** * 是否可以被删除,有些项是默认的不可删除,用于页面判断是否显示删除按钮 @@ -164,4 +166,12 @@ public class ProjectBudgetCostProjectManageDetailBase { public void setName2(String name2) { this.name2 = name2; } + + public int getIsDiy() { + return isDiy; + } + + public void setIsDiy(int isDiy) { + this.isDiy = isDiy; + } } \ No newline at end of file diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl index 4c1fcfd..c909a2c 100644 --- a/src/main/resources/templates/admin/project_budget_edit.ftl +++ b/src/main/resources/templates/admin/project_budget_edit.ftl @@ -508,7 +508,7 @@ - style="display:none"<#else>style="width: 80px;float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage am-modal-prompt-input-cost-project-manage-category"> <#if costProjectManageDetail.type == 1> @@ -520,7 +520,7 @@ - type="text"<#else>type="hidden" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage am-modal-prompt-input-cost-project-manage-category2" value="${costProjectManageDetail.name!}"> + type="text"<#else>type="hidden" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage am-modal-prompt-input-cost-project-manage-category2" value="${costProjectManageDetail.name!}">