diff --git a/src/main/java/cn/palmte/work/service/HumanCostService.java b/src/main/java/cn/palmte/work/service/HumanCostService.java index 8362abf..aa178ba 100644 --- a/src/main/java/cn/palmte/work/service/HumanCostService.java +++ b/src/main/java/cn/palmte/work/service/HumanCostService.java @@ -260,7 +260,7 @@ public class HumanCostService { int roleId = admin.getRoleId(); Integer adminId = admin.getId(); //自己创建的肯定能看见 - projectList = pagination.find(sql, Project.class, Project.STATUS_SETTLE, Project.STATUS_BUDGET, 2, adminId, roleId, adminId); + projectList = pagination.find(sql, Project.class, Project.STATUS_SETTLE, Project.STATUS_BUDGET, 2, Project.STATUS_FINAL, 2, adminId, roleId, adminId); } for (Project project : projectList) { data.add(project.getName()); diff --git a/src/main/resources/static/assets/js/project_budget.js b/src/main/resources/static/assets/js/project_budget.js index 466adb4..2b629fc 100644 --- a/src/main/resources/static/assets/js/project_budget.js +++ b/src/main/resources/static/assets/js/project_budget.js @@ -14,6 +14,13 @@ $(function () { } console.log(message); + var startTime = $("#startDate").val(); + var endTime = $("#endDate").val(); + if (startTime > endTime) { + window.confirm('开始日期应早于结束日期'); + return; + } + $("#pmsForm").attr("action",base+"/project/budgetEditSave"); $("#pmsForm").submit(); }); @@ -25,6 +32,13 @@ $(function () { return; } + var startTime = $("#startDate").val(); + var endTime = $("#endDate").val(); + if (startTime > endTime) { + window.confirm('开始日期应早于结束日期'); + return; + } + $("#pmsForm").attr("action",base+"/project/budgetEditSaveAndApprove"); $("#pmsForm").submit(); }); diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl index 6055c7a..94d1656 100644 --- a/src/main/resources/templates/admin/project_budget_edit.ftl +++ b/src/main/resources/templates/admin/project_budget_edit.ftl @@ -569,11 +569,11 @@ --> <#if costProjectManageDetail.deletable==0> <#if costProjectManageDetail.type ==1 > - + 人工成本 <#elseif costProjectManageDetail.type ==2> - + 业务费用 <#elseif costProjectManageDetail.type ==3> - + 其他费用 <#elseif costProjectManageDetail.deletable!=0>