diff --git a/src/main/resources/mappers/system/SysOrgMapper.xml b/src/main/resources/mappers/system/SysOrgMapper.xml index 01bf575..af6b0bc 100644 --- a/src/main/resources/mappers/system/SysOrgMapper.xml +++ b/src/main/resources/mappers/system/SysOrgMapper.xml @@ -5,13 +5,13 @@ - INSERT INTO sys_org(org_name,name,phone,p_id,org_sort,remarks,state) + INSERT INTO sys_org(org_name,contacts,contacts_phone,p_id,org_sort,remarks,state) VALUES ( #{orgName},#{name},#{phone},#{parentId},#{orgSort},#{remarks},#{state} ) - UPDATE sys_org SET org_name = #{orgName},name = #{name},phone = #{phone},p_id = #{parentId},org_sort = #{orgSort},remarks = #{remarks},state = #{state} + UPDATE sys_org SET org_name = #{orgName},contacts = #{name},contacts_phone = #{phone},p_id = #{parentId},org_sort = #{orgSort},remarks = #{remarks},state = #{state} WHERE org_id = #{id} @@ -27,8 +27,8 @@ SELECT so.org_id AS id, so.org_name AS orgName, - so.name AS name, - so.phone, + so.contacts AS name, + so.contacts_phone as phone, so.remarks, so.state, p_id AS parentId, diff --git a/src/main/resources/static/js/tools/toolsMge.js b/src/main/resources/static/js/tools/toolsMge.js new file mode 100644 index 0000000..9552058 --- /dev/null +++ b/src/main/resources/static/js/tools/toolsMge.js @@ -0,0 +1,311 @@ +let form, layer, dtree, table, tableIns; +let pageNum = 1, limitSize = 10; // 默认第一页，分页数量为10 +let orgData,selectOrgId; + +layui.config({ + base: "../../js/layui-v2.6.8/dtree/", //此处路径请自行处理, 可以使用绝对路径 +}).extend({ + dtree: 'dtree' +}).use(['form', 'layer', 'table','dtree', 'laydate'], function () { + form = layui.form; + layer = layui.layer; + table = layui.table; + dtree = layui.dtree; + layui.form.render(); + orgData = getOrgTree(); + pages(1, 10, 1); + form.on('switch(is-state)', function (obj) { + console.log(obj); + let url = dataUrl + "/users/updateEnableState"; + let params = { + 'id': this.value, + 'state': obj.elem.checked ? 1 : 0 + } + params={ + encryptedData:encryptCBC(JSON.stringify(params)) + } + ajaxRequest(url, "POST", params, true, function () {}, function (result) { + console.log(result) + reloadData(); + if (result.status === 200) { + parent.layer.msg(result.data, {icon: 1}) + } else if (result.status === 204) { + parent.layer.alert(result.msg, {icon: 2}) + } + }, function (xhr) { + error(xhr) + }); + }); +}) + +function pages(pageNum, pageSize, typeNum) { + let params = getReqParams(pageNum, pageSize, typeNum); + let url = dataUrl + "/users/getList" + ajaxRequest(url, "POST", params, true, function () { + }, function (result) { + console.log(result); + if (result.code === 200) { + if (result.data) { + initTable(result.data, result.limit, result.curr) + laypages(result.count, result.curr, result.limit) + } + } else if (result.code === 500) { + layer.alert(result.msg, {icon: 2}) + } + }, function (xhr) { + error(xhr) + }); + +} + +function laypages(total, page, limit) { + layui.use(['laypage'], function () { + let laypage = layui.laypage; + laypage.render({ + elem: 'voi-page', + count: total, + curr: page, + limit: limit, + limits: [10, 20, 50, 100, 200, 500], + layout: ['prev', 'page', 'next', 'skip', 'count', 'limit'], + groups: 5, + jump: function (obj, first) { + if (!first) { + pageNum = obj.curr, limitSize = obj.limit; + pages(obj.curr, obj.limit, null); + } + } + }); + }) +} + +/*初始化表格*/ +function initTable(dataList, limit, page) { + let loadingMsg = layer.msg("数据加载中,请稍候...", {icon: 16, scrollbar: false, time: 0,}); + tableIns = table.render({ + elem: "#table_data", + height: "full-130", + data: dataList, + limit: limit, + cols: [ + [ + //表头 + {title: "序号", width: 80, unresize: true, align: "center", + templet: function (d) { + return (page - 1) * limit + d.LAY_INDEX; + } + }, + {field: "loginName", title: "送样单位", unresize: true, align: "center"}, + {field: "username", title: "送样人", unresize: true, align: "center"}, + {field: "userCode", title: "送样时间", unresize: true, align: "center"}, + {field: "orgName", title: "送样设备", unresize: true, align: "center"}, + {field: "roleName", title: "收样人", unresize: true, align: "center"}, + {field: "phone", title: "收样时间", unresize: true, align: "center"}, + {field: "userType", title: "试验班组", unresize: true, align: "center"}, + {title: "操作", unresize: true, width: 300, align: "center", + templet: function (d) { + + let html = ''; + // let updaetpwd=""; + let del="" + let edit=""; + html=edit+del; + if(d.delFlag==1){ + return ''; + } + return html; + } + }, + ], + ], + done: function (res, curr, count) { + layer.close(loadingMsg); + table.resize("table_data"); + count || this.elem.next(".layui-table-view").find(".layui-table-header").css("display", "inline-block"); + count || this.elem.next(".layui-table-view").find(".layui-table-box").css("overflow", "auto"); + }, + }); +} + + +// 获取参数 +function getReqParams(page, limit, type) { + let obj = {}; + if (!type) { + obj = { + page: page + "", + limit: limit + "", + userName: $('#userName').val(), + phone: $('#phone').val(), + orgId: $('#orgId').val(), + userType: $('#userType').val(), + }; + } else { + obj = { + page: '1', + limit: '10', + userName: '', + phone:'', + orgId:'', + userType: '', + }; + } + console.log(obj) + obj={ + encryptedData:encryptCBC(JSON.stringify(obj)) + } + return obj; +} + +// 查询/重置 +function query() { + let pattern = new RegExp("[%_<>]"); + if (pattern.test($("#loginName").val())) { + $("#loginName").val(''); + return layer.msg('用户名查询包含特殊字符，请重新输入', { + icon: 2, + time: 2000 //2秒关闭（如果不配置，默认是3秒） + }); + } + if (pattern.test($("#phone").val())) { + $("#phone").val(''); + return layer.msg('手机号查询包含特殊字符，请重新输入', { + icon: 2, + time: 2000 //2秒关闭（如果不配置，默认是3秒） + }); + } + pageNum = 1; + pages(1, limitSize); +} + + +//重置 +function reset() { + pages(1, limitSize, 1) +} + + +function reloadData() { + pages(pageNum, limitSize); +} + +// 新增/修改平台用户 +function addData(id) { + let title = '新增用户' + if (id) { + title = '修改用户'; + } + let param = { + 'id': id + } + openIframe2("addOrEditUser", title, "child/userForm.html", '1000px', '625px', param); +} + +/*删除用户*/ +function delData(id) { + layer.confirm("确定删除吗？", { + move: false + }, function () { + let loadingMsg = layer.msg('数据删除中,请稍候...', {icon: 16, scrollbar: false, time: 0}); + let url = dataUrl + "/users/delById"; + let params = { + 'id': id + } + params={ + encryptedData:encryptCBC(JSON.stringify(params)) + } + ajaxRequest(url, "POST", params, true, function () { + }, function (result) { + layer.close(loadingMsg); // 关闭提示层 + if (result.code === 200) { + parent.layer.msg(result.msg, {icon: 1}) + query() + } else if (result.code === 500) { + layer.alert(result.msg, {icon: 2}) + } + }, function (xhr) { + layer.close(loadingMsg); // 关闭提示层 + error(xhr) + }); + }) +} + +// 启用/停用/解除锁定 +function editUserAccountStatus(id, status, type) { + let url = dataUrl + "/sys/user/editUserAccountStatus?token=" + token; + let params = { + 'id': id, + 'accountStatus': status, + 'type': type + } + ajaxRequest(url, "POST", params, true, function () { + }, function (result) { + if (result.code === 200) { + if(type){ + reloadData(); + } + parent.layer.msg(result.msg, {icon: 1}) + } else if (result.code === 500) { + layer.alert(result.msg, {icon: 2}) + } + }, function (xhr) { + error(xhr) + }); +} + +// 管理员修改密码 +function resetPwd(id) { + let param = { + 'id': id, + 'type': '1' + } + openIframe2("addOrEditUnifyUser", '修改密码', "password.html", '770px', '400px', param); +} + +function getOrgTree() { + let data = []; + let url = dataUrl + '/users/getOrg'; + ajaxRequest(url, "POST", null, true, function () { + }, function (result) { + if (result.code === 200) { + console.log(result,"getOrgTree") + data = result.data; + setOrgTree(data) + } else { + layer.alert(result.msg, {icon: 2}) + } + }, function (xhr) { + error(xhr) + }); + return data; +} + +function setOrgTree(data){ + console.log("data",data) + orgTree = dtree.renderSelect({ + elem: "#orgId", + data: data, + dataFormat: "list", + skin: "laySimple", + line: true, // 显示树线 + checkbar: false, //开启复选框 + done: function (data, url, first) { + console.log($('#orgId').val()) + if (first) { + var params = dtree.dataInit("orgId", $('#orgId').val()); + var selectParam = dtree.selectVal("orgId"); + console.log(params) + } + } + }); +} + +/*下拉选表单赋值*/ +function setSelectValue(list, selectName) { + let html = ''; + $.each(list, function (index, item) { + html += ''; + }) + $('#' + selectName).empty().append(html); + layui.form.render(); +} diff --git a/src/main/resources/static/pages/tools/toolsMge.html b/src/main/resources/static/pages/tools/toolsMge.html new file mode 100644 index 0000000..a845bdb --- /dev/null +++ b/src/main/resources/static/pages/tools/toolsMge.html @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + 用户管理 + + +
+
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+ + +
+ + +
+
+
+
+
+
+
+
+
+ + + + + + + \ No newline at end of file