gitee
/
guns
mirror of https://gitee.com/stylefeng/guns
1
0
Fork 0
Code Issues Releases Wiki Activity

【hr_organization】功能调整优化

pull/64/head
chenjinlong 2021-01-07 19:27:11 +08:00
parent 8116103641
commit dc3c688868
6 changed files with 14 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/cn/stylefeng/guns/modular/organization/OrganizationViewController.java
View File

@ -13,7 +13,7 @@ import org.springframework.stereotype.Controller;
*/ */
@Controller @Controller
@Slf4j @Slf4j
@ApiResource(name = "职位管理相关的界面渲染", path = "organization") @ApiResource(name = "职位管理相关的界面渲染", path = "/view/organization")
public class OrganizationViewController { public class OrganizationViewController {
private String PREFIX = "/modular/system/organization"; private String PREFIX = "/modular/system/organization";
@ -24,7 +24,7 @@ public class OrganizationViewController {
* @author chenjinlong * @author chenjinlong
* @date 2020/11/04 11:07 * @date 2020/11/04 11:07
*/ */
@GetResource(name = "机构管理-首页-视图", path = "", requiredPermission = false, requiredLogin = false) @GetResource(name = "机构管理-首页-视图", path = "")
public String indexView() { public String indexView() {
return PREFIX + "/organization.html"; return PREFIX + "/organization.html";
} }
@ -35,7 +35,7 @@ public class OrganizationViewController {
* @author chenjinlong * @author chenjinlong
* @date 2020/11/04 11:07 * @date 2020/11/04 11:07
*/ */
@GetResource(name = "机构管理—新增-视图", path = "/addView", requiredPermission = false, requiredLogin = false) @GetResource(name = "机构管理—新增-视图", path = "/addView")
public String addView() { public String addView() {
return PREFIX + "/organization_add.html"; return PREFIX + "/organization_add.html";
} }
@ -46,7 +46,7 @@ public class OrganizationViewController {
* @author chenjinlong * @author chenjinlong
* @date 2020/11/04 11:07 * @date 2020/11/04 11:07
*/ */
@GetResource(name = "机构管理-修改-视图", path = "editView", requiredPermission = false, requiredLogin = false) @GetResource(name = "机构管理-修改-视图", path = "editView")
public String editView() { public String editView() {
return PREFIX + "/organization_edit.html"; return PREFIX + "/organization_edit.html";
} }

8
src/main/java/cn/stylefeng/guns/modular/position/PositionViewController.java
View File

@ -13,7 +13,7 @@ import org.springframework.stereotype.Controller;
*/ */
@Controller @Controller
@Slf4j @Slf4j
@ApiResource(name = "职位管理相关的界面渲染", path = "position") @ApiResource(name = "职位管理相关的界面渲染", path = "/view/position")
public class PositionViewController { public class PositionViewController {
private String PREFIX = "/modular/system/position"; private String PREFIX = "/modular/system/position";
@ -24,7 +24,7 @@ public class PositionViewController {
* @author chenjinlong * @author chenjinlong
* @date 2020/11/04 11:07 * @date 2020/11/04 11:07
*/ */
@GetResource(name = "职位管理-首页-视图", path = "", requiredPermission = false, requiredLogin = false) @GetResource(name = "职位管理-首页-视图", path = "")
public String indexView() { public String indexView() {
return PREFIX + "/position.html"; return PREFIX + "/position.html";
} }
@ -35,7 +35,7 @@ public class PositionViewController {
* @author chenjinlong * @author chenjinlong
* @date 2020/11/04 11:07 * @date 2020/11/04 11:07
*/ */
@GetResource(name = "职位管理-首页-视图", path = "/addView", requiredPermission = false, requiredLogin = false) @GetResource(name = "职位管理-首页-视图", path = "/addView")
public String addView() { public String addView() {
return PREFIX + "/position_add.html"; return PREFIX + "/position_add.html";
} }
@ -46,7 +46,7 @@ public class PositionViewController {
* @author chenjinlong * @author chenjinlong
* @date 2020/11/04 11:07 * @date 2020/11/04 11:07
*/ */
@GetResource(name = "职位管理-首页-视图", path = "editView", requiredPermission = false, requiredLogin = false) @GetResource(name = "职位管理-首页-视图", path = "editView")
public String editView() { public String editView() {
return PREFIX + "/position_edit.html"; return PREFIX + "/position_edit.html";
} }

4
src/main/webapp/assets/modular/system/organization/organization.js
View File

@ -64,7 +64,7 @@ layui.use(['table', 'form', 'func', 'HttpRequest', 'tree', 'util'], function ()
func.open({ func.open({
height: 800, height: 800,
title: '添加机构', title: '添加机构',
content: Feng.ctxPath + '/organization/addView', content: Feng.ctxPath + '/view/organization/addView',
tableId: Organization.tableId tableId: Organization.tableId
}); });
}; };
@ -74,7 +74,7 @@ layui.use(['table', 'form', 'func', 'HttpRequest', 'tree', 'util'], function ()
func.open({ func.open({
height: 800, height: 800,
title: '修改机构', title: '修改机构',
content: Feng.ctxPath + '/organization/editView?orgId=' + data.orgId, content: Feng.ctxPath + '/view/organization/editView?orgId=' + data.orgId,
tableId: Organization.tableId tableId: Organization.tableId
}); });
}; };

5
src/main/webapp/assets/modular/system/position/position.js
View File

@ -50,7 +50,7 @@ layui.use(['table', 'form', 'func', 'HttpRequest', 'util'], function () {
func.open({ func.open({
height: 800, height: 800,
title: '添加职位', title: '添加职位',
content: Feng.ctxPath + '/position/addView', content: Feng.ctxPath + '/view/position/addView',
tableId: Position.tableId tableId: Position.tableId
}); });
}; };
@ -60,7 +60,7 @@ layui.use(['table', 'form', 'func', 'HttpRequest', 'util'], function () {
func.open({ func.open({
height: 800, height: 800,
title: '修改职位', title: '修改职位',
content: Feng.ctxPath + '/position/editView?positionId=' + data.positionId, content: Feng.ctxPath + '/view/position/editView?positionId=' + data.positionId,
tableId: Position.tableId tableId: Position.tableId
}); });
}; };
@ -139,7 +139,6 @@ layui.use(['table', 'form', 'func', 'HttpRequest', 'util'], function () {
} else if (event === 'delete') { } else if (event === 'delete') {
Position.delete(data); Position.delete(data);
} }
dropdown.hideAll();
}); });
// 修改状态 // 修改状态

2
src/main/webapp/pages/modular/system/organization/organization.html
View File

@ -1,7 +1,7 @@
@layout("/layout/_container.html",{js:["/assets/modular/system/organization/organization.js"]}){ @layout("/layout/_container.html",{js:["/assets/modular/system/organization/organization.js"]}){
<div class="layui-body-header"> <div class="layui-body-header">
<span class="layui-body-header-title">职位表管理</span> <span class="layui-body-header-title">机构管理</span>
</div> </div>
<div class="layui-fluid"> <div class="layui-fluid">

29
src/main/webapp/pages/modular/system/position/position.html
View File

@ -1,7 +1,7 @@
@layout("/layout/_container.html",{js:["/assets/modular/system/position/position.js"]}){ @layout("/layout/_container.html",{js:["/assets/modular/system/position/position.js"]}){
<div class="layui-body-header"> <div class="layui-body-header">
<span class="layui-body-header-title">职位表管理</span> <span class="layui-body-header-title">职位管理</span>
</div> </div>
<div class="layui-fluid"> <div class="layui-fluid">
@ -14,23 +14,10 @@
<div class="layui-inline"> <div class="layui-inline">
<input id="positionName" class="layui-input" type="text" placeholder="职位名称"/> <input id="positionName" class="layui-input" type="text" placeholder="职位名称"/>
</div> </div>
<!-- <div class="layui-inline">-->
<!-- <input id="positionCode" class="layui-input" type="text" placeholder="职位编码"/>-->
<!-- </div>-->
<div class="layui-inline"> <div class="layui-inline">
<button id="btnSearch" class="layui-btn icon-btn"><i class="layui-icon">&#xe615;</i>搜索</button> <button id="btnSearch" class="layui-btn icon-btn"><i class="layui-icon">&#xe615;</i>搜索</button>
<button id="btnAdd" class="layui-btn icon-btn"><i class="layui-icon">&#xe654;</i>添加</button> <button id="btnAdd" class="layui-btn icon-btn"><i class="layui-icon">&#xe654;</i>添加</button>
<button id="btnExp" class="layui-btn icon-btn"><i class="layui-icon">&#xe67d;</i>导出</button> <button id="btnExp" class="layui-btn icon-btn"><i class="layui-icon">&#xe67d;</i>导出</button>
<!-- 下拉按钮 -->
<!-- <div class="dropdown-menu dropdown-hover">-->
<!-- <button class="layui-btn icon-btn" type="button">-->
<!-- &nbsp;更多 <i class="layui-icon layui-icon-drop"></i></button>-->
<!-- <ul class="dropdown-menu-nav">-->
<!-- <li><a><i class="layui-icon layui-icon-edit"></i>test1</a></li>-->
<!-- <li><a><i class="layui-icon layui-icon-delete"></i>test2</a></li>-->
<!-- <li><a><i class="layui-icon layui-icon-password"></i>test3</a></li>-->
<!-- </ul>-->
<!-- </div>-->
</div> </div>
</div> </div>
</div> </div>
@ -44,20 +31,6 @@
<script type="text/html" id="tableBar"> <script type="text/html" id="tableBar">
<a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">修改</a> <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">修改</a>
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a> <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a>
<!-- <a class="layui-btn layui-btn-xs" data-dropdown="#userTbDrop{{d.LAY_INDEX}}" no-shade="true">更多<i class="layui-icon layui-icon-drop" style="font-size: 12px;margin-right: 0;"></i></a>-->
<!-- &lt;!&ndash; 下拉菜单 &ndash;&gt;-->
<!-- <ul class="dropdown-menu-nav dropdown-bottom-right layui-hide" id="userTbDrop{{d.LAY_INDEX}}">-->
<!-- <div class="dropdown-anchor"></div>-->
<!-- <li><a lay-event="lock"><i class="layui-icon layui-icon-password"></i>锁定用户</a></li>-->
<!-- <li><a lay-event="reset"><i class="layui-icon layui-icon-key"></i>重置密码</a></li>-->
<!-- <li class="have-more show-left">-->
<!-- <a><i class="layui-icon layui-icon-upload-drag"></i>上传资料&nbsp;&nbsp;</a>-->
<!-- <ul class="dropdown-menu-nav-child">-->
<!-- <li><a><i class="layui-icon layui-icon-camera"></i>上传头像</a></li>-->
<!-- <li><a><i class="layui-icon layui-icon-picture-fine"></i>上传照片</a></li>-->
<!-- </ul>-->
<!-- </li>-->
<!-- </ul>-->
</script> </script>
<script type="text/html" id="statusTpl"> <script type="text/html" id="statusTpl">