From 88b335cf1352479a5ffdb6305ce42b32e0122622 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Tue, 11 Aug 2020 09:45:14 +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 |   34 +++++++++++++++++++++++-----------
 1 files changed, 23 insertions(+), 11 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 4c9b43c..10d0e88 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
@@ -19,7 +19,7 @@
                 <option value="0">公开-</option>
                 <option value="1">私有</option>
             </select>
-            <input name="templeteTitle" id="templeteTitle" placeholder="请输入标题名称" type="text"
+            <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>
@@ -81,7 +81,7 @@
         </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 permissions" permissions="	
+            <button class="layui-btn" id="sure" lay-filter="user-form-submit" permissions="	
             doctortemplete-edit" lay-submit>保存</button>
         </div>
     </form>
@@ -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 ? "私有" : "公开"
                     }
                 },
                 {
@@ -137,8 +137,8 @@
                 { 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(){
-                permissionsInput();
+            done:function(res){
+                permissionsInput(res,config);
             }
         });
 
@@ -148,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: 2000 });
+                            table.reload('app-table', {});
+                        } else {
+                            layer.msg(data.msg, { icon: 2, time: 2000 });
+                        }
+                    }, 'delete');
+                });
             }
         });
 
@@ -168,10 +182,10 @@
             }, 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 });
                     table.reload('app-table', {});
                 } 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');
                 }
@@ -186,15 +200,14 @@
             }else if (data.field.publicType==0){
                 data.field.publicType=false;
             }
-            console.log(data.field.publicType)
             admin.req('api-opration/doctortemplete', 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();
                     table.reload('app-table', {});
                 } else {
-                    layer.msg(data.msg, { icon: 2, time: 500 });
+                    layer.msg(data.msg, { icon: 2, time: 2000 });
                 }
             }, "POST");
             return false;
@@ -217,7 +230,6 @@
                     $('#app-form')[0].reset();
                     $('#app-form').attr('method', 'POST');
                     if (data) {
-                        console.log(data.publicType == true ? 1 : 0);
                         if(index==1){
                             $('#sure').hide();
                         }

--
Gitblit v1.8.0