From 58a0322e38c2dd733d9bc58e1497c005f2b4dc7a Mon Sep 17 00:00:00 2001 From: thinkgem Date: Mon, 3 May 2021 11:48:39 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=8C=89=E8=A7=92=E8=89=B2=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=EF=BC=9B=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA=E9=97=AE?= =?UTF-8?q?=E7=9A=84=E4=BA=BA=E6=AF=94=E8=BE=83=E5=A4=9A=EF=BC=8C=E6=94=BE?= =?UTF-8?q?=E5=88=B0=E9=86=92=E7=9B=AE=E4=BD=8D=E7=BD=AE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sys/web/user/EmpUserController.java | 8 +++ .../views/modules/sys/user/empUserList.html | 68 +++++++++++-------- 2 files changed, 47 insertions(+), 29 deletions(-) diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java index 49980f0e..47728572 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/EmpUserController.java @@ -87,6 +87,10 @@ public class EmpUserController extends BaseController { @RequiresPermissions("sys:empUser:view") @RequestMapping(value = "list") 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(); model.addAttribute("postList", postService.findList(post)); @@ -427,6 +431,10 @@ public class EmpUserController extends BaseController { if (selectDataJson != null && JSONValidator.from(selectDataJson).validate()){ model.addAttribute("selectData", selectDataJson); } + // 获取角色列表 + Role role = new Role(); + role.setUserType(User.USER_TYPE_MEMBER); + model.addAttribute("roleList", roleService.findList(role)); model.addAttribute("empUser", empUser); return "modules/sys/user/empUserSelect"; } diff --git a/modules/core/src/main/resources/views/modules/sys/user/empUserList.html b/modules/core/src/main/resources/views/modules/sys/user/empUserList.html index 24bedeac..47e6f971 100644 --- a/modules/core/src/main/resources/views/modules/sys/user/empUserList.html +++ b/modules/core/src/main/resources/views/modules/sys/user/empUserList.html @@ -7,10 +7,13 @@
${text('查询')} + ${text('导出')} <% if(hasPermi('sys:empUser:edit')){ %> + ${text('导入')} ${text('新增')} <% } %> -
+ +
- <#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}"> + <#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}"> <#form:hidden name="ctrlPermi" value="${@Global.getConfig('user.adminCtrlPermi', '2')}"/> -
- +
+
- <#form:input path="loginCode" maxlength="100" class="form-control width-90"/> -
-
-
- -
- <#form:input path="userName" maxlength="100" class="form-control width-90"/> -
+ <#form:input path="loginCode" maxlength="100" class="form-control width-90"/> +
+
+
+ +
+ <#form:input path="userName" maxlength="100" class="form-control width-90"/> +
<#form:input path="refName" maxlength="100" class="form-control width-90"/>
-
-
- -
- <#form:input path="mobile" maxlength="100" class="form-control width-90"/> -
+
+
+ +
+ <#form:input path="mobile" maxlength="100" class="form-control width-90"/> +
-
+
<#form:select path="status" dictType="sys_user_status" blankOption="true" class="form-control isQuick"/>
@@ -87,19 +90,26 @@ <#form:input path="email" maxlength="300" class="form-control width-90"/>
-
- -
- <#form:select name="employee.postCode" items="${postList}" - itemLabel="postName" itemValue="postCode" blankOption="true" class="form-control"/> -
-
<#form:input path="phone" maxlength="100" class="form-control width-90"/>
-
+ +
+ +
+ <#form:select name="employee.postCode" items="${postList}" + itemLabel="postName" itemValue="postCode" blankOption="true" class="form-control isQuick"/> +
+
+
+ +
+ <#form:select name="roleCode" items="${roleList}" + itemLabel="roleName" itemValue="roleCode" blankOption="true" class="form-control isQuick"/> +
+