From 7aefe59152d0f4ef40e1516cf727b2cb760d4def Mon Sep 17 00:00:00 2001 From: hanbo <2608504783@qq.com> Date: Fri, 19 Nov 2021 16:58:28 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=AE=A1=E6=A0=B8=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E3=80=81=E8=A7=92=E8=89=B2=E7=AD=89=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/backend/ProjectController.java | 3 ++ .../palmte/work/service/SysRoleService.java | 4 +-- .../static/assets/js/project_final.js | 35 ++++++++++--------- .../templates/admin/project_approve.ftl | 20 +++++++++++ .../templates/admin/project_list.ftl | 6 ++-- .../resources/templates/admin/role_input.ftl | 15 ++++++++ .../resources/templates/admin/role_list.ftl | 14 ++++++++ 7 files changed, 76 insertions(+), 21 deletions(-) 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 bb88a54..2f73c9f 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java @@ -376,6 +376,7 @@ public class ProjectController extends BaseController { Project project = projectService.getProject(id); EstimateBean estimateBean = projectEstimateService.getEstimate(project); model.put("estimateBean", estimateBean); + model.put("adminId", InterfaceUtil.getAdminId()); model.put("project", project); model.put("formerBean", projectSettleService.getFormerSettle(project, time)); model.put("monthBean", projectSettleService.getMonthSettle(project, time)); @@ -403,6 +404,8 @@ public class ProjectController extends BaseController { model.put("finalBean", projectFinalSevice.getFinal(project)); //freemarker可以利用的静态方法 model.put("Utils", FreeMarkerUtil.fromStaticPackage("cn.palmte.work.utils.Utils")); + List list = projectTaskRecordService.list(id); + model.put("taskRecords", list); return "admin/project_approve"; } diff --git a/src/main/java/cn/palmte/work/service/SysRoleService.java b/src/main/java/cn/palmte/work/service/SysRoleService.java index aeeae28..06f7158 100644 --- a/src/main/java/cn/palmte/work/service/SysRoleService.java +++ b/src/main/java/cn/palmte/work/service/SysRoleService.java @@ -134,7 +134,7 @@ public class SysRoleService { SysRole role=new SysRole(); role.setName(reqMap.get("roleName")!=null?reqMap.get("roleName").toString():null); - //role.setLevel(reqMap.containsKey("roleLevel")?Integer.parseInt(reqMap.get("roleLevel").toString()):1);//第一个版本 默认都是省级 + role.setLevel(Integer.parseInt(reqMap.get("level").toString())); role.setIsEnable(Integer.parseInt(reqMap.get("isActive").toString())); //role.setType(Integer.parseInt(reqMap.get("roleType").toString())); role.setCreatedBy(InterfaceUtil.getAdminId());//当前登录人 @@ -249,7 +249,7 @@ public class SysRoleService { SysRole role =sysRoleRepository.findSysRoleById(roleId); role.setName(reqMap.get("roleName").toString()); - //role.setLevel(Integer.parseInt(reqMap.get("roleLevel").toString())); + role.setLevel(Integer.parseInt(reqMap.get("level").toString())); //role.setType(Integer.parseInt(reqMap.get("roleType").toString())); role.setIsEnable(Integer.parseInt(reqMap.get("isActive").toString())); role.setLastUpdatedBy(InterfaceUtil.getAdminId()); diff --git a/src/main/resources/static/assets/js/project_final.js b/src/main/resources/static/assets/js/project_final.js index 7afdf55..0e29b1a 100644 --- a/src/main/resources/static/assets/js/project_final.js +++ b/src/main/resources/static/assets/js/project_final.js @@ -10,22 +10,6 @@ function calculateFinal() { calIncomeFinalTotal(); }); - /** - * 收入决算总额(不含税)，有一项没填就置空 - */ - function calIncomeFinalTotal() { - var incomeDeviceFinalTotal = $("input[name='incomeDeviceFinalTotal']").val(); - var incomeEngineerFinalTotal = $("input[name='incomeEngineerFinalTotal']").val(); - var incomeServiceFinalTotal = $("input[name='incomeServiceFinalTotal']").val(); - - var incomeFinalTotal = $("input[name='incomeFinalTotal']"); - - if(incomeDeviceFinalTotal && incomeEngineerFinalTotal && incomeServiceFinalTotal){ - incomeFinalTotal.val(parseFloat(incomeDeviceFinalTotal)+parseFloat(incomeEngineerFinalTotal)+parseFloat(incomeServiceFinalTotal)); - }else { - incomeFinalTotal.val(""); - } - } $("input[name='costPurchaseDeviceFinalTotal']").change(function () { calCostFinalTotal(); @@ -106,6 +90,25 @@ function calculateFinal() { } +/** + * 收入决算总额(不含税)，有一项没填就置空 + */ +function calIncomeFinalTotal() { + var incomeDeviceFinalTotal = $("input[name='incomeDeviceFinalTotal']").val(); + var incomeEngineerFinalTotal = $("input[name='incomeEngineerFinalTotal']").val(); + var incomeServiceFinalTotal = $("input[name='incomeServiceFinalTotal']").val(); + + var incomeFinalTotal = $("input[name='incomeFinalTotal']"); + console.log("incomeEngineerFinalTotal" + incomeEngineerFinalTotal); + + if(incomeDeviceFinalTotal && incomeEngineerFinalTotal && incomeServiceFinalTotal){ + console.log("incomeServiceFinalTotal" + incomeServiceFinalTotal); + incomeFinalTotal.val(parseFloat(incomeDeviceFinalTotal)+parseFloat(incomeEngineerFinalTotal)); + }else { + incomeFinalTotal.val(""); + } +} + /** * 成本决算总额(不含税)，有一项没填就置空 */ diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl index 3138dcf..9222619 100644 --- a/src/main/resources/templates/admin/project_approve.ftl +++ b/src/main/resources/templates/admin/project_approve.ftl @@ -1725,12 +1725,32 @@ +
+
+
+
+
+ 审核意见 +
+
+ <#list taskRecords as node> + ${node.assigneeName} : ${node.taskComment}    ${node.createTime} +
+ +
+
+
+
+
+
+ <#if project.creatorId!=project.approveId && adminId==project.approveId> +
diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl index 1a3e00b..27e104c 100644 --- a/src/main/resources/templates/admin/project_list.ftl +++ b/src/main/resources/templates/admin/project_list.ftl @@ -189,7 +189,7 @@ <#list pager.list as list> ${list.id!} - ${list.name!} + ${list.name!} ${list.typeDesc!} ${list.statusDesc!} ${list.approveStatusDesc!} @@ -266,11 +266,11 @@ - + --> <#if list.creatorId!=list.approveId && adminId==list.approveId> diff --git a/src/main/resources/templates/admin/role_input.ftl b/src/main/resources/templates/admin/role_input.ftl index 8ca2322..040dbd4 100644 --- a/src/main/resources/templates/admin/role_input.ftl +++ b/src/main/resources/templates/admin/role_input.ftl @@ -34,6 +34,21 @@
+
+
+ *角色等级
+
+ +
+
+
+
diff --git a/src/main/resources/templates/admin/role_list.ftl b/src/main/resources/templates/admin/role_list.ftl index 81fffcf..7bed83b 100644 --- a/src/main/resources/templates/admin/role_list.ftl +++ b/src/main/resources/templates/admin/role_list.ftl @@ -51,6 +51,7 @@ 角色名称 + 角色等级 是否启用 创建日期 最后更新日期 @@ -65,6 +66,19 @@ ${list.name!} + + <#if list.level ==1 > + 一级 + <#elseif list.level ==2> + 二级 + <#elseif list.level ==3> + 三级 + <#elseif list.level ==4> + 四级 + <#elseif list.level ==5> + 五级 + + <#if list.isEnable ==1 > 是