From 092edcc26c88916dcff65acf094bdafac6fce8fc Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Wed, 22 Jul 2020 15:13:49 +0800
Subject: [PATCH] 修改  添加组织时 org_code为空的bug

---
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/role.html |   28 ++++++++++++++++------------
 1 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/role.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/role.html
index 66ee95e..e16d00b 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/role.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/role.html
@@ -18,7 +18,7 @@
             </select>&emsp;
             <input id="role-edit-value" class="layui-input search-input" type="text" placeholder="输入关键字" />&emsp;
             <button id="role-btn-search" class="layui-btn icon-btn"><i class="layui-icon">&#xe615;</i>搜索</button>
-            <button id="role-btn-add" class="layui-btn icon-btn"><i class="layui-icon">&#xe654;</i>添加</button>
+            <button id="role-btn-add" class="layui-btn icon-btn permissions" permissions="saveOrUpdate"><i class="layui-icon">&#xe654;</i>添加</button>
         </div>
 
         <!-- 数据表格 -->
@@ -102,10 +102,10 @@
 
 <!-- 表格操作列 -->
 <script type="text/html" id="role-table-bar">
-    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">修改</a>
-    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
-    <a class="layui-btn layui-btn-xs" lay-event="auth">权限分配</a>
-    <a class="layui-btn layui-btn-xs" lay-event="auth_role">分配数据权限</a>
+    <a class="layui-btn layui-btn-primary layui-btn-xs permissions" permissions="updateEnabled" lay-event="edit">修改</a>
+    <a class="layui-btn layui-btn-danger layui-btn-xs permissions" permissions="role-del" lay-event="del">删除</a>
+    <a class="layui-btn layui-btn-xs permissions" permissions="menus-granted" lay-event="auth">权限分配</a>
+    <a class="layui-btn layui-btn-xs permissions" permissions="sysroleorganization" lay-event="auth_role">分配数据权限</a>
 </script>
 
 <!-- 表格状态列 -->
@@ -143,14 +143,18 @@
                 { field: 'name', sort: true, title: '角色名' },
                 { field: 'code', sort: true, title: 'Code' },
                 { field: 'tenantId', sort: true, title: '应用标识' },
-                {
-                    field: 'createTime', sort: true, templet: function (d) {
-                        return util.toDateString(d.createTime);
-                    }, title: '创建时间'
-                },
+                // {
+                //     field: 'createTime', sort: true, 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: '#role-tpl-state', title: '状态' },
                 { align: 'center', toolbar: '#role-table-bar', title: '操作', width: 320 }
-            ]]
+            ]],
+            done:function(res){
+                permissionsInput(res,config);
+            }
         });
 
         // 获取应用列表
@@ -239,7 +243,7 @@
             } else if (obj.event === 'auth') {  // 权限分配
                 showMenuDialog(obj.data.id, obj.data.tenantId);
             } else if (obj.event === 'auth_role') {
-                showEditModelRole(data);
+                showEditModelRole(data);//分配数据权限
             }
         });
 

--
Gitblit v1.8.0