1
0
mirror of https://github.com/chatopera/cosin.git synced 2025-08-01 16:38:02 +08:00

Merge branch 'develop' of github.com:chatopera/cosin into develop

This commit is contained in:
Hai Liang Wang 2018-09-04 19:08:21 +08:00
commit 2aabfc529a
2 changed files with 4 additions and 4 deletions

View File

@ -3,7 +3,7 @@
<h1 class="site-h1" style="background-color:#FFFFFF;">
组织机构
<span style="float:right;">
<button class="layui-btn layui-btn-small green" href="/admin/organ/add.html<#if organData>?parent=${organData.id!''}</#if>" id="areaadd" data-toggle="ajax" data-height="400" data-width="650" data-title="创建新用户">
<button class="layui-btn layui-btn-small green" href="/admin/organ/add.html<#if organData>?parent=${organData.id!''}</#if>" id="areaadd" data-toggle="ajax" data-height="400" data-width="650" data-title="创建新部门">
创建部门
</button>
</span>
@ -19,7 +19,7 @@
<#if organData??>${organData.name!''}<#else>默认机构</#if><#if userList??>${userList?size!''}</#if>
<span style="float:right;">
<#if organData??>
<button class="layui-btn layui-btn-small green" href="/admin/organ/seluser.html?organ=${organData.id!''}" data-toggle="ajax" data-width="750" data-title="创建新用户">
<button class="layui-btn layui-btn-small green" href="/admin/organ/seluser.html?organ=${organData.id!''}" data-toggle="ajax" data-width="750" data-title="添加用户到当前部门">
添加用户到当前部门
</button>
<button class="layui-btn layui-btn-primary layui-btn-small" href="/admin/organ/area.html?id=${organData.id}" data-toggle="ajax" data-width="450" data-height="400" data-title="地区设置">

View File

@ -66,7 +66,7 @@
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
<ul class="ukewo-btn-group">
<li <#if subtype == 'content'>class="layui-this"</#if>>
<!-- <li <#if subtype == 'content'>class="layui-this"</#if>>
<a href="/apps/content.html" class="ukefu-bt">
<i class="kfont ukewo-btn">&#xe717;</i>
<div class="ukefu-bt-text">
@ -91,7 +91,7 @@
</div>
</div>
</a>
</li>
</li> -->
<!--
<li>
<a href="" class="ukefu-bt">