From e6a149ea753350d3bebbd76ce40315a8b6016b4e Mon Sep 17 00:00:00 2001
From: bingbing <zhaobingliang@aliyun.com>
Date: Thu, 23 Jul 2020 13:04:47 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev

---
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysOrganization.html |   29 +++++++++++++++++------------
 1 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysOrganization.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysOrganization.html
index 1f9bee4..81bdbde 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysOrganization.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysOrganization.html
@@ -9,8 +9,8 @@
     <div class="layui-card-body">
         <div class="layui-form toolbar">
             <input id="orgName-search" class="layui-input search-input" type="text" placeholder="请输入名称" />&emsp;
-            <button id="app-btn-search" class="layui-btn icon-btn"><i class="layui-icon">&#xe615;</i>搜索</button>
-            <button id="organization-add" class="layui-btn icon-btn"><i class="layui-icon">&#xe654;</i>添加</button>
+            <button id="app-btn-search" class="layui-btn icon-btn permissions" permissions="sysorganization-list"><i class="layui-icon">&#xe615;</i>搜索</button>
+            <button id="organization-add" class="layui-btn icon-btn permissions" permissions="sysorganization-edit"><i class="layui-icon">&#xe654;</i>添加</button>
         </div>
 
         <!-- 数据表格 -->
@@ -20,8 +20,8 @@
 
 <!-- 表格操作列 -->
 <script type="text/html" id="organization-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-primary layui-btn-xs permissions" permissions="sysorganization-edit" lay-event="edit">修改</a>
+    <a class="layui-btn layui-btn-danger layui-btn-xs permissions" permissions="sysorganization-del" lay-event="del">删除</a>
 </script>
 
 <!-- 表格状态列 -->
@@ -132,22 +132,27 @@
                 page: false,
                 cols: [[
                     { type: 'numbers' },
-                    { field: 'orgName', align: 'right', title: '组织名称' },
+                    { field: 'orgName', minWidth: 200, title: '组织名称' },
                     {
                         field: 'orgAttr', align: 'right', title: '所属类型', templet: function (d) {
                             //节点属性（集团/公司/部门等，取值0，1，2，3，4）
                             if (d.orgAttr == 0) {
                                 return "集团";
                             } else if (d.orgAttr == 1) {
-                                return "公司";
+                                return "公司/医院";
                             } else if (d.orgAttr == 2) {
-                                return "部门";
+                                return "部门/科室";
+                            } else {
+                                return "子部门/子科室";
                             }
                         }
                     },
                     { field: 'enabled', align: 'right', sort: true, templet: '#organization-tpl-state', title: '状态' },
                     { toolbar: '#organization-table-bar', align: 'right', align: 'center', title: '操作' }
-                ]]
+                ]],
+                done: function (res) {
+                    permissionsInput(res,config);
+                }
             });
         };
 
@@ -193,8 +198,8 @@
                 }
             }, 'GET');
         });
-         // 添加按钮点击事件
-         $('#organization-add').click(function () {
+        // 添加按钮点击事件
+        $('#organization-add').click(function () {
             showEditModel();
         });
         // 表单提交事件
@@ -255,11 +260,11 @@
                             //将数据赋值
                             $("#orgParentId").val(node.id)
                             $("#orgParentName").val(node.name)
-                            $("#orgLevel").val(node.level+1)
+                            $("#orgLevel").val(node.level + 1)
                             form.render('select');
                         }
                     });
-                    
+
                 } else {
                     layer.msg(data.msg, { icon: 2, time: 500 });
                 }

--
Gitblit v1.8.0