From 5f69a549add739b190f46ba7d035e2fe31390e01 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Fri, 17 Jul 2020 09:39:04 +0800
Subject: [PATCH] 添加修改密码的加密的功能

---
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user.html |   35 ++++++++++++++++++++---------------
 1 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user.html
index ffc58cf..1dae744 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user.html
@@ -17,11 +17,11 @@
                 <option value="mobile">手机号</option>
             </select>&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 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 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">&#xe67c;</i>导入
+                <i class="layui-icon permissions" permissions="user-btn-import">&#xe67c;</i>导入 
             </button>
         </div>
 
@@ -32,10 +32,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="org">分配组织</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-xspermissions" permissions="user-del" lay-event="del">删除</a>
 </script>
 
 <!-- 表格状态列 -->
@@ -60,7 +60,7 @@
             elem: '#user-table',
             url: config.base_server + 'api-user/users',
             method: 'GET',
-            headers: { 'Authorization': 'Bearer ' + config.getToken().access_token },
+            headers: { 'Authorization': 'Bearer ' + config.getToken().access_token},
             page: true,
             cols: [[
                 { field: 'id', sort: true, width: 200, title: '标识' },
@@ -72,14 +72,18 @@
                         return d.sex == 0 ? "男" : "女"
                     }, width: 100
                 },
-                {
-                    sort: true, width: 200, templet: function (d) {
-                        return util.toDateString(d.createTime);
-                    }, title: '创建时间'
-                },
+                // {
+                //     sort: true, width: 200, templet: function (d) {
+                //         return util.toDateString(d.createTime);
+                //     }, title: '创建时间'
+                // },
+                { field: 'createTime', width: 250, sort: true, title: '创建时间', templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy/MM/dd HH:mm')}}</div>" },
                 { field: 'enabled', width: 100, sort: true, templet: '#user-tpl-state', title: '状态' },
                 { fixed: 'right', align: 'center', toolbar: '#user-table-bar', title: '操作', width: 300 }
-            ]]
+            ]],
+            done:function(res){
+                permissionsInput(res,config);
+            }
         });
 
         // 添加按钮点击事件
@@ -102,6 +106,7 @@
                         layer.closeAll('loading');
                         if (data.code == 0) {
                             layer.msg(data.msg, { icon: 1, time: 500 });
+                            layer.alert("密码重置为："+data.data, {icon: 1});
                         } else {
                             layer.msg(data.msg, { icon: 2, time: 500 });
                         }

--
Gitblit v1.8.0