From d7a58eb17814af2a16ee13afaf93acda09745ed9 Mon Sep 17 00:00:00 2001
From: bingbing <zhaobingliang@aliyun.com>
Date: Wed, 22 Jul 2020 22:10:35 +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/company.html | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/company.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/company.html
index 8a0370f..b22a17e 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/company.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/company.html
@@ -164,18 +164,18 @@
page: true,
cols: [[
{ type: 'numbers' },
- { field: 'companyName', width: 180, sort: true, title: '公司名称' },
- { field: 'companyProvince', width: 200, sort: true, title: '省' },
- { field: 'companyCity', width: 180, sort: true, title: '市' },
- { field: 'companyArea', width: 300, sort: true, title: '区县' },
- { field: 'companyTel', width: 250, align: 'center', sort: true, title: '联系方式' },
- { field: 'tenantId', width: 250, align: 'center', sort: true, title: '应用' },
- { field: 'enabled', width: 250, align: 'center', templet: '#company-tpl-state', 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: 'id', width: 250, align: 'center', toolbar: '#company-table-bar', sort: true, title: '操作' },
+ { field: 'companyName', width: 180, title: '公司名称' },
+ { field: 'companyProvince', width: 200, title: '省' },
+ { field: 'companyCity', width: 180, title: '市' },
+ { field: 'companyArea', width: 300, title: '区县' },
+ { field: 'companyTel', width: 250, align: 'center', title: '联系方式' },
+ { field: 'tenantId', width: 250, align: 'center', title: '应用' },
+ { field: 'enabled', width: 250, align: 'center', templet: '#company-tpl-state', title: '状态' },
+ { 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: '#company-table-bar', title: '操作' },
]],
- done:function(){
- permissionsInput();
+ done:function(res){
+ permissionsInput(res,config);
}
});
@@ -189,7 +189,7 @@
layer.closeAll('loading');
if (data.code == 0) {
layer.msg(data.msg, { icon: 1, time: 500 });
- //table.reload('table-user', {});
+ table.reload('table-user', {});
} else {
layer.msg(data.msg, { icon: 2, time: 500 });
$(obj.elem).prop('checked', !obj.elem.checked);
--
Gitblit v1.8.0