From 674aef62d298f9fbce41b9b1725c71d056dfd55b Mon Sep 17 00:00:00 2001 From: LSH Date: 星期三, 03 四月 2024 10:26:32 +0800 Subject: [PATCH] #周计划 --- src/main/webapp/views/weekly/weekly.html | 2 +- src/main/webapp/static/js/weekly/weekly.js | 8 ++++++++ src/main/java/com/zy/crm/common/web/AuthController.java | 7 ++++--- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zy/crm/common/web/AuthController.java b/src/main/java/com/zy/crm/common/web/AuthController.java index 4b8fe69..541c4d7 100644 --- a/src/main/java/com/zy/crm/common/web/AuthController.java +++ b/src/main/java/com/zy/crm/common/web/AuthController.java @@ -450,12 +450,13 @@ @RequestMapping(value = "/power/menu/{resourceId}/auth") @ManagerAuth - public R buttonResource(@PathVariable("resourceId") Long resourceId) { + public R buttonResource(@PathVariable("resourceId") String resourceId) { + long resourceId2 = Long.parseLong(resourceId); List<Resource> resources; if (getUserId() == 9527) { - resources = resourceService.selectList(new EntityWrapper<Resource>().eq("level", 3).eq("resource_id", resourceId)); + resources = resourceService.selectList(new EntityWrapper<Resource>().eq("level", 3).eq("resource_id", resourceId2)); } else { - resources = roleResourceService.getMenuButtomResource(resourceId, getUserId()); + resources = roleResourceService.getMenuButtomResource(resourceId2, getUserId()); } for (Resource resource : resources) { resource.setCode(resource.getCode().split("#")[1]); diff --git a/src/main/webapp/static/js/weekly/weekly.js b/src/main/webapp/static/js/weekly/weekly.js index f4f2d52..47d267b 100644 --- a/src/main/webapp/static/js/weekly/weekly.js +++ b/src/main/webapp/static/js/weekly/weekly.js @@ -598,7 +598,12 @@ } } }) + location.reload(); + return false; + }); + $('#cancelBtn').on('click', function () { + location.reload(); }); // 鏄庣粏琛ㄦ牸 var xxDataList = []; @@ -927,6 +932,7 @@ } } }) + location.reload(); return false; }); // 鏄庣粏琛ㄦ牸 @@ -1226,8 +1232,10 @@ // 鍏抽棴鍔ㄤ綔 $(document).on('click','#data-detail-close', function () { parent.layer.closeAll(); + location.reload(); }); + function tableReload(child) { var searchData = {}; $.each($('#search-box [name]').serializeArray(), function() { diff --git a/src/main/webapp/views/weekly/weekly.html b/src/main/webapp/views/weekly/weekly.html index 968d494..15c69bc 100644 --- a/src/main/webapp/views/weekly/weekly.html +++ b/src/main/webapp/views/weekly/weekly.html @@ -156,7 +156,7 @@ </button> </div> <div class="layui-form-item text-right"> - <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button> + <button id="cancelBtn" class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button> <button class="layui-btn" lay-filter="weeklyEditSubmit" lay-submit>淇濆瓨</button> </div> </form> -- Gitblit v1.9.1