From e7c3314727fc06444689c0e6ecab5fea337afeb0 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Fri, 26 Feb 2021 15:24:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysOrganization.html |   37 ++++++++++++++++++-------------------
 1 files changed, 18 insertions(+), 19 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 55df504..9151f11 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,9 +8,9 @@
     </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>
+            <!-- <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>
 
 <!-- 表格状态列 -->
@@ -32,7 +32,7 @@
 
 <!-- 表单弹窗 -->
 <script type="text/html" id="app-model">
-    <form id="app-form" lay-filter="app-form" class="layui-form model-form">
+    <form id="app-form" lay-filter="app-form" class="layui-form model-form" autocomplete="off">
         <input name="id" type="hidden"/>
         <div class="layui-form-item">
             <label class="layui-form-label">请选择：</label>
@@ -147,11 +147,11 @@
                             }
                         }
                     },
-                    { 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 () {
-                    permissionsInput();
+                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