Merge branch 'dev'

zhaoxiaohao

2020-11-17 b7265cdd6f3e1fbb0d428c27e5b5e29e34d56953

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

@@ -99,9 +99,9 @@
                    admin.req('api-user/users/'+obj.data.id+'/password', {}, function (data) {
                        layer.closeAll('loading');
                        if (data.ode == 0) {
                            layer.msg(data.msg, {icon: 1, time: 500});
                            layer.msg(data.msg, {icon: 1, time: 2000});
                        } else {
                            layer.msg(data.msg, {icon: 2, time: 500});
                            layer.msg(data.msg, {icon: 2, time: 2000});
                        }
                    }, 'PUT');
                });
@@ -112,10 +112,10 @@
                    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');
                });
@@ -182,10 +182,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 +202,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});
                }
            }
        });