From 7ea2a2cfe922c9b2d5c09c737d10a7f1ab5b50d1 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Mon, 01 Mar 2021 14:14:35 +0800
Subject: [PATCH] Merge branch 'dev1.1' into dev

---
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user.html |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 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 7e6454d..bef325a 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,7 +17,7 @@
             </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 permissions" permissions="user-btn-add">&#xe654;</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>导入 -->
@@ -33,8 +33,8 @@
 <script type="text/html" id="user-table-bar">
     <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>
+    <!-- <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,9 +62,9 @@
             headers: { 'Authorization': 'Bearer ' + config.getToken().access_token},
             page: true,
             cols: [[
-                { field: 'username',   width: "10%",align: 'center', title: '账号' },
-                { field: 'nickname',   width: "10%",align: 'center', title: '用户名' },
-                { field: 'mobile',   width: "10%",align: 'center', title: '手机号' },
+                { field: 'username',   width: "150",align: 'center', title: '账号' },
+                { field: 'nickname',   width: "150",align: 'center', title: '用户名' },
+                { field: 'mobile',   width: "150",align: 'center', title: '手机号' },
                 {
                     sort: true, width: "10%",align: 'center', title: '性别', templet: function (d) {
                         var value="";
@@ -76,8 +76,8 @@
                         return value;
                     }, width: 100
                 },
-                { field: 'createTime',  width: "20%",align: 'center', sort: true, title: '创建时间', templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy/MM/dd HH:mm')}}</div>" },
-                { field: 'enabled',  width: "10%",align: 'center', sort: true, templet: '#user-tpl-state', title: '状态' },
+                { 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){

--
Gitblit v1.8.0