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/sysdictionaries.html |   29 ++++++++++++++++-------------
 1 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysdictionaries.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysdictionaries.html
index 4ac5b2b..b44c3d3 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysdictionaries.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysdictionaries.html
@@ -9,8 +9,8 @@
     <div class="layui-card-body">
         <div class="layui-form toolbar">
             <input id="app-edit-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="user-btn-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="sysdictionaries-list"><i class="layui-icon">&#xe615;</i>搜索</button>
+            <button id="user-btn-add" class="layui-btn icon-btn permissions" permissions="sysdictionaries-edit"><i class="layui-icon">&#xe654;</i>添加</button>
         </div>
 
         <!-- 数据表格 -->
@@ -20,8 +20,8 @@
 
 <!-- 表格操作列 -->
 <script type="text/html" id="dictionaries-table-bar">
-    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">修改</a>
-    <a class="layui-btn layui-btn-xs" lay-event="del">删除</a>
+    <a class="layui-btn layui-btn-primary layui-btn-xs permissions" permissions="sysdictionaries-edit" lay-event="edit">修改</a>
+    <a class="layui-btn layui-btn-xs permissions" permissions="sysdictionaries-del" lay-event="del">删除</a>
 </script>
 <!-- 表格状态列 -->
 <script type="text/html" id="dictionaries-tpl-state">
@@ -114,20 +114,23 @@
             cols: [[
                 { type: 'numbers' },
                 {
-                    field: 'dictionariesClassId', width: 180, sort: true, title: '字典类型', templet: function (d) {
+                    field: 'dictionariesClassId', width: 180, title: '字典类型', templet: function (d) {
                         return d.dictionariesClassId == undefined ? "分类" : "字典"
                     }
                 },
-                { field: 'dictionariesClassName', width: 200, sort: true, title: '字典分类' },
-                { field: 'dictionariesKey', width: 180, sort: true, title: '字典Key' },
-                { field: 'dictionariesName', width: 264, sort: true, title: '字典值' },
-                { field: 'id', width: 250, align: 'center', toolbar: '#dictionaries-tpl-state', sort: true, title: '状态' },// 0就诊数据 1筛查
-                { field: 'createTime', width: 250, sort: true, title: '创建时间', templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy年MM月dd日 HH:mm:ss')}}</div>" },
-                { field: 'id', width: 250, align: 'center', toolbar: '#dictionaries-table-bar', sort: true, title: '操作' },// 0就诊数据 1筛查
-            ]]
+                { field: 'dictionariesClassName', width: 200, title: '字典分类' },
+                { field: 'dictionariesKey', width: 180, title: '字典Key' },
+                { field: 'dictionariesName', width: 264, title: '字典值' },
+                { field: 'id', width: 250, align: 'center', toolbar: '#dictionaries-tpl-state', title: '状态' },// 0就诊数据 1筛查
+                { field: 'createTime', width: 250, title: '创建时间', templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy-MM-dd HH:mm')}}</div>" },
+                { field: 'id', width: 250, align: 'center', toolbar: '#dictionaries-table-bar', title: '操作' },// 0就诊数据 1筛查
+            ]],
+            done:function(res){
+                permissionsInput(res,config);
+            }
         });
 
-        // 修改菜单类型
+        // 修改类型
         let changeType = function (type) {
 
             if (type == 1) {

--
Gitblit v1.8.0