gitee
/
guns
mirror of https://gitee.com/stylefeng/guns
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/group2-organization'

pull/65/head
fengshuonan 2021-01-12 22:04:12 +08:00
parent e901c50a98 38c23ebfb2
commit dfb121d45a
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/webapp/assets/modular/system/user/user.js
View File

@ -37,7 +37,7 @@ layui.use(['layer', 'form', 'table', 'ztree', 'laydate', 'admin', 'HttpRequest',
{field: 'phone', align: "center", sort: true, title: '电话'}, {field: 'phone', align: "center", sort: true, title: '电话'},
{field: 'createTime', align: "center", sort: true, title: '创建时间', minWidth: 160}, {field: 'createTime', align: "center", sort: true, title: '创建时间', minWidth: 160},
{field: 'status', align: "center", sort: true, templet: '#statusTpl', title: '状态'}, {field: 'status', align: "center", sort: true, templet: '#statusTpl', title: '状态'},
{align: 'center', toolbar: '#tableBar', title: '操作', minWidth: 300} {align: 'center', toolbar: '#tableBar', title: '操作', minWidth: 350}
]]; ]];
}; };

2
src/main/webapp/pages/modular/system/organization/organization.html
View File

@ -47,8 +47,6 @@
<script type="text/html" id="tableBar"> <script type="text/html" id="tableBar">
<a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">修改</a> <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">修改</a>
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a> <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a>
<a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="roleAssign">分配角色</a>
<a class="layui-btn layui-btn-xs" lay-event="reset">重置密码</a>
</script> </script>
<script type="text/html" id="statusTpl"> <script type="text/html" id="statusTpl">

2
src/main/webapp/pages/modular/system/organization/organization_edit.html
View File

@ -11,7 +11,7 @@
<div class="layui-inline layui-col-md12"> <div class="layui-inline layui-col-md12">
<label class="layui-form-label">上级机构<span style="color: red;">*</span></label> <label class="layui-form-label">上级机构<span style="color: red;">*</span></label>
<div class="layui-input-block"> <div class="layui-input-block">
<div id="organizationEditParentSel" class="ew-xmselect-tree"></div> <div id="organization" class="ew-xmselect-tree"></div>
</div> </div>
</div> </div>
<div class="layui-inline layui-col-md12"> <div class="layui-inline layui-col-md12">