From 52bedc31786cc399336715dc59c63519be654529 Mon Sep 17 00:00:00 2001 From: chenjinlong <$chenjinlong> Date: Thu, 7 Jan 2021 22:31:19 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90User=E3=80=91=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/assets/modular/system/user/user.js | 64 +++++++------------ .../assets/modular/system/user/user_add.js | 4 +- .../assets/modular/system/user/user_edit.js | 21 +++--- .../pages/modular/system/user/user.html | 32 ++++------ .../pages/modular/system/user/user_add.html | 28 ++++---- .../pages/modular/system/user/user_edit.html | 32 ++++++---- 6 files changed, 79 insertions(+), 102 deletions(-) diff --git a/src/main/webapp/assets/modular/system/user/user.js b/src/main/webapp/assets/modular/system/user/user.js index 44e2962b..94fe6211 100644 --- a/src/main/webapp/assets/modular/system/user/user.js +++ b/src/main/webapp/assets/modular/system/user/user.js @@ -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); }); diff --git a/src/main/webapp/assets/modular/system/user/user_add.js b/src/main/webapp/assets/modular/system/user/user_add.js index a63de16c..6e6a838a 100644 --- a/src/main/webapp/assets/modular/system/user/user_add.js +++ b/src/main/webapp/assets/modular/system/user/user_add.js @@ -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; diff --git a/src/main/webapp/assets/modular/system/user/user_edit.js b/src/main/webapp/assets/modular/system/user/user_edit.js index 1db838d7..81ef71bf 100644 --- a/src/main/webapp/assets/modular/system/user/user_edit.js +++ b/src/main/webapp/assets/modular/system/user/user_edit.js @@ -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' + // }); }); \ No newline at end of file diff --git a/src/main/webapp/pages/modular/system/user/user.html b/src/main/webapp/pages/modular/system/user/user.html index 9354b9ea..9dbf0f4d 100644 --- a/src/main/webapp/pages/modular/system/user/user.html +++ b/src/main/webapp/pages/modular/system/user/user.html @@ -19,20 +19,18 @@
- +
- +
- +
- - @if(shiro.hasPermission("/mgr/add")){ - - @} - + + +
@@ -46,21 +44,13 @@
@} \ No newline at end of file diff --git a/src/main/webapp/pages/modular/system/user/user_add.html b/src/main/webapp/pages/modular/system/user/user_add.html index 8a84550b..d6e4347c 100644 --- a/src/main/webapp/pages/modular/system/user/user_add.html +++ b/src/main/webapp/pages/modular/system/user/user_add.html @@ -3,55 +3,55 @@
-
${lang.get("TITLE_BASE_INFO","基本信息")}
+
基本信息
- +
- +
- +
- +
- +
- +
- +
- +
@@ -60,18 +60,18 @@
-
${lang.get("TITLE_DUTY_INFO","职务信息")}
+
职务信息
- +
- +
-
- +
+
- + +
+
+
+ +
+
- +
- +
- +
- +
@@ -42,18 +48,18 @@
-
${lang.get("TITLE_DUTY_INFO","职务信息")}
+
职务信息
- +
- +
@@ -64,8 +70,8 @@
- - + +