From 1ad851e4eb8c972eeb2fee7f2d1d54d3e32068a9 Mon Sep 17 00:00:00 2001 From: zhaoxiaohao <913652501@qq.com> Date: Wed, 15 Jul 2020 09:48:39 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctorTemplete.html | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 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 b3a284e..28ab06e 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,7 +8,6 @@ </div> <div class="layui-card-body"> <div class="layui-form toolbar"> - <button id="docto-templete-btn-add" class="layui-btn icon-btn permissions" permissions="doctortemplete-edit"><i class="layui-icon"></i>添加</button> <select id="templeteType" placeholder="话术类型"> <option value="">-请选择-</option> <option value="0">结论</option> @@ -23,6 +22,7 @@ <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"></i>搜索</button> + <button id="docto-templete-btn-add" class="layui-btn icon-btn permissions" permissions="doctortemplete-edit"><i class="layui-icon"></i>添加</button> </div> <!-- 数据表格 --> @@ -133,12 +133,12 @@ } }, { 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(){ - 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: 500 }); + table.reload('app-table', {}); + } else { + layer.msg(data.msg, { icon: 2, time: 500 }); + } + }, 'delete'); + }); } }); -- Gitblit v1.8.0