manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

用户管理增加按角色查询条件；导入导出问的人比较多，放到醒目位置。

Browse Source
This commit is contained in:
thinkgem
2021-05-03 11:48:39 +08:00
parent e6030f9255
commit 58a0322e38
2 changed files with 47 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java
View File

@@ -87,6 +87,10 @@ public class EmpUserController extends BaseController {
@RequiresPermissions("sys:empUser:view") @RequiresPermissions("sys:empUser:view")
@RequestMapping(value = "list") @RequestMapping(value = "list")
public String list(EmpUser empUser, Model model) { public String list(EmpUser empUser, Model model) {
// 获取角色列表
Role role = new Role();
role.setUserType(User.USER_TYPE_EMPLOYEE);
model.addAttribute("roleList", roleService.findList(role));
// 获取岗位列表 // 获取岗位列表
Post post = new Post(); Post post = new Post();
model.addAttribute("postList", postService.findList(post)); model.addAttribute("postList", postService.findList(post));
@@ -427,6 +431,10 @@ public class EmpUserController extends BaseController {
if (selectDataJson != null && JSONValidator.from(selectDataJson).validate()){ if (selectDataJson != null && JSONValidator.from(selectDataJson).validate()){
model.addAttribute("selectData", selectDataJson); model.addAttribute("selectData", selectDataJson);
} }
// 获取角色列表
Role role = new Role();
role.setUserType(User.USER_TYPE_MEMBER);
model.addAttribute("roleList", roleService.findList(role));
model.addAttribute("empUser", empUser); model.addAttribute("empUser", empUser);
return "modules/sys/user/empUserSelect"; return "modules/sys/user/empUserSelect";
} }

68
modules/core/src/main/resources/views/modules/sys/user/empUserList.html
View File

@@ -7,10 +7,13 @@
</div> </div>
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<a href="#" class="btn btn-default" id="btnSearch" title="${text('查询')}"><i class="fa fa-filter"></i> ${text('查询')}</a> <a href="#" class="btn btn-default" id="btnSearch" title="${text('查询')}"><i class="fa fa-filter"></i> ${text('查询')}</a>
<a href="#" class="btn btn-default" id="btnExport"><i class="glyphicon glyphicon-export"></i> ${text('导出')}</a>
<% if(hasPermi('sys:empUser:edit')){ %> <% if(hasPermi('sys:empUser:edit')){ %>
<a href="#" class="btn btn-default" id="btnImport"><i class="glyphicon glyphicon-import"></i> ${text('导入')}</a>
<a href="${ctx}/sys/empUser/form?op=add" class="btn btn-default btnTool" title="${text('新增用户')}"><i class="fa fa-plus"></i> ${text('新增')}</a> <a href="${ctx}/sys/empUser/form?op=add" class="btn btn-default btnTool" title="${text('新增用户')}"><i class="fa fa-plus"></i> ${text('新增')}</a>
<% } %> <% } %>
<div class="btn-group"> <a href="#" class="btn btn-default" id="btnSetting" title="${text('设置')}"><i class="fa fa-navicon"></i></a>
<!-- <div class="btn-group">
<a href="javascript:" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> <a href="javascript:" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-navicon"></i> <span class="caret"></span> <i class="fa fa-navicon"></i> <span class="caret"></span>
</a> </a>
@@ -19,40 +22,40 @@
<li><a href="javascript:" id="btnImport"><i class="glyphicon glyphicon-import"></i> ${text('导入')}</a></li> <li><a href="javascript:" id="btnImport"><i class="glyphicon glyphicon-import"></i> ${text('导入')}</a></li>
<li><a href="javascript:" id="btnSetting"><i class="fa fa-navicon"></i> ${text('设置')}</a></li> <li><a href="javascript:" id="btnSetting"><i class="fa fa-navicon"></i> ${text('设置')}</a></li>
</ul> </ul>
</div> </div> -->
</div> </div>
</div> </div>
<div class="box-body"> <div class="box-body">
<#form:form id="searchForm" model="${empUser}" action="${ctx}/sys/empUser/listData" method="post" class="form-inline " <#form:form id="searchForm" model="${empUser}" action="${ctx}/sys/empUser/listData" method="post" class="form-inline "
data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}"> data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
<#form:hidden name="ctrlPermi" value="${@Global.getConfig('user.adminCtrlPermi', '2')}"/> <#form:hidden name="ctrlPermi" value="${@Global.getConfig('user.adminCtrlPermi', '2')}"/>
<div class="form-group"> <div class="form-group">
<label class="control-label">${text('账号')}：</label> <label class="control-label">${text('账号')}：</label>
<div class="control-inline"> <div class="control-inline">
<#form:input path="loginCode" maxlength="100" class="form-control width-90"/> <#form:input path="loginCode" maxlength="100" class="form-control width-90"/>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-label">${text('昵称')}：</label> <label class="control-label">${text('昵称')}：</label>
<div class="control-inline"> <div class="control-inline">
<#form:input path="userName" maxlength="100" class="form-control width-90"/> <#form:input path="userName" maxlength="100" class="form-control width-90"/>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-label">${text('姓名')}：</label> <label class="control-label">${text('姓名')}：</label>
<div class="control-inline"> <div class="control-inline">
<#form:input path="refName" maxlength="100" class="form-control width-90"/> <#form:input path="refName" maxlength="100" class="form-control width-90"/>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-label">${text('手机')}：</label> <label class="control-label">${text('手机')}：</label>
<div class="control-inline"> <div class="control-inline">
<#form:input path="mobile" maxlength="100" class="form-control width-90"/> <#form:input path="mobile" maxlength="100" class="form-control width-90"/>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-label">${text('状态')}：</label> <label class="control-label">${text('状态')}：</label>
<div class="control-inline width-60"> <div class="control-inline width-90">
<#form:select path="status" dictType="sys_user_status" blankOption="true" class="form-control isQuick"/> <#form:select path="status" dictType="sys_user_status" blankOption="true" class="form-control isQuick"/>
</div> </div>
</div> </div>
@@ -87,19 +90,26 @@
<#form:input path="email" maxlength="300" class="form-control width-90"/> <#form:input path="email" maxlength="300" class="form-control width-90"/>
</div> </div>
</div> </div>
<div class="form-group">
<label class="control-label">${text('岗位')}：</label>
<div class="control-inline width-90">
<#form:select name="employee.postCode" items="${postList}"
itemLabel="postName" itemValue="postCode" blankOption="true" class="form-control"/>
</div>
</div>
<div class="form-group"> <div class="form-group">
<label class="control-label">${text('电话')}：</label> <label class="control-label">${text('电话')}：</label>
<div class="control-inline"> <div class="control-inline">
<#form:input path="phone" maxlength="100" class="form-control width-90"/> <#form:input path="phone" maxlength="100" class="form-control width-90"/>
</div> </div>
</div> </div>
<div class="form-group">
<label class="control-label">${text('岗位')}：</label>
<div class="control-inline width-90">
<#form:select name="employee.postCode" items="${postList}"
itemLabel="postName" itemValue="postCode" blankOption="true" class="form-control isQuick"/>
</div>
</div>
<div class="form-group">
<label class="control-label">${text('角色')}：</label>
<div class="control-inline width-120">
<#form:select name="roleCode" items="${roleList}"
itemLabel="roleName" itemValue="roleCode" blankOption="true" class="form-control isQuick"/>
</div>
</div>
</div> </div>
</#form:form> </#form:form>
<table id="dataGrid"></table> <table id="dataGrid"></table>