Merge branch 'dev'

zhaoxiaohao

2020-09-18 daa697719eb0ddfd170f1ab94c5422a4f5b93951

 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user.html

@@ -11,18 +11,17 @@
            搜索：
            <select id="user-search-key">
                <option value="">-请选择-</option>
                <option value="user_id">ID</option>
                <option value="username">账号</option>
                <option value="nick_name">用户名</option>
                <option value="mobile">手机号</option>
            </select>&emsp;
            <input id="user-search-value" class="layui-input search-input" type="text" placeholder="输入关键字"/>&emsp;
            <input id="user-search-value" class="layui-input search-input" type="text" placeholder="按关键字" />&emsp;
            <button id="user-btn-search" class="layui-btn icon-btn"><i class="layui-icon">&#xe615;</i>搜索</button>
            <button id="user-btn-add" class="layui-btn icon-btn"><i class="layui-icon">&#xe654;</i>添加</button>
            <button id="user-btn-export" class="layui-btn icon-btn"><i class="layui-icon">&#xe601;</i>导出</button>
            <button type="button" class="layui-btn" id="user-btn-import">
                <i class="layui-icon">&#xe67c;</i>导入
            </button>
            <button id="user-btn-add" class="layui-btn icon-btn"><i class="layui-icon permissions" permissions="user-btn-add">&#xe654;</i>添加</button>
<!--            <button id="user-btn-export" class="layui-btn icon-btn"><i class="layui-icon permissions" permissions="user-btn-export">&#xe601;</i>导出</button>-->
<!--            <button type="button" class="layui-btn" id="user-btn-import">-->
<!--                <i class="layui-icon permissions" permissions="user-btn-import">&#xe67c;</i>导入 -->
<!--            </button>-->
        </div>

        <table class="layui-table" id="user-table" lay-filter="user-table"></table>
@@ -32,9 +31,10 @@

<!-- 表格操作列 -->
<script type="text/html" id="user-table-bar">
    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">修改</a>
    <a class="layui-btn layui-btn-xs" lay-event="reset">重置密码</a>
    <a class="layui-btn layui-btn-xs" lay-event="del">删除</a>
    <a class="layui-btn layui-btn-primary layui-btn-xs permissions" permissions="user-btn-add" lay-event="edit">修改</a>
    <a class="layui-btn layui-btn-xs permissions" permissions="user-default-password" lay-event="reset">重置密码</a> 
    <a class="layui-btn layui-btn-xs permissions" permissions="userorg-save" lay-event="org">分配组织</a>
    <a class="layui-btn layui-btn-xs permissions" permissions="user-del" lay-event="del">删除</a>
</script>

<!-- 表格状态列 -->
@@ -62,22 +62,27 @@
            headers:{'Authorization': 'Bearer ' + config.getToken().access_token},
            page: true,
            cols: [[
                {type: 'numbers'},
                {field: 'id', sort: true, title: '用户编号'},
                {field: 'username', sort: true, title: '账号'},
                {field: 'nickname', sort: true, title: '用户名'},
                {field: 'mobile', sort: true, title: '手机号'},
                {sort: true, title: '性别',templet:function (d) {
                        return d.sex==0?"男":"女"
                    }},
                { field: 'username',   width: "150",align: 'center', title: '账号' },
                { field: 'nickname',   width: "150",align: 'center', title: '用户名' },
                { field: 'mobile',   width: "150",align: 'center', title: '手机号' },
                {
                    sort: true, templet: function (d) {
                        return util.toDateString(d.createTime);
                    }, title: '创建时间'
                    sort: true, width: "10%",align: 'center', title: '性别', templet: function (d) {
                        var value="";
                        if(d.sex == 0){
                            value="男";
                        }else if(d.sex == 1){
                            value="女";
                        }
                        return value;
                    }, width: 100
                },
                {field: 'enabled',width: 100, sort: true, templet: '#user-tpl-state', title: '状态'},
                {fixed: 'right', align: 'center', toolbar: '#user-table-bar', title: '操作', width: 195}
            ]]
                { field: 'createTime',  width: "150",align: 'center', sort: true, title: '创建时间', templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy/MM/dd HH:mm')}}</div>" },
                { field: 'enabled',  width: "10%",align: 'center',  templet: '#user-tpl-state', title: '状态' },
                { fixed: 'right',  width: "10%",align: 'center', toolbar: '#user-table-bar', title: '操作', width: 300 }
            ]],
            done:function(res){
                permissionsInput(res,config);
            }
        });

        // 添加按钮点击事件
@@ -99,9 +104,10 @@
                    admin.req('api-user/users/'+obj.data.id+'/password', {}, function (data) {
                        layer.closeAll('loading');
                        if (data.code == 0) {
                            layer.msg(data.msg, {icon: 1, time: 500});
                            layer.msg(data.msg, { icon: 1, time: 2000 });
                            layer.alert("密码重置为："+data.data, {icon: 1});
                        } else {
                            layer.msg(data.msg, {icon: 2, time: 500});
                            layer.msg(data.msg, { icon: 2, time: 2000 });
                        }
                    }, 'PUT');
                });
@@ -112,12 +118,20 @@
                    admin.req('api-user/users/'+obj.data.id, {}, function (data) {
                        layer.closeAll('loading');
                        if (data.code == 0) {
                            layer.msg(data.msg, {icon: 1, time: 500});
                            layer.msg(data.msg, { icon: 1, time: 2000 });
                            table.reload('user-table', {});
                        } else {
                            layer.msg(data.msg, {icon: 2, time: 500});
                            layer.msg(data.msg, { icon: 2, time: 2000 });
                        }
                    }, 'delete');
                });
            } else if (layEvent === "org") {
            admin.putTempData('t_user', data);
                admin.popupCenter({
                    title: "分配组织",
                    path: 'pages/system/user_org_form.html',
                    finish: function () {
                    }
                });
            }
        });
@@ -182,10 +196,10 @@
            }, function (data) {
                layer.closeAll('loading');
                if (data.code == 0) {
                    layer.msg(data.msg, {icon: 1, time: 500});
                    layer.msg(data.msg, { icon: 1, time: 2000 });
                    //table.reload('table-user', {});
                } else {
                    layer.msg(data.msg, {icon: 2, time: 500});
                    layer.msg(data.msg, { icon: 2, time: 2000 });
                    $(obj.elem).prop('checked', !obj.elem.checked);
                    form.render('checkbox');
                }
@@ -202,10 +216,10 @@
            ,headers: {"Authorization" : "Bearer " + config.getToken().access_token}
            ,done: function(data){
                if (data.code == 0) {
                    layer.msg(data.msg, {icon: 1, time: 500});
                    layer.msg(data.msg, { icon: 1, time: 2000 });
                    table.reload('user-table', {});
                } else {
                    layer.msg(data.msg, {icon: 2, time: 500});
                    layer.msg(data.msg, { icon: 2, time: 2000 });
                }
            }
        });