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 | 33 ++++++++++++++++++---------------
1 files changed, 18 insertions(+), 15 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 24705db..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
@@ -10,7 +10,7 @@
<div class="layui-form toolbar">
<input id="app-edit-search" class="layui-input search-input" type="text" placeholder="请输入公司名称" /> 
<button id="app-btn-search" class="layui-btn icon-btn"><i class="layui-icon"></i>搜索</button>
- <button id="user-btn-add" class="layui-btn icon-btn"><i class="layui-icon"></i>添加</button>
+ <button id="user-btn-add" class="layui-btn icon-btn permissions" permissions="syscompany-edit"><i class="layui-icon"></i>添加</button>
</div>
<!-- 数据表格 -->
@@ -21,8 +21,8 @@
<!-- 表格操作列 -->
<script type="text/html" id="company-table-bar">
<a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">查看详情</a>
- <a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>
- <a class="layui-btn layui-btn-xs" lay-event="del">删除</a>
+ <a class="layui-btn layui-btn-xs permissions" permissions="syscompany-edit" lay-event="edit">编辑</a>
+ <a class="layui-btn layui-btn-xs permissions" permissions="syscompany-del" lay-event="del">删除</a>
</script>
<!-- 表格状态列 -->
<script type="text/html" id="company-tpl-state">
@@ -106,7 +106,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" lay-submit>保存</button>
+ <button class="layui-btn permissions" permissions="syscompany-edit" id="sure" lay-filter="user-form-submit" lay-submit>保存</button>
</div>
</form>
</script>
@@ -164,16 +164,19 @@
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(res){
+ permissionsInput(res,config);
+ }
});
// 修改company状态
@@ -186,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