From 6fb14149d62199cfcc0448c82eb2f51f9c5181de Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Thu, 31 Dec 2020 16:55:30 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into parter

---
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysOrganization.html |   29 ++++++++++++++---------------
 1 files changed, 14 insertions(+), 15 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 91be0df..9d085e2 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
@@ -8,7 +8,7 @@
     </div>
     <div class="layui-card-body">
         <div class="layui-form toolbar">
-            <input id="orgName-search" class="layui-input search-input" type="text" placeholder="请输入名称" />&emsp;
+            <input id="orgName-search" class="layui-input search-input" type="text" placeholder="按名称" />&emsp;
             <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 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>
+    <!-- <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>
 
 <!-- 表格状态列 -->
@@ -147,8 +147,8 @@
                             }
                         }
                     },
-                    { field: 'enabled', align: 'right', sort: true, templet: '#organization-tpl-state', title: '状态' },
-                    { toolbar: '#organization-table-bar', align: 'right', align: 'center', title: '操作' }
+                    // { 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);
@@ -164,16 +164,16 @@
             if (layEvent === 'edit') { // 查看详情
                 showEditModel(data);
             } else if (layEvent === 'del') {
-                layer.confirm('确定删除此菜单吗？', function () {
+                layer.confirm('确定删除此组织吗？', function () {
                     layer.load(2);
                     let tenantId = $('#menu_clients').val();
                     admin.req('api-user/sysorganization/' + obj.data.id + '?tenantId=' + tenantId, {}, function (data) {
                         layer.closeAll('loading');
                         if (0 === data.code) {
-                            layer.msg(data.msg, { icon: 1, time: 500 });
+                            layer.msg(data.msg, { icon: 1, time: 2000 });
                             renderTable({ tenantId: tenantId });
                         } else {
-                            layer.msg(data.msg, { icon: 2, time: 500 });
+                            layer.msg(data.msg, { icon: 2, time: 2000 });
                         }
                     }, 'DELETE');
                 });
@@ -189,10 +189,10 @@
                 layer.closeAll('loading');
                 if (data.code == 0) {
 
-                    layer.msg(data.msg, { icon: 1, time: 500 });
+                    layer.msg(data.msg, { icon: 1, time: 2000 });
                     renderTable({ access_token: config.clientId, is_del: 0 });
                 } 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');
                 }
@@ -208,12 +208,12 @@
             admin.req('api-user/sysorganization', JSON.stringify(data.field), 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 });
                     layer.closeAll();
                     // treetable.reload('organization-table', {});
                     renderTable({ access_token: config.clientId, is_del: 0 });
                 } else {
-                    layer.msg(data.msg, { icon: 2, time: 500 });
+                    layer.msg(data.msg, { icon: 2, time: 2000 });
                 }
             }, "POST");
             return false;
@@ -235,7 +235,7 @@
                 }
             });
             if (keyword !== '' && searchCount === 0) {
-                layer.msg("没有匹配结果", { icon: 5, time: 500 });
+                layer.msg("没有匹配结果", { icon: 5, time: 2000 });
             } else {
                 treetable.expandAll('#organization-table');
             }
@@ -252,7 +252,6 @@
                         { name: '标签邮件', id: 13 }]
                 }];
                 if (0 === data.code) {
-                    console.log(JSON.stringify(data.data))
                     tree({
                         elem: "#orgParentId-tree",
                         nodes: data.data,
@@ -266,7 +265,7 @@
                     });
 
                 } else {
-                    layer.msg(data.msg, { icon: 2, time: 500 });
+                    layer.msg(data.msg, { icon: 2, time: 2000 });
                 }
             }, 'get');
         }

--
Gitblit v1.8.0