From c5dfc743f410b70f369ba3b708f05a6eb1563929 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Mon, 29 Jun 2020 10:21:28 +0800 Subject: [PATCH] 20200629 代碼提交 --- src/main/resources/templates/febs/views/modules/member/member.html | 109 +++++++++--------------------------------------------- 1 files changed, 18 insertions(+), 91 deletions(-) diff --git a/src/main/resources/templates/febs/views/modules/member/member.html b/src/main/resources/templates/febs/views/modules/member/member.html index f197168..d69a9ee 100644 --- a/src/main/resources/templates/febs/views/modules/member/member.html +++ b/src/main/resources/templates/febs/views/modules/member/member.html @@ -12,44 +12,6 @@ <input type="text" placeholder="手机号/邮箱/邀请码" name="account" autocomplete="off" class="layui-input"> </div> </div> - <div class="layui-inline"> - <label class="layui-form-label layui-form-label-sm">创建时间</label> - <div class="layui-input-inline"> - <input type="text" name="createTime" id="user-createTime" class="layui-input"> - </div> - </div> - <div class="layui-inline"> - <label class="layui-form-label layui-form-label-sm">账号类型</label> - <div class="layui-input-inline"> - <select name="accountType"> - <option value=""></option> - <option value="1">测试账号</option> - <option value="2">正常账号</option> - </select> - </div> - </div> - <div class="layui-inline"> - <label class="layui-form-label layui-form-label-sm">账号状态</label> - <div class="layui-input-inline"> - <select name="accountStatus"> - <option value=""></option> - <option value="0">禁用</option> - <option value="1">正常</option> - </select> - </div> - </div> - <div class="layui-inline"> - <label class="layui-form-label layui-form-label-sm">实名状态</label> - <div class="layui-input-inline"> - <select name="certifyStatus"> - <option value=""></option> - <option value="0">未通过</option> - <option value="1">审核中</option> - <option value="2">审核通过</option> - <option value="2">未实名</option> - </select> - </div> - </div> </div> </div> <div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area"> @@ -58,10 +20,6 @@ </div> <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="reset"> <i class="layui-icon"></i> - </div> - <div class="layui-btn layui-btn-sm layui-btn-primary table-action action-more" - shiro:hasAnyPermissions="user:add,user:update,user:password:reset,user:export"> - <i class="layui-icon"></i> </div> </div> </div> @@ -121,38 +79,18 @@ febs = layui.febs, form = layui.form, table = layui.table, - treeSelect = layui.treeSelect, dropdown = layui.dropdown, $view = $('#febs-user'), $query = $view.find('#query'), $reset = $view.find('#reset'), $searchForm = $view.find('form'), - sortObject = {field: 'createTime', type: null}, - tableIns, - createTimeFrom, - createTimeTo; + sortObject = {field: 'phone', type: null}, + tableIns; form.render(); // 表格初始化 initTable(); - - // 时间组件 - laydate.render({ - elem: '#user-createTime', - range: true, - trigger: 'click' - }); - - // 新增下拉组件 - // 下拉框选择器 - treeSelect.render({ - elem: $view.find('#dept'), - type: 'get', - data: ctx + 'dept/select/tree', - placeholder: '请选择', - search: false - }); // 初始化表格操作栏各个按钮功能 table.on('tool(userTable)', function (obj) { @@ -161,7 +99,6 @@ if (layEvent === 'edit') { febs.modal.open('身份认证', 'modules/member/memberDetail/' + data.id, { - area: $(window).width() <= 1000 ? '100%' : '50%', btn: ['提交', '取消'], yes: function (index, layero) { $('#user-update').find('#submit').trigger('click'); @@ -169,6 +106,11 @@ btn2: function () { layer.closeAll(); } + }); + } + if (layEvent === 'see') { + febs.modal.open( '身份认证', 'modules/member/memberDetail/' + data.id, { + maxmin: true, }); } }); @@ -183,10 +125,7 @@ // 刷新按钮 $reset.on('click', function () { $searchForm[0].reset(); - treeSelect.revokeNode('dept'); sortObject.type = 'null'; - createTimeTo = null; - createTimeFrom = null; tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject}); }); @@ -204,39 +143,27 @@ {title: '账号状态', templet: '#account-status', minWidth: 50,align:'center'}, {title: '审核状态', templet: '#certify-status', minWidth: 80,align:'center'}, {field: 'createTime', title: '注册时间', minWidth: 180,align:'center'}, - {title: '操作', toolbar: '#user-option', minWidth: 140, fixed : 'right'} + {title: '操作', + templet: function (d) { + if (d.certifyStatus === 1) { + return '<a lay-event="edit" shiro:hasPermission="user:update">确认</a>' + }else if(d.certifyStatus === 2){ + return '<a lay-event="see" shiro:hasPermission="user:update">' + +'<i class="layui-icon febs-edit-area febs-blue"></i></a>' + }else { + return '' + } + },minWidth: 200,align:'center'} ]] }); } // 获取查询参数 function getQueryParams() { - var createTime = $searchForm.find('input[name="createTime"]').val(); - if (createTime) { - createTimeFrom = createTime.split(' - ')[0]; - createTimeTo = createTime.split(' - ')[1]; - } return { - startTime: createTimeFrom, - endTime: createTimeTo, account: $searchForm.find('input[name="account"]').val().trim(), - accountStatus: $searchForm.find("select[name='accountStatus']").val(), - accountType: $searchForm.find("select[name='accountType']").val(), - certifyStatus: $searchForm.find("select[name='certifyStatus']").val(), - invalidate_ie_cache: new Date() }; } - function deleteUsers(userIds) { - var currentUserId = currentUser.userId + ''; - if (('' + userIds).split(',').indexOf(currentUserId) !== -1) { - febs.alert.warn('所选用户包含当前登录用户,无法删除'); - return; - } - febs.get(ctx + 'user/delete/' + userIds, null, function () { - febs.alert.success('删除用户成功'); - $query.click(); - }); - } }) </script> \ No newline at end of file -- Gitblit v1.9.1