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/doctorTemplete.html |   41 +++++++++++++++++++++++++++++------------
 1 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctorTemplete.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctorTemplete.html
index 51e9a55..de7ca86 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctorTemplete.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctorTemplete.html
@@ -8,8 +8,6 @@
     </div>
     <div class="layui-card-body">
         <div class="layui-form toolbar">
-            <button id="docto-templete-btn-add" class="layui-btn icon-btn"><i class="layui-icon">&#xe654;</i>添加</button>
-            <button id="docto-templete-btn-update" class="layui-btn icon-btn"><i class="layui-icon refresh">&#xe669;</i> 更新</button>
             <select id="templeteType" placeholder="话术类型">
                 <option value="">-请选择-</option>
                 <option value="0">结论</option>
@@ -24,22 +22,23 @@
             <input name="templeteTitle" id="templeteTitle" placeholder="请输入标题名称" type="text"
                 class="layui-input search-input" maxlength="20" />
             <button id="app-btn-search" class="layui-btn icon-btn"><i class="layui-icon">&#xe615;</i>搜索</button>
+            <button id="docto-templete-btn-add" class="layui-btn icon-btn permissions" permissions="doctortemplete-edit"><i class="layui-icon">&#xe654;</i>添加</button>
         </div>
 
         <!-- 数据表格 -->
-        <table class="layui-table" id="app-table" lay-filter="app-table"></table>
+        <table class="layui-table permissions" permissions="doctortemplete-list" id="app-table" lay-filter="app-table"></table>
     </div>
 </div>
 
 <!-- 表格操作列 -->
 <script type="text/html" id="doctor-templete-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="doctortemplete-edit"  lay-event="edit">修改</a>
+    <a class="layui-btn layui-btn-xs permissions" permissions="doctortemplete-del"  lay-event="del">删除</a>
 </script>
 <!-- 表格状态列 -->
 <script type="text/html" id="doctor-templete-tpl-state">
     <input type="checkbox" lay-filter="doctor-templete-tpl-state" value="{{d.id}}" lay-skin="switch" lay-text="正常|锁定"
-           {{d.enabled==true?'checked':''}}/>
+           {{d.enabled==true?'checked':''}} class="permissions" permissions="doctortemplete-enable"/>
 </script>
 
 <!-- 表单弹窗 -->
@@ -56,7 +55,7 @@
         <div class="layui-form-item">
             <label class="layui-form-label">话术类型</label>
             <div class="layui-input-block">
-                <select name="templeteType" placeholder="话术类型" >
+                <select name="templeteType" placeholder="话术类型" lay-verify="required" required>
                     <option value="">-请选择-</option>
                     <option value="0">结论</option>
                     <option value="1">建议</option>
@@ -67,7 +66,7 @@
         <div class="layui-form-item">
             <label class="layui-form-label">开放类型</label>
             <div class="layui-input-block">
-                <select id="publicType-add" name="publicType" placeholder="开放类型" >
+                <select id="publicType-add" name="publicType" placeholder="开放类型" lay-verify="required" required>
                     <option value="">-请选择-</option>
                     <option value="1">公开</option>
                     <option value="0">私有</option>
@@ -82,7 +81,8 @@
         </div>
         <div class="layui-form-item model-form-footer">
             <button class="layui-btn layui-btn-primary"  ew-event="closeDialog" type="button">取消</button>
-            <button class="layui-btn" id="sure" lay-filter="user-form-submit" lay-submit>保存</button>
+            <button class="layui-btn" id="sure" lay-filter="user-form-submit" permissions="	
+            doctortemplete-edit" lay-submit>保存</button>
         </div>
     </form>
 </script>
@@ -118,7 +118,7 @@
                 { field: 'templeteTitle', width: 180, sort: true, title: '标题' },
                 {
                     field: 'publicType', width: 200, sort: true, title: '开放类型', templet: function (d) {
-                        return d.publicType ==true ? "公开" : "私有"
+                        return d.publicType ==true ? "私有" : "公开"
                     }
                 },
                 {
@@ -133,10 +133,13 @@
                     }
                 },
                 { field: 'createUserName', width: 300, sort: true, title: '创建者' },
-                { field: 'createTime', width: 250, sort: true, title: '创建时间', templet: "<div>{{layui.util.toDateString(d.createTime, 'yyyy年MM月dd日 HH:mm:ss')}}</div>" },
+                { 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: '#doctor-templete-tpl-state', title: '状态' },
                 { field: 'recordTitle', width: 300, toolbar: '#doctor-templete-table-bar', sort: true, title: '操作' },
-            ]]
+            ]],
+            done:function(res){
+                permissionsInput(res,config);
+            }
         });
 
         // 工具条点击事件
@@ -145,6 +148,20 @@
             var layEvent = obj.event;
             if (layEvent === 'edit') { // 查看详情
                 showEditModel(data, 2);
+            }else if(layEvent === 'del'){
+                layer.confirm('确定删除此用户吗?', function (i) {
+                    layer.close(i);
+                    layer.load(2);
+                    admin.req('api-opration/doctortemplete/' + obj.data.id, {}, function (data) {
+                        layer.closeAll('loading');
+                        if (data.code == 0) {
+                            layer.msg(data.msg, { icon: 1, time: 500 });
+                            table.reload('app-table', {});
+                        } else {
+                            layer.msg(data.msg, { icon: 2, time: 500 });
+                        }
+                    }, 'delete');
+                });
             }
         });
 

--
Gitblit v1.8.0