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 | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 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 fc2013c..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
@@ -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 ? "私有" : "公开"
}
},
{
@@ -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