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

【User】用户管理功能完善

pull/64/head
chenjinlong 2021-01-07 22:31:19 +08:00
parent 407386485a
commit 52bedc3178
6 changed files with 79 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/main/webapp/assets/modular/system/user/user.js
View File

@ -1,14 +1,11 @@
layui.use(['layer', 'form', 'table', 'ztree', 'laydate', 'admin', 'ax', 'func', 'tree', 'util'], function () {
layui.use(['layer', 'form', 'table', 'ztree', 'laydate', 'admin', 'HttpRequest', 'func', 'tree', 'util'], function () {
var layer = layui.layer;
var form = layui.form;
var table = layui.table;
var $ZTree = layui.ztree;
var $ax = layui.ax;
var HttpRequest = layui.HttpRequest;
var laydate = layui.laydate;
var admin = layui.admin;
var func = layui.func;
var tree = layui.tree;
var util = layui.util;
/**
* 系统管理--用户管理
@ -33,14 +30,14 @@ layui.use(['layer', 'form', 'table', 'ztree', 'laydate', 'admin', 'ax', 'func',
return [[
{type: 'checkbox'},
{field: 'userId', hide: true, sort: true, title: '用户id'},
{field: 'account', align: "center", sort: true, title: langs.FIELD_ACCOUNT},
{field: 'name', align: "center", sort: true, title: langs.FIELD_NAME},
{field: 'deptName', align: "center", sort: true, title: langs.FIELD_DEPT},
{field: 'positionName', align: "center", sort: true, title: langs.FIELD_POST},
{field: 'phone', align: "center", sort: true, title: langs.FIELD_PHONE, minWidth: 117},
{field: 'createTime', align: "center", sort: true, title: langs.FIELD_CREATE_TIME, minWidth: 160},
{field: 'status', align: "center", sort: true, templet: '#statusTpl', title: langs.FIELD_STATUS},
{align: 'center', toolbar: '#tableBar', title: langs.FIELD_OPERATION, minWidth: 480}
{field: 'account', align: "center", sort: true, title: '账号'},
{field: 'realName', align: "center", sort: true, title: '姓名'},
{field: 'orgId', align: "center", sort: true, title: '机构'},
{field: 'positionId', align: "center", sort: true, title: '职务'},
{field: 'phone', align: "center", sort: true, title: '电话'},
{field: 'createTime', align: "center", sort: true, title: '创建时间', minWidth: 160},
{field: 'status', align: "center", sort: true, templet: '#statusTpl', title: '状态'},
{align: 'center', toolbar: '#tableBar', title: '操作', minWidth: 300}
]];
};
@ -65,34 +62,20 @@ layui.use(['layer', 'form', 'table', 'ztree', 'laydate', 'admin', 'ax', 'func',
});
};
/**
* 弹出添加用户对话框
*/
// 添加按钮
MgrUser.openAddUser = function () {
//获取多语言
var langs = layui.data('system').lang;
func.open({
title: langs.TITLE_ADD_USER,
content: Feng.ctxPath + '/mgr/user_add',
title: '添加用户',
content: Feng.ctxPath + '/view/user/addView',
tableId: MgrUser.tableId
});
};
/**
* 点击编辑用户按钮时
*
* @param data 点击按钮时候的行数据
*/
// 修改按钮
MgrUser.onEditUser = function (data) {
//获取多语言
var langs = layui.data('system').lang;
func.open({
title: langs.TITLE_EDIT_USER,
content: Feng.ctxPath + '/mgr/user_edit?userId=' + data.userId,
title: '修改用户',
content: Feng.ctxPath + '/view/user/editView?userId=' + data.userId,
tableId: MgrUser.tableId
});
};
@ -134,7 +117,6 @@ layui.use(['layer', 'form', 'table', 'ztree', 'laydate', 'admin', 'ax', 'func',
* @param data 点击按钮时候的行数据
*/
MgrUser.roleAssign = function (data) {
//获取多语言
var langs = layui.data('system').lang;
@ -197,11 +179,12 @@ layui.use(['layer', 'form', 'table', 'ztree', 'laydate', 'admin', 'ax', 'func',
// 渲染表格
var tableResult = table.render({
elem: '#' + MgrUser.tableId,
url: Feng.ctxPath + '/mgr/list',
url: Feng.ctxPath + '/sysUser/page',
page: true,
height: "full-98",
cellMinWidth: 100,
cols: MgrUser.initColumn()
cols: MgrUser.initColumn(),
parseData: Feng.parseData
});
//渲染时间选择框
@ -212,16 +195,15 @@ layui.use(['layer', 'form', 'table', 'ztree', 'laydate', 'admin', 'ax', 'func',
});
// 初始化部门树
var ajax = new $ax(Feng.ctxPath + "/dept/layuiTree", function (data) {
var request = new HttpRequest(Feng.ctxPath + '/hrOrganization/treeLayui', 'get', function (data) {
tree.render({
elem: '#deptTree',
data: data,
data: data.data,
click: MgrUser.onClickDept,
onlyIconControl: true
});
}, function (data) {
});
ajax.start();
request.start();
// 搜索按钮点击事件
$('#btnSearch').click(function () {
@ -256,10 +238,8 @@ layui.use(['layer', 'form', 'table', 'ztree', 'laydate', 'admin', 'ax', 'func',
// 修改user状态
form.on('switch(status)', function (obj) {
var userId = obj.elem.value;
var checked = obj.elem.checked ? true : false;
MgrUser.changeUserStatus(userId, checked);
});

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

@ -8,9 +8,9 @@ var UserInfoDlg = {
}
};
layui.use(['layer', 'form', 'admin', 'laydate', 'ax', 'formSelects'], function () {
layui.use(['layer', 'form', 'admin', 'laydate', 'HttpRequest', 'formSelects'], function () {
var $ = layui.jquery;
var $ax = layui.ax;
var HttpRequest = layui.HttpRequest;
var form = layui.form;
var admin = layui.admin;
var laydate = layui.laydate;

21
src/main/webapp/assets/modular/system/user/user_edit.js
View File

@ -8,20 +8,21 @@ var UserInfoDlg = {
}
};
layui.use(['layer', 'form', 'admin', 'laydate', 'ax', 'formSelects'], function () {
layui.use(['layer', 'form', 'admin', 'laydate', 'HttpRequest', 'formSelects'], function () {
var $ = layui.jquery;
var $ax = layui.ax;
var HttpRequest = layui.HttpRequest;
var form = layui.form;
var admin = layui.admin;
var laydate = layui.laydate;
var layer = layui.layer;
var formSelects = layui.formSelects;
//获取用户信息
var ajax = new $ax(Feng.ctxPath + "/mgr/getUserInfo?userId=" + Feng.getUrlParam("userId"));
var result = ajax.start();
//获取信息详情填充表单
var request = new HttpRequest(Feng.ctxPath + "/sysUser/detail?userId=" + Feng.getUrlParam("userId"), 'get');
var result = request.start();
form.val('userForm', result.data);
// 点击部门时
$('#deptName').click(function () {
var formName = encodeURIComponent("parent.UserInfoDlg.data.deptName");
@ -77,9 +78,9 @@ layui.use(['layer', 'form', 'admin', 'laydate', 'ax', 'formSelects'], function (
});
//初始化所有的职位列表
formSelects.config('selPosition', {
searchUrl: Feng.ctxPath + "/position/listPositions?userId=" + $("#userId").val(),
keyName: 'name',
keyVal: 'positionId'
});
// formSelects.config('selPosition', {
// searchUrl: Feng.ctxPath + "/position/listPositions?userId=" + $("#userId").val(),
// keyName: 'name',
// keyVal: 'positionId'
// });
});

32
src/main/webapp/pages/modular/system/user/user.html
View File

@ -19,20 +19,18 @@
<div class="layui-card">
<div class="layui-card-body">
<div class="layui-form toolbar">
<input id="defaultPassword" class="layui-input" type="hidden" value="${constants.getDefaultPassword()}"/>
<div class="layui-form-item">
<div class="layui-inline">
<input id="name" class="layui-input" type="text" placeholder="${lang.get("TIPS_NAME_PHONE","账号/姓名/手机号")}"/>
<input id="name" class="layui-input" type="text" placeholder=""/>
</div>
<div class="layui-inline">
<input id="timeLimit" class="layui-input" type="text" placeholder="${lang.get("TIPS_REG_TIME","注册时间")}"/>
<input id="timeLimit" class="layui-input" type="text" placeholder=""/>
</div>
<div class="layui-inline">
<button id="btnSearch" class="layui-btn icon-btn"><i class="layui-icon">&#xe615;</i>${lang.get("BTN_SEARCH","搜索")}</button>
@if(shiro.hasPermission("/mgr/add")){
<button id="btnAdd" class="layui-btn icon-btn"><i class="layui-icon">&#xe654;</i>${lang.get("BTN_ADD","添加")}</button>
@}
<button id="btnExp" class="layui-btn icon-btn"><i class="layui-icon">&#xe67d;</i>${lang.get("BTN_EXPORT","导出")}</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="btnExp" class="layui-btn icon-btn"><i class="layui-icon">&#xe67d;</i>导出</button>
</div>
</div>
</div>
@ -46,21 +44,13 @@
</div>
<script type="text/html" id="tableBar">
@if(shiro.hasPermission("/mgr/edit")){
<a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">${lang.get("BTN_EDIT","编辑")}</a>
@}
@if(shiro.hasPermission("/mgr/delete")){
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">${lang.get("BTN_DELETE","删除")}</a>
@}
@if(shiro.hasPermission("/mgr/setRole")){
<a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="roleAssign">${lang.get("BTN_ASSIGN_ROLES","分配角色")}</a>
@}
@if(shiro.hasPermission("/mgr/reset")){
<a class="layui-btn layui-btn-xs" lay-event="reset">${lang.get("BTN_RESET_PASSWORD","重置密码")}</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-normal layui-btn-xs" lay-event="roleAssign">分配角色</a>
<a class="layui-btn layui-btn-xs" lay-event="reset">重置密码</a>
</script>
<script type="text/html" id="statusTpl">
<input type="checkbox" lay-filter="status" value="{{d.userId}}" lay-skin="switch" lay-text="${lang.get("BTN_ACTIVE","激活")}|${lang.get("BTN_DISABLE","作废")}" {{d.status=='ENABLE'?'checked':''}} />
<input type="checkbox" lay-filter="status" value="{{d.userId}}" lay-skin="switch" lay-text="正常|锁定" {{d.statusFlag=='1'?'checked':''}} />
</script>
@}

28
src/main/webapp/pages/modular/system/user/user_add.html
View File

@ -3,55 +3,55 @@
<form class="layui-form" id="userForm" lay-filter="userForm">
<div class="layui-fluid" style="padding-bottom: 75px;">
<div class="layui-card">
<div class="layui-card-header">${lang.get("TITLE_BASE_INFO","基本信息")}</div>
<div class="layui-card-header">基本信息</div>
<div class="layui-card-body">
<div class="layui-form-item layui-row">
<input name="userId" type="hidden"/>
<div class="layui-inline layui-col-md12">
<label class="layui-form-label">${lang.get("FIELD_ACCOUNT","基本信息")}<span style="color: red;">*</span></label>
<label class="layui-form-label">基本信息<span style="color: red;">*</span></label>
<div class="layui-input-block">
<input name="account" placeholder="请输入账号" type="text" class="layui-input" lay-verify="required" required/>
</div>
</div>
<div class="layui-inline layui-col-md12">
<label class="layui-form-label">${lang.get("FIELD_NAME","姓名")}<span style="color: red;">*</span></label>
<label class="layui-form-label">姓名<span style="color: red;">*</span></label>
<div class="layui-input-block">
<input name="name" placeholder="请输入姓名" type="text" class="layui-input" lay-verify="required" required/>
</div>
</div>
<div class="layui-inline layui-col-md12">
<label class="layui-form-label">${lang.get("FIELD_BIRTHDAY","生日")}</label>
<label class="layui-form-label">生日</label>
<div class="layui-input-block">
<input id="birthday" name="birthday" placeholder="请输入生日" type="text" class="layui-input date-icon" autocomplete="off"/>
</div>
</div>
<div class="layui-inline layui-col-md6">
<label class="layui-form-label">${lang.get("FIELD_PASSWORD","密码")}<span style="color: red;">*</span></label>
<label class="layui-form-label">密码<span style="color: red;">*</span></label>
<div class="layui-input-block">
<input name="password" placeholder="请输入密码" type="password" class="layui-input" lay-verify="required|psw" autocomplete="new-password" required/>
</div>
</div>
<div class="layui-inline layui-col-md6">
<label class="layui-form-label">${lang.get("FIELD_REPEAT_PASSWORD","重复密码")}<span style="color: red;">*</span></label>
<label class="layui-form-label">重复密码<span style="color: red;">*</span></label>
<div class="layui-input-block">
<input name="rePassword" placeholder="请输入重复密码" type="password" class="layui-input" autocomplete="new-password" lay-verify="required|repsw" required/>
</div>
</div>
<div class="layui-inline layui-col-md12">
<label class="layui-form-label">${lang.get("FIELD_EMAIL","邮件")}<span style="color: red;">*</span></label>
<label class="layui-form-label">邮件<span style="color: red;">*</span></label>
<div class="layui-input-block">
<input name="email" placeholder="请输入邮箱" type="text" class="layui-input" lay-verify="required|email" autocomplete="off" required/>
</div>
</div>
<div class="layui-inline layui-col-md12">
<label class="layui-form-label">${lang.get("FIELD_SEX","性别")}</label>
<label class="layui-form-label">性别</label>
<div class="layui-input-block">
<input type="radio" name="sex" value="M" title="男" checked/>
<input type="radio" name="sex" value="F" title="女"/>
</div>
</div>
<div class="layui-inline layui-col-md12">
<label class="layui-form-label">${lang.get("FIELD_PHONE","电话")}</label>
<label class="layui-form-label">电话</label>
<div class="layui-input-block">
<input name="phone" placeholder="请输入电话" type="text" class="layui-input"/>
</div>
@ -60,18 +60,18 @@
</div>
</div>
<div class="layui-card">
<div class="layui-card-header">${lang.get("TITLE_DUTY_INFO","职务信息")}</div>
<div class="layui-card-header">职务信息</div>
<div class="layui-card-body">
<div class="layui-form-item layui-row">
<div class="layui-inline layui-col-md12">
<label class="layui-form-label">${lang.get("FIELD_DEPT","部门")}<span style="color: red;">*</span></label>
<label class="layui-form-label">部门<span style="color: red;">*</span></label>
<div class="layui-input-block">
<input id="deptId" name="deptId" type="hidden">
<input id="deptName" name="deptName" placeholder="请输入部门" type="text" class="layui-input" lay-verify="required" required autocomplete="off"/>
</div>
</div>
<div class="layui-inline layui-col-md12">
<label class="layui-form-label">${lang.get("FIELD_POST","职位")}<span style="color: red;">*</span></label>
<label class="layui-form-label">机构<span style="color: red;">*</span></label>
<div class="layui-input-block">
<select name="position" xm-select="selPosition">
<option value="">请选择职位</option>
@ -83,8 +83,8 @@
</div>
</div>
<div class="form-group-bottom text-center">
<button class="layui-btn" lay-filter="btnSubmit" lay-submit>&emsp;${lang.get("BTN_SUBMIT","提交")}&emsp;</button>
<button type="reset" class="layui-btn layui-btn-primary" ew-event="closeDialog">&emsp;${lang.get("BTN_CANCEL","取消")}&emsp;</button>
<button class="layui-btn" lay-filter="btnSubmit" lay-submit>&emsp;提交&emsp;</button>
<button type="reset" class="layui-btn layui-btn-primary" ew-event="closeDialog">&emsp;取消&emsp;</button>
</div>
</form>

32
src/main/webapp/pages/modular/system/user/user_edit.html
View File

@ -3,37 +3,43 @@
<form class="layui-form" id="userForm" lay-filter="userForm">
<div class="layui-fluid" style="padding-bottom: 75px;">
<div class="layui-card">
<div class="layui-card-header">${lang.get("TITLE_BASE_INFO","基本信息")}</div>
<div class="layui-card-header">基本信息</div>
<div class="layui-card-body">
<div class="layui-form-item layui-row">
<input name="userId" id="userId" type="hidden"/>
<div class="layui-inline layui-col-md12">
<label class="layui-form-label">${lang.get("FIELD_NAME","名称")}<span style="color: red;">*</span></label>
<div class="layui-inline layui-col-md6">
<label class="layui-form-label">名称<span style="color: red;">*</span></label>
<div class="layui-input-block">
<input name="name" placeholder="请输入姓名" type="text" class="layui-input" lay-verify="required" required/>
<input name="realName" placeholder="请输入姓名" type="text" class="layui-input" lay-verify="required" required/>
</div>
</div>
<div class="layui-inline layui-col-md6">
<label class="layui-form-label">昵称</label>
<div class="layui-input-block">
<input name="nickName" placeholder="请输入昵称" type="text" class="layui-input" lay-verify="required" required/>
</div>
</div>
<div class="layui-inline layui-col-md12">
<label class="layui-form-label">${lang.get("FIELD_BIRTHDAY","出生日期")}</label>
<label class="layui-form-label">出生日期</label>
<div class="layui-input-block">
<input id="birthday" name="birthday" placeholder="请输入生日" type="text" class="layui-input date-icon" autocomplete="off"/>
</div>
</div>
<div class="layui-inline layui-col-md12">
<label class="layui-form-label">${lang.get("FIELD_EMAIL","邮箱")}<span style="color: red;">*</span></label>
<label class="layui-form-label">邮箱<span style="color: red;">*</span></label>
<div class="layui-input-block">
<input name="email" placeholder="请输入邮箱" type="text" class="layui-input" lay-verify="required|email" required />
</div>
</div>
<div class="layui-inline layui-col-md12">
<label class="layui-form-label">${lang.get("FIELD_SEX","性别")}</label>
<label class="layui-form-label">性别</label>
<div class="layui-input-block">
<input type="radio" name="sex" value="M" title="男" checked/>
<input type="radio" name="sex" value="F" title="女"/>
</div>
</div>
<div class="layui-inline layui-col-md12">
<label class="layui-form-label">${lang.get("FIELD_PHONE","电话")}</label>
<label class="layui-form-label">电话</label>
<div class="layui-input-block">
<input name="phone" placeholder="请输入电话" type="text" class="layui-input"/>
</div>
@ -42,18 +48,18 @@
</div>
</div>
<div class="layui-card">
<div class="layui-card-header">${lang.get("TITLE_DUTY_INFO","职务信息")}</div>
<div class="layui-card-header">职务信息</div>
<div class="layui-card-body">
<div class="layui-form-item layui-row">
<div class="layui-inline layui-col-md12">
<label class="layui-form-label">${lang.get("FIELD_DEPT","部门")}<span style="color: red;">*</span></label>
<label class="layui-form-label">部门<span style="color: red;">*</span></label>
<div class="layui-input-block">
<input id="deptId" name="deptId" type="hidden">
<input id="deptName" name="deptName" placeholder="请输入部门" type="text" class="layui-input" lay-verify="required" required autocomplete="off"/>
</div>
</div>
<div class="layui-inline layui-col-md12">
<label class="layui-form-label">${lang.get("FIELD_POST","职位")}<span style="color: red;">*</span></label>
<label class="layui-form-label">职位<span style="color: red;">*</span></label>
<div class="layui-input-block">
<select name="position" id="position" xm-select="selPosition" lay-verify="required" required>
</select>
@ -64,8 +70,8 @@
</div>
</div>
<div class="form-group-bottom text-center">
<button class="layui-btn" lay-filter="btnSubmit" lay-submit>&emsp;${lang.get("BTN_SUBMIT","提交")}&emsp;</button>
<button type="reset" class="layui-btn layui-btn-primary" ew-event="closeDialog">&emsp;${lang.get("BTN_CANCEL","取消")}&emsp;</button>
<button class="layui-btn" lay-filter="btnSubmit" lay-submit>&emsp;提交&emsp;</button>
<button type="reset" class="layui-btn layui-btn-primary" ew-event="closeDialog">&emsp;取消&emsp;</button>
</div>
</form>