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 35d2574..b4eb2cf 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java @@ -287,12 +287,8 @@ public class ProjectController extends BaseController { for (int i = 0; i < details.size(); i++) { ProjectBudgetCostProjectManageDetailTemp detail = details.getObject(i, ProjectBudgetCostProjectManageDetailTemp.class); if(detail.getType() == 3 || "3".equals(detail.getName1()) || "8".equals(detail.getName1())) { - if ("".equals(detail.getName2())) { - return ResponseMsg.buildFailedMsg("业务项目不允许为空"); - } else { - detail.setName(detail.getName2()); - detail.setIsDiy(1); - } + detail.setName(detail.getName2()); + detail.setIsDiy(1); } else { if ("1".equals(detail.getName1())) { detail.setName("人工费"); diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl index b54d012..47b52f7 100644 --- a/src/main/resources/templates/admin/project_budget_edit.ftl +++ b/src/main/resources/templates/admin/project_budget_edit.ftl @@ -512,12 +512,14 @@ <#if costProjectManageDetail.type == 1> + <#if costProjectManageDetail.type == 2> + 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!}">