diff --git a/src/main/java/cn/stylefeng/guns/modular/organization/OrganizationViewController.java b/src/main/java/cn/stylefeng/guns/modular/organization/OrganizationViewController.java index 3a8ff30b..07ff9598 100644 --- a/src/main/java/cn/stylefeng/guns/modular/organization/OrganizationViewController.java +++ b/src/main/java/cn/stylefeng/guns/modular/organization/OrganizationViewController.java @@ -13,7 +13,7 @@ import org.springframework.stereotype.Controller; */ @Controller @Slf4j -@ApiResource(name = "职位管理相关的界面渲染", path = "organization") +@ApiResource(name = "职位管理相关的界面渲染", path = "/view/organization") public class OrganizationViewController { private String PREFIX = "/modular/system/organization"; @@ -24,7 +24,7 @@ public class OrganizationViewController { * @author chenjinlong * @date 2020/11/04 11:07 */ - @GetResource(name = "机构管理-首页-视图", path = "", requiredPermission = false, requiredLogin = false) + @GetResource(name = "机构管理-首页-视图", path = "") public String indexView() { return PREFIX + "/organization.html"; } @@ -35,7 +35,7 @@ public class OrganizationViewController { * @author chenjinlong * @date 2020/11/04 11:07 */ - @GetResource(name = "机构管理—新增-视图", path = "/addView", requiredPermission = false, requiredLogin = false) + @GetResource(name = "机构管理—新增-视图", path = "/addView") public String addView() { return PREFIX + "/organization_add.html"; } @@ -46,7 +46,7 @@ public class OrganizationViewController { * @author chenjinlong * @date 2020/11/04 11:07 */ - @GetResource(name = "机构管理-修改-视图", path = "editView", requiredPermission = false, requiredLogin = false) + @GetResource(name = "机构管理-修改-视图", path = "editView") public String editView() { return PREFIX + "/organization_edit.html"; } diff --git a/src/main/java/cn/stylefeng/guns/modular/position/PositionViewController.java b/src/main/java/cn/stylefeng/guns/modular/position/PositionViewController.java index 77d12452..b733de82 100644 --- a/src/main/java/cn/stylefeng/guns/modular/position/PositionViewController.java +++ b/src/main/java/cn/stylefeng/guns/modular/position/PositionViewController.java @@ -13,7 +13,7 @@ import org.springframework.stereotype.Controller; */ @Controller @Slf4j -@ApiResource(name = "职位管理相关的界面渲染", path = "position") +@ApiResource(name = "职位管理相关的界面渲染", path = "/view/position") public class PositionViewController { private String PREFIX = "/modular/system/position"; @@ -24,7 +24,7 @@ public class PositionViewController { * @author chenjinlong * @date 2020/11/04 11:07 */ - @GetResource(name = "职位管理-首页-视图", path = "", requiredPermission = false, requiredLogin = false) + @GetResource(name = "职位管理-首页-视图", path = "") public String indexView() { return PREFIX + "/position.html"; } @@ -35,7 +35,7 @@ public class PositionViewController { * @author chenjinlong * @date 2020/11/04 11:07 */ - @GetResource(name = "职位管理-首页-视图", path = "/addView", requiredPermission = false, requiredLogin = false) + @GetResource(name = "职位管理-首页-视图", path = "/addView") public String addView() { return PREFIX + "/position_add.html"; } @@ -46,7 +46,7 @@ public class PositionViewController { * @author chenjinlong * @date 2020/11/04 11:07 */ - @GetResource(name = "职位管理-首页-视图", path = "editView", requiredPermission = false, requiredLogin = false) + @GetResource(name = "职位管理-首页-视图", path = "editView") public String editView() { return PREFIX + "/position_edit.html"; } diff --git a/src/main/webapp/assets/modular/system/organization/organization.js b/src/main/webapp/assets/modular/system/organization/organization.js index e7dc22fe..624c6510 100644 --- a/src/main/webapp/assets/modular/system/organization/organization.js +++ b/src/main/webapp/assets/modular/system/organization/organization.js @@ -64,7 +64,7 @@ layui.use(['table', 'form', 'func', 'HttpRequest', 'tree', 'util'], function () func.open({ height: 800, title: '添加机构', - content: Feng.ctxPath + '/organization/addView', + content: Feng.ctxPath + '/view/organization/addView', tableId: Organization.tableId }); }; @@ -74,7 +74,7 @@ layui.use(['table', 'form', 'func', 'HttpRequest', 'tree', 'util'], function () func.open({ height: 800, title: '修改机构', - content: Feng.ctxPath + '/organization/editView?orgId=' + data.orgId, + content: Feng.ctxPath + '/view/organization/editView?orgId=' + data.orgId, tableId: Organization.tableId }); }; diff --git a/src/main/webapp/assets/modular/system/position/position.js b/src/main/webapp/assets/modular/system/position/position.js index e8a7bc01..b6456195 100644 --- a/src/main/webapp/assets/modular/system/position/position.js +++ b/src/main/webapp/assets/modular/system/position/position.js @@ -50,7 +50,7 @@ layui.use(['table', 'form', 'func', 'HttpRequest', 'util'], function () { func.open({ height: 800, title: '添加职位', - content: Feng.ctxPath + '/position/addView', + content: Feng.ctxPath + '/view/position/addView', tableId: Position.tableId }); }; @@ -60,7 +60,7 @@ layui.use(['table', 'form', 'func', 'HttpRequest', 'util'], function () { func.open({ height: 800, title: '修改职位', - content: Feng.ctxPath + '/position/editView?positionId=' + data.positionId, + content: Feng.ctxPath + '/view/position/editView?positionId=' + data.positionId, tableId: Position.tableId }); }; @@ -139,7 +139,6 @@ layui.use(['table', 'form', 'func', 'HttpRequest', 'util'], function () { } else if (event === 'delete') { Position.delete(data); } - dropdown.hideAll(); }); // 修改状态 diff --git a/src/main/webapp/pages/modular/system/organization/organization.html b/src/main/webapp/pages/modular/system/organization/organization.html index e3312a37..5c941eeb 100644 --- a/src/main/webapp/pages/modular/system/organization/organization.html +++ b/src/main/webapp/pages/modular/system/organization/organization.html @@ -1,7 +1,7 @@ @layout("/layout/_container.html",{js:["/assets/modular/system/organization/organization.js"]}){
- 职位表管理 + 机构管理
diff --git a/src/main/webapp/pages/modular/system/position/position.html b/src/main/webapp/pages/modular/system/position/position.html index 8af25b38..7730cb59 100644 --- a/src/main/webapp/pages/modular/system/position/position.html +++ b/src/main/webapp/pages/modular/system/position/position.html @@ -1,7 +1,7 @@ @layout("/layout/_container.html",{js:["/assets/modular/system/position/position.js"]}){
- 职位表管理 + 职位管理
@@ -14,23 +14,10 @@
- - -
- - - - - - - - - -
@@ -44,20 +31,6 @@