gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加国际化

Browse Source
This commit is contained in:
zhanghongqing
2018-04-11 11:50:49 +08:00
parent ea1cdfb5f8
commit f94e377819
12 changed files with 752 additions and 522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/main/webapp/WEB-INF/views/sys/dictForm.jsp
View File

@@ -148,17 +148,17 @@
<div class="alert alert-error hide">
<button class="close" data-dismiss="alert"></button>
提交配置出现问题，请看错误提示！
<spring:message code="submit_error"/>
</div>
<div class="alert alert-success hide">
<button class="close" data-dismiss="alert"></button>
表单验证成功！
<spring:message code="form_validate"/>
</div>
<div class="form-body">
<div class="form-group">
<label class="col-md-3 control-label">模块名:</label>
<label class="col-md-3 control-label"><spring:message code="module_name"/>:</label>
<div class="col-md-4">
<form:input path="moduleName" htmlEscape="false" maxlength="50" class="required form-control"/>
</div>
@@ -166,7 +166,7 @@
</div>
<div class="form-group">
<label class="col-md-3 control-label">字典标识:</label>
<label class="col-md-3 control-label"><spring:message code="dict_mark"/>:</label>
<div class="col-md-4">
<form:input path="mark" htmlEscape="false" maxlength="50" class="required form-control"/>
</div>
@@ -174,10 +174,10 @@
</div>
<div class="form-group">
<label class="col-md-3 control-label">词条项</label>
<label class="col-md-3 control-label"><spring:message code="entry"/></label>
<div class="col-md-4">
<span type="button" class="btn black" title="点击添加词条项" id="btn_add_item">
<i class="icon-plus"></i> 添加词条
<i class="icon-plus"></i> <spring:message code="add_entry"/>
</span>
<span class="help-inline"><font color="red">*</font> </span>
</div>
@@ -186,39 +186,39 @@
<div class="col-md-3"></div>
<div id="items" class="col-md-8">
<p id="itemModel" style="display: none;margin-top: 3px;">
标识 <input type="text" class="itemCode" autocomplete="off"/>
值 <input type="text" class="itemValue" autocomplete="off"/>
描述 <input type="text" class="itemDesc" autocomplete="off"/>
可用
<spring:message code="mark"/> <input type="text" class="itemCode" autocomplete="off"/>
<spring:message code="value"/> <input type="text" class="itemValue" autocomplete="off"/>
<spring:message code="describe"/> <input type="text" class="itemDesc" autocomplete="off"/>
<spring:message code="useable"/>
<select class="itemStatus noSelect2">
<option value="1">是</option>
<option value="0">否</option>
<option value="1"><spring:message code="yes"/></option>
<option value="0"><spring:message code="no"/></option>
</select>
可维护
<spring:message code="maintainable"/>
<select class="itemType noSelect2">
<option value="1">是</option>
<option value="0">否</option>
<option value="1"><spring:message code="yes"/></option>
<option value="0"><spring:message code="no"/></option>
</select>
<button type="button" class="btn red delItem" >删除</button>
<button type="button" class="btn red delItem" ><spring:message code="delete"/></button>
</p>
<c:forEach items="${sysDataDictionaryName.dictItemList }" var="dictItem">
<p id="itemModel" style="margin-top: 3px;" >
标识 <input type="text" class="itemCode" value="${dictItem.itemCode}" autocomplete="off" <c:if test="${dictItem.type==0}">readonly="readonly"</c:if>/>
值 <input type="text" class="itemValue" value="${dictItem.itemValue}" autocomplete="off" <c:if test="${dictItem.type==0}">readonly="readonly"</c:if>/>
描述 <input type="text" class="itemDesc" value="${dictItem.itemDesc}" autocomplete="off" <c:if test="${dictItem.type==0}">readonly="readonly"</c:if>/>
可用
<spring:message code="mark"/> <input type="text" class="itemCode" value="${dictItem.itemCode}" autocomplete="off" <c:if test="${dictItem.type==0}">readonly="readonly"</c:if>/>
<spring:message code="value"/> <input type="text" class="itemValue" value="${dictItem.itemValue}" autocomplete="off" <c:if test="${dictItem.type==0}">readonly="readonly"</c:if>/>
<spring:message code="describe"/> <input type="text" class="itemDesc" value="${dictItem.itemDesc}" autocomplete="off" <c:if test="${dictItem.type==0}">readonly="readonly"</c:if>/>
<spring:message code="useabel"/>
<select class="itemStatus noSelect2" <c:if test="${dictItem.type==0}">readonly="readonly"</c:if>>
<option value="1" <c:if test="${dictItem.status==1}">selected</c:if>>是</option>
<option value="0" <c:if test="${dictItem.status==0}">selected</c:if>>否</option>
<option value="1" <c:if test="${dictItem.status==1}">selected</c:if>><spring:message code="yes"/></option>
<option value="0" <c:if test="${dictItem.status==0}">selected</c:if>><spring:message code="no"/></option>
</select>
可维护
<spring:message code="maintain"/>
<select class="itemType noSelect2" <c:if test="${dictItem.type==0}">readonly="readonly"</c:if>>
<option value="1" <c:if test="${dictItem.type==1}">selected</c:if>>是</option>
<option value="0" <c:if test="${dictItem.type==0}">selected</c:if>>否</option>
<option value="1" <c:if test="${dictItem.type==1}">selected</c:if>><spring:message code="yes"/></option>
<option value="0" <c:if test="${dictItem.type==0}">selected</c:if>><spring:message code="no"/></option>
</select>
<c:if test="${dictItem.type==1}">
<button type="button" class="btn red delItem" >删除</button>
<button type="button" class="btn red delItem" ><spring:message code="delete"/></button>
</c:if>
</p>
</c:forEach>
@@ -226,7 +226,7 @@
</div>
<div class="form-group">
<label class="col-md-3 control-label">描述信息:</label>
<label class="col-md-3 control-label"><spring:message code="desc"/>:</label>
<div class="col-md-4">
<form:textarea path="remark" htmlEscape="false" rows="3" maxlength="200" class="span6 form-control"/>
</div>

58
src/main/webapp/WEB-INF/views/sys/dictList.jsp
View File

@@ -46,7 +46,7 @@
}
}
}else {
html.push('<span class="label label-success">暂无修改记录！</span>');
html.push('<span class="label label-success"><spring:message code="nochange"/></span>');
}
return html.join('');
@@ -78,7 +78,7 @@
}
}
}else {
revisions.push('<span class="label label-success">暂无修改记录！</span>');
revisions.push('<span class="label label-success"><spring:message code="nochange"/></span>');
}
@@ -90,13 +90,13 @@
html+="<tbody>";
html+="<tr>";
html+="<th>模块名称：";
html+="<th><spring:message code="module_name"/>：";
html+="</th>";
html+="<td colspan='3'>"+data.moduleName;
html+="</td>";
html+="</tr>";
html+="<tr>";
html+="<th>字典标识：";
html+="<th><spring:message code="dict_mark"/>：";
html+="</th>";
html+="<td colspan='3'>"+data.mark;
html+="</td>";
@@ -104,12 +104,12 @@
html+="<tr>";
html+="<th>运行状态：";
html+="<th><spring:message code="run_state"/>：";
html+="</th>";
html+="<td colspan='3'>";
html+="<table class='table table-bordered table-condensed'>";
html+="<thead>";
html+="<th>标识</th><th>值</th><th>描述</th><th>是否可用</th><th>是否可维护</th>";
html+="<th><spring:message code="mark"/></th><th><spring:message code="value"/></th><th><spring:message code="describe"/></th><th><spring:message code="is_useable"/></th><th><spring:message code="is_maintain"/></th>";
html+="</thead>";
html+="<tbody>";
for(i=0;i<data.dictItemList.length;i++){
@@ -122,16 +122,16 @@
html+="</td>";
html+="<td class='taskStatus'>";
if(data.dictItemList[i].status==1){
html+="<span class='in-progress'>是</span>";
html+="<span class='in-progress'><spring:message code="yes"/></span>";
}else {
html+="<span class='pending'>否</span>";
html+="<span class='pending'><spring:message code="no"/></span>";
}
html+="</td>";
html+="<td class='taskStatus'>";
if(data.dictItemList[i].type==1){
html+="<span class='in-progress'>是</span>";
html+="<span class='in-progress'><spring:message code="yes"/></span>";
}else {
html+="<span class='pending'>否</span>";
html+="<span class='pending'><spring:message code="no"/></span>";
}
html+="</td>";
html+="</tr>";
@@ -147,18 +147,18 @@
html+="<tr>";
html+="<th>创建时间：";
html+="<th><spring:message code="create_time"/>：";
html+="</th>";
html+="<td>"+data.createTime;
html+="</td>";
html+="<th>最后修改时间：";
html+="<th><spring:message code="last_edit_time"/>：";
html+="</th>";
html+="<td>"+data.modifyTime;
html+="</td>";
html+="</tr>";
html+="<tr>";
html+="<th>描述：";
html+="<th><spring:message code="describe"/>：";
html+="</th>";
html+="<td colspan='3'>"+data.remark;
html+="</td>";
@@ -166,7 +166,7 @@
html+="<tr>";
html+="<th>字典修改记录：";
html+="<th><spring:message code="dict_edit_record"/>：";
html+="</th>";
html+="<td colspan='3'>"+revisions.join('');
html+="</td>";
@@ -175,7 +175,7 @@
html+="</table>";
html+="</div>";
top.$.jBox(html,{width: $(document).width()*0.6,height: 480,title:"字典详情", buttons:{"关闭":true}});
top.$.jBox(html,{width: $(document).width()*0.6,height: 480,title:"<spring:message code="dict_detail"/>", buttons:{"关闭":true}});
@@ -229,7 +229,7 @@
<div class="col-md-2">
<div class="form-group">
<label>模块名称：</label>
<label><spring:message code="module_name"/>：</label>
<input id="moduleName" name="moduleName" type="text" maxlength="50" class="form-control" value="${sysDataDictionaryName.moduleName}"/>
</div>
</div>
@@ -237,7 +237,7 @@
<div class="col-md-2">
<div class="form-group">
<label>字典标识：</label>
<label><spring:message code="dict_mark"/>：</label>
<input id="mark" name="mark" type="text" maxlength="50" class="form-control" value="${sysDataDictionaryName.mark}"/>
</div>
</div>
@@ -245,7 +245,7 @@
<div class="col-md-2">
<div class="form-group">
<label>创建时间：</label>
<label><spring:message code="create_time"/>：</label>
<input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
value="<fmt:formatDate value="${sysDataDictionaryName.beginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
</div>
@@ -278,13 +278,13 @@
<table id="contentTable" class="table table-striped table-bordered table-condensed">
<thead>
<tr>
<th class="sort-column module_name" width="15%">模块名</th>
<th class="sort-column mark" width="20%">字典标识</th>
<th class="sort-column create_time" width="15%">创建时间</th>
<th width="17%">描述</th>
<th width="18%">修改记录</th>
<th class="sort-column module_name" width="15%"><spring:message code="module_name"/></th>
<th class="sort-column mark" width="20%"><spring:message code="dict_mark"/></th>
<th class="sort-column create_time" width="15%"><spring:message code="create_time"/></th>
<th width="17%"><spring:message code="describe"/></th>
<th width="18%"><spring:message code="edit_record"/></th>
<shiro:hasPermission name="sys:dict:edit">
<th width="15%">操作</th>
<th width="15%"><spring:message code="operation"/></th>
</shiro:hasPermission>
</tr>
</thead>
@@ -297,25 +297,25 @@
<td><fmt:formatDate value="${dict.createTime}" pattern="yyyy-MM-dd HH:mm:ss"/></td>
<td title="${dict.remark }">${fns:abbr(dict.remark,15)}</td>
<td>
<button class="btn revision popovers purple-stripe" data-content="${dict.revision}">修改记录查看</button>
<button class="btn revision popovers purple-stripe" data-content="${dict.revision}"><spring:message code="edit_record_view"/></button>
</td>
<td>
<div class="btn-group">
<a class="btn btn-primary" href="#"><i class="icon-cogs"></i> 操作</a>
<a class="btn btn-primary" href="#"><i class="icon-cogs"></i> <spring:message code="operation"/></a>
<a class="btn btn-primary dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="javascript:dictDetail('${dict.id}')"><i class="icon-list"></i> 详情</a></li>
<li><a href="javascript:dictDetail('${dict.id}')"><i class="icon-list"></i> <spring:message code="detail"/></a></li>
<li class="divider"></li>
<shiro:hasPermission name="sys:dict:edit">
<li><a href="${ctx}/sys/dict/form?id=${dict.id}" onclick="return confirmx('数据字典在系统中非常重要，您确认要修改吗？', this.href)"><i class="icon-edit"></i> 修改</a></li>
<li><a href="${ctx}/sys/dict/form?id=${dict.id}" onclick="return confirmx('<spring:message code="dict_edit_info"/>', this.href)"><i class="icon-edit"></i> <spring:message code="edit"/></a></li>
<li class="divider"></li>
</shiro:hasPermission>
<shiro:hasPermission name="sys:dict:edit">
<li><a href="${ctx}/sys/dict/delete?id=${dict.id}" onclick="return confirmx('数据字典在系统中非常重要，您确认要删除吗？', this.href)"><i class="icon-trash"></i> 删除</a></li>
<li><a href="${ctx}/sys/dict/delete?id=${dict.id}" onclick="return confirmx('<spring:message code="dict_delete_info"/>', this.href)"><i class="icon-trash"></i> <spring:message code="delete"/></a></li>
</shiro:hasPermission>
</ul>

48
src/main/webapp/WEB-INF/views/sys/menuForm.jsp
View File

@@ -31,13 +31,13 @@
<div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-default" onclick="history.go(-1)">&nbsp;返回&nbsp;</button>
<button type="button" class="btn btn-default" onclick="history.go(-1)">&nbsp;<spring:message code="back"/>&nbsp;</button>
</div>
<h3 class="page-title">
菜单管理
<spring:message code="menuManage"/>
</h3>
<div class="row">
@@ -45,7 +45,7 @@
<div class="portlet box blue">
<div class="portlet-title">
<div class="caption">
<i class="fa fa-gift"></i>菜单<shiro:hasPermission name="sys:menu:edit">${not empty menu.id?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission name="sys:menu:edit">查看</shiro:lacksPermission></div>
<i class="fa fa-gift"></i><spring:message code="menu"/><shiro:hasPermission name="sys:menu:edit">${not empty menu.id?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission name="sys:menu:edit"><spring:message code="show"/></shiro:lacksPermission></div>
<div class="tools">
<a href="javascript:;" class="collapse"> </a>
<a href="#portlet-config" data-toggle="modal" class="config"> </a>
@@ -64,81 +64,81 @@
<form:hidden path="id"/>
<sys:message content="${message}"/>
<div class="form-group">
<label class="col-md-3 control-label">上级菜单:</label>
<label class="col-md-3 control-label"><spring:message code="parent_menu"></spring:message>:</label>
<div class="col-md-4">
<sys:treeselect id="menu" name="parent.id" value="${menu.parent.id}" labelName="parent.name" labelValue="${menu.parent.name}"
title="菜单" url="/sys/menu/treeData" extId="${menu.id}" cssClass="required form-control"/>
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font> 名称:</label>
<label class="col-md-3 control-label"><font color="red">*</font> <spring:message code="menu"/>:</label>
<div class="col-md-4">
<form:input path="name" htmlEscape="false" maxlength="50" class="required form-control"/>
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font>国际化代码:</label>
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="unicode"/>:</label>
<div class="col-md-4">
<form:input path="code" htmlEscape="false" maxlength="50" class="required form-control"/>
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label">链接:</label>
<label class="col-md-3 control-label"><spring:message code="link"/>:</label>
<div class="col-md-4">
<form:input path="href" htmlEscape="false" maxlength="2000" class="form-control"/>
<span class="help-inline">点击菜单跳转的页面</span>
<span class="help-inline"><spring:message code="click_menu_turn"/></span>
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label">目标:</label>
<label class="col-md-3 control-label"><spring:message code="aim"/>:</label>
<div class="col-md-4">
<form:input path="target" htmlEscape="false" maxlength="10" class="form-control"/>
<span class="help-inline">链接地址打开的目标窗口，默认：mainFrame</span>
<span class="help-inline"><spring:message code="link_window_info"/></span>
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label">是否顶部导航菜单:</label>
<label class="col-md-3 control-label"><spring:message code="is_top_menu"/>:</label>
<div class="col-md-4">
<form:radiobutton path="isTop" value="1" />是
<form:radiobutton path="isTop" value="0" checked="true"/>否
<span class="help-inline">该菜单或操作是否顶部导航菜单</span>
<form:radiobutton path="isTop" value="1" /><spring:message code="yes"/>
<form:radiobutton path="isTop" value="0" checked="true"/><spring:message code="no"/>
<span class="help-inline"><spring:message code="is_top_menu_info"/></span>
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label">图标:</label>
<label class="col-md-3 control-label"><spring:message code="icon"/>:</label>
<div class="col-md-4">
<sys:iconselect id="icon" name="icon" value="${menu.icon}"/>
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label">排序:</label>
<label class="col-md-3 control-label"><spring:message code="sort"/>:</label>
<div class="col-md-4">
<form:input path="sort" htmlEscape="false" maxlength="50" class="required digits form-control"/>
<span class="help-inline">排列顺序，升序。</span>
<span class="help-inline"><spring:message code="sort_info"/></span>
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label">可见:</label>
<label class="col-md-3 control-label"><spring:message code="visible"/>:</label>
<div class="col-md-4">
<form:radiobuttons path="isShow" items="${fns:getDictList('SYS_SHOW_HIDE')}" itemLabel="itemValue" itemValue="itemCode" htmlEscape="false" class="required"/>
<span class="help-inline">该菜单或操作是否显示到系统菜单中</span>
<span class="help-inline"><spring:message code="is_show_sysmenu"/></span>
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label">权限标识:</label>
<label class="col-md-3 control-label"><spring:message code="permission_mark"/>:</label>
<div class="col-md-4">
<form:input path="permission" htmlEscape="false" maxlength="100" class="form-control"/>
<span class="help-inline">控制器中定义的权限标识，如：@RequiresPermissions("权限标识")</span>
<span class="help-inline"><spring:message code="control_permission_info"/></span>
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label">备注:</label>
<label class="col-md-3 control-label"><spring:message code="remarks"/>:</label>
<div class="col-md-4">
<form:textarea path="remarks" htmlEscape="false" rows="3" maxlength="200" class="form-control"/>
</div>
@@ -148,8 +148,8 @@
<div class="form-actions">
<div class="row">
<div class="col-md-offset-3 col-md-9">
<shiro:hasPermission name="sys:menu:edit"><button type="submit" class="btn btn-circle blue">&nbsp;&nbsp;保存&nbsp;&nbsp;</button></shiro:hasPermission>
<button type="button" class="btn btn-circle grey-salsa btn-outline" onclick="history.go(-1)">Cancel</button>
<shiro:hasPermission name="sys:menu:edit"><button type="submit" class="btn btn-circle blue">&nbsp;&nbsp;<spring:message code="submit"/>&nbsp;&nbsp;</button></shiro:hasPermission>
<button type="button" class="btn btn-circle grey-salsa btn-outline" onclick="history.go(-1)"><spring:message code="cancel"/></button>
</div>
</div>
</div>

18
src/main/webapp/WEB-INF/views/sys/menuList.jsp
View File

@@ -23,12 +23,12 @@
<div class="theme-panel hidden-xs hidden-sm">
<shiro:hasPermission name="sys:menu:edit"><button type="button" class="btn btn-primary"
onClick="javascript:window.location='${ctx}/sys/menu/form'">&nbsp;新增菜单&nbsp;</button></shiro:hasPermission>
onClick="javascript:window.location='${ctx}/sys/menu/form'">&nbsp;<spring:message code="add"/>&nbsp;</button></shiro:hasPermission>
</div>
<h3 class="page-title">
菜单管理
<spring:message code="menuManage"/>
<small><spring:message code="date_list"/></small>
</h3>
@@ -47,12 +47,12 @@
<sys:message content="${message}"/>
<form id="listForm" method="post">
<table id="treeTable" class="table table-striped table-bordered table-condensed">
<thead><tr><th>名称</th><th>国际化代码</th><th>链接</th><th style="text-align:center;">排序</th><th>可见</th><th>权限标识</th><shiro:hasPermission name="sys:menu:edit"><th>操作</th></shiro:hasPermission></tr></thead>
<thead><tr><th><spring:message code="menu_name"/></th><th><spring:message code="unicode"/></th><th><spring:message code="link"/></th><th style="text-align:center;"><spring:message code="sort"/></th><th><spring:message code="visible"/></th><th><spring:message code="permission_mark"/></th><shiro:hasPermission name="sys:menu:edit"><th><spring:message code="operation"/></th></shiro:hasPermission></tr></thead>
<tbody><c:forEach items="${list}" var="menu">
<tr id="${menu.id}" pId="${menu.parent.id ne 1?menu.parent.id:0}">
<td nowrap><i class="icon-${not empty menu.icon?menu.icon:' hide'}"></i><a href="${ctx}/sys/menu/form?id=${menu.id}">${menu.name}</a></td>
<td>${menu.code}</td>
<td title="${menu.href}">${fns:abbr(menu.href,300)}</td>
<td title="${menu.href}">${fns:abbr(menu.href,30)}</td>
<td style="text-align:center;">
<shiro:hasPermission name="sys:menu:edit">
<input type="hidden" name="ids" value="${menu.id}"/>
@@ -61,18 +61,18 @@
${menu.sort}
</shiro:lacksPermission>
</td>
<td>${menu.isShow eq '1'?'显示':'隐藏'}</td>
<td><c:choose><c:when test="${menu.isShow eq '1'}"><spring:message code="display"/></c:when><c:otherwise><spring:message code="hide"/></c:otherwise></c:choose></td>
<td title="${menu.permission}">${fns:abbr(menu.permission,30)}</td>
<shiro:hasPermission name="sys:menu:edit"><td nowrap>
<a href="${ctx}/sys/menu/form?id=${menu.id}">修改</a>
<a href="${ctx}/sys/menu/delete?id=${menu.id}" onclick="return confirmx('要删除该菜单及所有子菜单项吗？', this.href)">删除</a>
<a href="${ctx}/sys/menu/form?parent.id=${menu.id}">添加下级菜单</a>
<a href="${ctx}/sys/menu/form?id=${menu.id}"><spring:message code="edit"/></a>
<a href="${ctx}/sys/menu/delete?id=${menu.id}" onclick="return confirmx('<spring:message code="delete_all_child"/>', this.href)"><spring:message code="delete"/></a>
<a href="${ctx}/sys/menu/form?parent.id=${menu.id}"><spring:message code="add_child_menu"></spring:message></a>
</td></shiro:hasPermission>
</tr>
</c:forEach></tbody>
</table>
<shiro:hasPermission name="sys:menu:edit"><div class="form-actions pagination-left">
<input id="btnSubmit" class="btn btn-primary" type="button" value="保存排序" onclick="updateSort();"/>
<button id="btnSubmit" class="btn btn-primary" type="button" onclick="updateSort();"><spring:message code="save_sort"/></button>
</div></shiro:hasPermission>
</form>

38
src/main/webapp/WEB-INF/views/sys/officeForm.jsp
View File

@@ -50,14 +50,14 @@
<sys:message content="${message}"/>
<div class="form-body">
<div class="form-group">
<label class="col-md-3 control-label">上级机构:</label>
<label class="col-md-3 control-label"><spring:message code="parent_org"/>:</label>
<div class="col-md-4">
<sys:treeselect id="office" name="parent.id" value="${office.parent.id}" labelName="parent.name" labelValue="${office.parent.name}"
title="机构" url="/sys/office/treeData" extId="${office.id}" cssClass="form-control" allowClear="${office.currentUser.admin}"/>
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label">归属区域:</label>
<label class="col-md-3 control-label"><spring:message code="belong_area"/>:</label>
<div class="col-md-4">
<sys:treeselect id="area" name="area.id" value="${office.area.id}" labelName="area.name" labelValue="${office.area.name}"
title="区域" url="/sys/area/treeData" cssClass="required form-control" allowClear="${office.currentUser.admin}"/>
@@ -65,20 +65,20 @@
<span class="help-inline"><font color="red">*</font></span>
</div>
<div class="form-group">
<label class="col-md-3 control-label">机构名称:</label>
<label class="col-md-3 control-label"><spring:message code="org_name"/>:</label>
<div class="col-md-4">
<form:input path="name" htmlEscape="false" maxlength="50" class="required form-control"/>
</div>
<span class="help-inline"><font color="red">*</font> </span>
</div>
<div class="form-group">
<label class="col-md-3 control-label">机构编码:</label>
<label class="col-md-3 control-label"><spring:message code="org_coding"/>:</label>
<div class="col-md-4">
<form:input path="code" htmlEscape="false" maxlength="50" class="form-control"/>
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label">机构类型:</label>
<label class="col-md-3 control-label"><spring:message code="org_type"/>:</label>
<div class="col-md-4">
<form:select path="type" class="selectpicker select2 form-control">
<form:options items="${fns:getDictList('SYS_OFFICE_TYPE')}" itemLabel="itemValue" itemValue="itemCode" htmlEscape="false"/>
@@ -86,7 +86,7 @@
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label">机构级别:</label>
<label class="col-md-3 control-label"><spring:message code="org_level"/>:</label>
<div class="col-md-4">
<form:select path="grade" class="selectpicker select2 form-control">
<form:options items="${fns:getDictList('SYS_OFFICE_GRADE')}" itemLabel="itemValue" itemValue="itemCode" htmlEscape="false"/>
@@ -94,7 +94,7 @@
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label">机构职责分类:</label>
<label class="col-md-3 control-label"><spring:message code="org_duty_type"/>:</label>
<div class="col-md-4">
<form:select path="jobType" class="selectpicker select2 form-control">
<form:options items="${fns:getDictList('SYS_JOB_TYPE')}" itemLabel="itemValue" itemValue="itemCode" htmlEscape="false"/>
@@ -102,73 +102,73 @@
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label">是否可用:</label>
<label class="col-md-3 control-label"><spring:message code="is_useable"/>:</label>
<div class="col-md-4">
<form:select path="useable" class="selectpicker select2">
<form:options items="${fns:getDictList('SYS_YES_NO')}" itemLabel="itemValue" itemValue="itemCode" htmlEscape="false"/>
</form:select>
<span class="help-inline">“是”代表此账号允许登陆，“否”则表示此账号不允许登陆</span>
<span class="help-inline"><spring:message code="is_useable_info"/></span>
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label">主负责人:</label>
<label class="col-md-3 control-label"><spring:message code="leader"/>:</label>
<div class="col-md-4">
<sys:treeselect id="primaryPerson" name="primaryPerson.id" value="${office.primaryPerson.id}" labelName="office.primaryPerson.name" labelValue="${office.primaryPerson.name}"
title="用户" url="/sys/office/treeData?type=6" allowClear="true" notAllowSelectParent="true" cssClass="form-control"/>
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label">副负责人:</label>
<label class="col-md-3 control-label"><spring:message code="vice_leader"/>:</label>
<div class="col-md-4">
<sys:treeselect id="deputyPerson" name="deputyPerson.id" value="${office.deputyPerson.id}" labelName="office.deputyPerson.name" labelValue="${office.deputyPerson.name}"
title="用户" url="/sys/office/treeData?type=6" allowClear="true" notAllowSelectParent="true" cssClass="form-control"/>
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label">联系地址:</label>
<label class="col-md-3 control-label"><spring:message code="address"/>:</label>
<div class="col-md-4">
<form:input path="address" htmlEscape="false" maxlength="50" class="form-control"/>
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label">邮政编码:</label>
<label class="col-md-3 control-label"><spring:message code="post_code"/>:</label>
<div class="col-md-4">
<form:input path="zipCode" htmlEscape="false" maxlength="50" class="form-control"/>
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label">负责人:</label>
<label class="col-md-3 control-label"><spring:message code="master"/>:</label>
<div class="col-md-4">
<form:input path="master" htmlEscape="false" maxlength="50" class="form-control"/>
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label">电话:</label>
<label class="col-md-3 control-label"><spring:message code="phone"/>:</label>
<div class="col-md-4">
<form:input path="phone" htmlEscape="false" maxlength="50" class="form-control"/>
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label">传真:</label>
<label class="col-md-3 control-label"><spring:message code="fax"/>:</label>
<div class="col-md-4">
<form:input path="fax" htmlEscape="false" maxlength="50" class="form-control"/>
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label">邮箱:</label>
<label class="col-md-3 control-label"><spring:message code="mail"/>:</label>
<div class="col-md-4">
<form:input path="email" htmlEscape="false" maxlength="50" class="form-control"/>
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label">备注:</label>
<label class="col-md-3 control-label"><spring:message code="remarks"/>:</label>
<div class="col-md-4">
<form:textarea path="remarks" htmlEscape="false" rows="3" maxlength="200" class="input-xlarge form-control"/>
</div>
</div>
<c:if test="${empty office.id}">
<div class="form-group">
<label class="col-md-3 control-label">快速添加下级部门:</label>
<label class="col-md-3 control-label"><spring:message code="add_level"/>:</label>
<div class="col-md-4">
<div class="mt-checkbox-inline">
<form:checkboxes path="childDeptList" items="${fns:getDictList('SYS_OFFICE_COMMON')}" itemLabel="itemValue" itemValue="itemCode" htmlEscape="false"/>

8
src/main/webapp/WEB-INF/views/sys/officeList.jsp
View File

@@ -65,7 +65,7 @@
<div class="table-responsive">
<sys:message content="${message}"/>
<table id="treeTable" class="table table-striped table-bordered table-condensed">
<thead><tr><th>机构名称</th><th>归属区域</th><th>机构编码</th><th>所属级别</th><th>机构类型</th><th>机构职责分类</th><th>备注</th><shiro:hasPermission name="sys:office:edit"><th>操作</th></shiro:hasPermission></tr></thead>
<thead><tr><th><spring:message code="org_name"/></th><th><spring:message code="belong_area"/></th><th><spring:message code="org_coding"/></th><th><spring:message code="level"/></th><th><spring:message code="org_type"/></th><th><spring:message code="org_duty_type"/></th><th><spring:message code="remarks"/></th><shiro:hasPermission name="sys:office:edit"><th><spring:message code="operation"/></th></shiro:hasPermission></tr></thead>
<tbody id="treeTableList"></tbody>
</table>
</div>
@@ -84,9 +84,9 @@
<td>{{dict.jobType}}</td>
<td>{{row.remarks}}</td>
<shiro:hasPermission name="sys:office:edit"><td>
<a href="${ctx}/sys/office/form?id={{row.id}}">修改</a>
<a href="${ctx}/sys/office/delete?id={{row.id}}" onclick="return confirmx('要删除该机构及所有子机构项吗？', this.href)">删除</a>
<a href="${ctx}/sys/office/form?parent.id={{row.id}}">添加下级机构</a>
<a href="${ctx}/sys/office/form?id={{row.id}}"><spring:message code="edit"/></a>
<a href="${ctx}/sys/office/delete?id={{row.id}}" onclick="return confirmx('<spring:message code="delete_all_child"/>？', this.href)"><spring:message code="delete"/></a>
<a href="${ctx}/sys/office/form?parent.id={{row.id}}"><spring:message code="add_level"/></a>
</td></shiro:hasPermission>
</tr>
</script>

35
src/main/webapp/WEB-INF/views/sys/roleForm.jsp
View File

@@ -44,10 +44,9 @@
tree.checkNode(node, !node.checked, true, true);
return false;
}}};
// 用户-菜单
var zNodes=[
<c:forEach items="${menuList}" var="menu">{id:"${menu.id}", pId:"${not empty menu.parent.id?menu.parent.id:0}", name:"${not empty menu.parent.id?menu.name:'权限列表'}"},
<c:forEach items="${menuList}" var="menu">{id:"${menu.id}", pId:"${not empty menu.parent.id?menu.parent.id:0}", name:"<c:if test='${not empty menu.parent.id}'><spring:message code="${menu.code}"/></c:if><c:if test='${empty menu.parent.id}'><spring:message code='permission_list'/></c:if>"},
</c:forEach>];
// 初始化树结构
var tree = $.fn.zTree.init($("#menuTree"), setting, zNodes);
@@ -73,13 +72,13 @@
<div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-default" onclick="history.go(-1)">&nbsp;返回&nbsp;</button>
<button type="button" class="btn btn-default" onclick="history.go(-1)">&nbsp;<spring:message code="back"/>&nbsp;</button>
</div>
<h3 class="page-title">
菜单管理
<spring:message code="menuManage"/>
</h3>
<div class="row">
@@ -87,7 +86,7 @@
<div class="portlet box blue">
<div class="portlet-title">
<div class="caption">
<i class="fa fa-gift"></i>角色<shiro:hasPermission name="sys:role:edit">${not empty role.id?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission name="sys:role:edit">查看</shiro:lacksPermission></div>
<i class="fa fa-gift"></i><shiro:hasPermission name="sys:role:edit"><c:if test="${not empty role.id}"><spring:message code="edit"/></c:if><c:if test="${empty role.id}"><spring:message code="add"/></c:if></shiro:hasPermission><shiro:lacksPermission name="sys:role:edit"><spring:message code="show"/></shiro:lacksPermission></div>
<div class="tools">
<a href="javascript:;" class="collapse"> </a>
<a href="#portlet-config" data-toggle="modal" class="config"> </a>
@@ -106,49 +105,49 @@
<sys:message content="${message}"/>
<div class="form-group">
<label class="col-md-3 control-label">角色名称:</label>
<label class="col-md-3 control-label"><spring:message code="role_name"/>:</label>
<div class="col-md-4">
<input id="oldName" name="oldName" type="hidden" value="${role.name}">
<form:input path="name" htmlEscape="false" maxlength="50" class="required form-control"/>
<span class="help-inline"><font color="red">*</font> </span>
</div>
<span class="help-inline"><font color="red">*</font> </span>
</div>
<div class="form-group">
<label class="col-md-3 control-label">角色类型:</label>
<label class="col-md-3 control-label"><spring:message code="role_type"/>:</label>
<div class="col-md-4"><%--
<form:input path="roleType" htmlEscape="false" maxlength="50" class="required"/>
<span class="help-inline" title="activiti有3种预定义的组类型：security-role、assignment、user 如果使用Activiti Explorer，需要security-role才能看到manage页签，需要assignment才能claim任务">
工作流组用户组类型（security-role：管理员、assignment：可进行任务分配、user：普通用户）</span> --%>
<form:select path="roleType" class="form-control">
<form:option value="assignment">任务分配</form:option>
<form:option value="security-role">管理角色</form:option>
<form:option value="user">普通角色</form:option>
<form:option value="assignment"><spring:message code="task_allot"/></form:option>
<form:option value="security-role"><spring:message code="manager"/></form:option>
<form:option value="user"><spring:message code="ordinary_man"/></form:option>
</form:select>
<span class="help-inline" title="activiti有3种预定义的组类型：security-role、assignment、user 如果使用Activiti Explorer，需要security-role才能看到manage页签，需要assignment才能claim任务">
工作流组用户组类型（任务分配：assignment、管理角色：security-role、普通角色：user）</span>
<spring:message code="role_type_info"/></span>
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label">数据范围:</label>
<label class="col-md-3 control-label"><spring:message code="data_range"/>:</label>
<div class="col-md-4">
<form:select path="dataScope" class="form-control">
<form:options items="${fns:getDictList('SYS_DATA_SCOPE')}" itemLabel="itemValue" itemValue="itemCode" htmlEscape="false"/>
</form:select>
<span class="help-inline">特殊情况下，设置为“按明细设置”，可进行跨机构授权</span>
<span class="help-inline"><spring:message code="data_range_info"/></span>
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label">角色授权:</label>
<label class="col-md-3 control-label"><spring:message code="role_permission"/>:</label>
<div class="col-md-4">
<div id="menuTree" class="ztree" style="margin-top:3px;float:left;"></div>
<form:hidden path="menuIds"/>
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label">备注:</label>
<label class="col-md-3 control-label"><spring:message code="remarks"/>:</label>
<div class="col-md-4">
<form:textarea path="remark" htmlEscape="false" rows="3" maxlength="200" class="form-control"/>
</div>
@@ -159,8 +158,8 @@
<div class="form-actions">
<div class="row">
<div class="col-md-offset-3 col-md-9">
<shiro:hasPermission name="sys:role:edit"><button type="submit" class="btn btn-circle blue">&nbsp;&nbsp;保存&nbsp;&nbsp;</button></shiro:hasPermission>
<button type="button" class="btn btn-circle grey-salsa btn-outline" onclick="history.go(-1)">Cancel</button>
<shiro:hasPermission name="sys:role:edit"><button type="submit" class="btn btn-circle blue">&nbsp;&nbsp;<spring:message code="submit"/>&nbsp;&nbsp;</button></shiro:hasPermission>
<button type="button" class="btn btn-circle grey-salsa btn-outline" onclick="history.go(-1)"><spring:message code="cancel"/></button>
</div>
</div>
</div>

17
src/main/webapp/WEB-INF/views/sys/roleList.jsp
View File

@@ -9,18 +9,17 @@
<div class="page-content">
<div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-default">&nbsp;刷新&nbsp;</button>
<button type="button" class="btn btn-default">&nbsp;<spring:message code="refresh"/>&nbsp;</button>
<shiro:hasPermission name="sys:role:edit">
<button type="button" class="btn btn-primary"
onClick="javascript:window.location='${ctx}/sys/role/form'">&nbsp;新增角色&nbsp;</button>
onClick="javascript:window.location='${ctx}/sys/role/form'">&nbsp;<spring:message code="add"/>&nbsp;</button>
</shiro:hasPermission>
</ul>
</div>
<h3 class="page-title">
角色管理
<spring:message code="roleManage"/>
</h3>
<div class="row">
@@ -28,7 +27,7 @@
<div class="portlet box blue">
<div class="portlet-title">
<div class="caption">
<i class="fa fa-cogs"></i>角色列表
<i class="fa fa-cogs"></i><spring:message code="date_list"/>
</div>
<div class="tools">
<a href="javascript:;" class="collapse" data-original-title=""
@@ -50,16 +49,16 @@
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed">
<tr><th>角色名称</th><th>数据范围</th><th>描述</th><shiro:hasPermission name="sys:role:edit"><th>操作</th></shiro:hasPermission></tr>
<tr><th><spring:message code="role_name"/></th><th><spring:message code="data_range"/></th><th><spring:message code="describe"/></th><shiro:hasPermission name="sys:role:edit"><th><spring:message code="operation"/></th></shiro:hasPermission></tr>
<c:forEach items="${list}" var="role">
<tr>
<td><a href="form?id=${role.id}">${role.name}</a></td>
<td>${fns:getDictLabel('SYS_DATA_SCOPE',role.dataScope,'无')}</td>
<td title="${role.remark}">${fns:abbr(role.remark,30)}</td>
<shiro:hasPermission name="sys:role:edit"><td>
<a href="${ctx}/sys/role/assign?id=${role.id}">分配</a>
<a href="${ctx}/sys/role/form?id=${role.id}">修改</a>
<a href="${ctx}/sys/role/delete?id=${role.id}" onclick="return confirmx('确认要删除该角色吗？', this.href)">删除</a>
<a href="${ctx}/sys/role/assign?id=${role.id}"><spring:message code="allot"/></a>
<a href="${ctx}/sys/role/form?id=${role.id}"><spring:message code="edit"/></a>
<a href="${ctx}/sys/role/delete?id=${role.id}" onclick="return confirmx('<spring:message code="sure_delete"/>？', this.href)"><spring:message code="delete"/></a>
</td></shiro:hasPermission>
</tr>
</c:forEach>

32
src/main/webapp/WEB-INF/views/sys/userForm.jsp
View File

@@ -100,7 +100,7 @@
<sys:message content="${message}"/>
<div class="form-body">
<div class="form-group">
<label class="col-md-3 control-label">头像:</label>
<label class="col-md-3 control-label"><spring:message code="name_image"/>:</label>
<div class="col-md-4">
<form:hidden id="nameImage" path="photo" htmlEscape="false" maxlength="255" class="input-xlarge"/>
<sys:ckfinder input="nameImage" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
@@ -108,7 +108,7 @@
</div>
<div class="form-group">
<label class="col-md-3 control-label">登录名:</label>
<label class="col-md-3 control-label"><spring:message code="login_name"/>:</label>
<div class="col-md-4">
<input id="oldLoginId" name="oldLoginId" type="hidden" value="${user.loginId}">
<c:if test="${not empty user.id}" var="exisitUser">
@@ -122,7 +122,7 @@
<span class="help-inline"><font color="red">*</font> </span>
</div>
<div class="form-group">
<label class="col-md-3 control-label">归属公司:</label>
<label class="col-md-3 control-label"><spring:message code="name_image"/>:</label>
<div class="col-md-4">
<sys:treeselect id="company" name="company.id" value="${user.company.id}" labelName="company.name" labelValue="${user.company.name}"
title="公司" url="/sys/office/treeData?type=1" cssClass="required form-control" notAllowSelectRoot="true"/>
@@ -130,7 +130,7 @@
</div>
<div class="form-group">
<label class="col-md-3 control-label">归属单位:</label>
<label class="col-md-3 control-label"><spring:message code="organizer"/>:</label>
<div class="col-md-4">
<sys:treeselect id="entity" name="entity.id" value="${user.entity.id}" labelName="entity.name" labelValue="${user.entity.name}"
title="单位" url="/sys/office/treeData?type=2" cssClass="required form-control" notAllowSelectRoot="true"/>
@@ -138,7 +138,7 @@
</div>
<div class="form-group">
<label class="col-md-3 control-label">归属部门:</label>
<label class="col-md-3 control-label"><spring:message code="owner_group"/>:</label>
<div class="col-md-4">
<sys:treeselect id="office" name="office.id" value="${user.office.id}" labelName="office.name" labelValue="${user.office.name}"
title="部门" url="/sys/office/treeData?type=3" cssClass="required form-control" notAllowSelectRoot="true"/>
@@ -146,7 +146,7 @@
</div>
<div class="form-group">
<label class="col-md-3 control-label">姓名:</label>
<label class="col-md-3 control-label"><spring:message code="name"/>:</label>
<div class="col-md-4">
<form:input path="name" htmlEscape="false" maxlength="50" class="required form-control"/>
</div>
@@ -154,15 +154,15 @@
</div>
<div class="form-group">
<label class="col-md-3 control-label">密码:</label>
<label class="col-md-3 control-label"><spring:message code="password"/>:</label>
<div class="col-md-4">
<input id="newPassword" name="newPassword" type="password" value="" maxlength="50" minlength="3" class="${empty user.id?'required':''} form-control"/>
</div>
<c:if test="${empty user.id}"><span class="help-inline"><font color="red">*</font> </span></c:if>
<c:if test="${not empty user.id}"><span class="help-inline">若不修改密码，请留空。</span></c:if>
<c:if test="${not empty user.id}"><span class="help-inline"><spring:message code="nochange_blank"/></span></c:if>
</div>
<div class="form-group">
<label class="col-md-3 control-label">确认密码:</label>
<label class="col-md-3 control-label"><spring:message code="confirm_password"></spring:message>:</label>
<div class="col-md-4">
<input id="confirmNewPassword" name="confirmNewPassword" type="password" value="" maxlength="50" minlength="3" equalTo="#newPassword" class="form-control"/>
<c:if test="${empty user.id}"></c:if>
@@ -171,19 +171,19 @@
</div>
<div class="form-group">
<label class="col-md-3 control-label">身份标识:</label>
<label class="col-md-3 control-label"><spring:message code="identify_mark"></spring:message>:</label>
<div class="col-md-4 ">
<form:select path="identity" class="selectpicker select2 form-control">
<form:option value="0">普通人员</form:option>
<form:option value="1">管理人员</form:option>
<form:option value="0"><spring:message code="ordinary_man"/></form:option>
<form:option value="1"><spring:message code="manager"/></form:option>
</form:select>
<span class="help-inline"><font>管理人员需指定身份标识为“管理人员”，否则影响审核流程！</font></span>
<span class="help-inline"><font><spring:message code="manager_info"/></font></span>
</div>
</div>
<div class="form-group">
<label class="col-md-3 control-label">邮箱:</label>
<label class="col-md-3 control-label"><spring:message code="mail"/>:</label>
<div class="col-md-4">
<form:input path="email" htmlEscape="false" maxlength="100" class="required email form-control"/>
</div>
@@ -192,7 +192,7 @@
<div class="form-group">
<label class="col-md-3 control-label">用户角色:</label>
<label class="col-md-3 control-label"><spring:message code="role"/>:</label>
<div class="col-md-8">
<div class="mt-checkbox-inline">
@@ -214,7 +214,7 @@
<c:if test="${not empty user.id}">
<div class="form-group">
<label class="col-md-3 control-label">创建时间:</label>
<label class="col-md-3 control-label"><spring:message code="create_time"/>:</label>
<div class="col-md-4">
<label class="lbl form-control"><fmt:formatDate value="${user.createTime}" type="both" dateStyle="full"/></label>
</div>

30
src/main/webapp/WEB-INF/views/sys/userList.jsp
View File

@@ -50,7 +50,7 @@
style="width: 330px" /><br />
<br /> <input id="btnImportSubmit" class="btn btn-primary"
type="submit" value=" 导 入 " /> <a
href="${ctx}/sys/user/import/template">下载模板</a>
href="${ctx}/sys/user/import/template"><spring:message code="template"/>下载模板</a>
</form>
</div>
@@ -98,7 +98,7 @@
<div class="col-md-2">
<div class="form-group">
<label>归属公司：</label>
<label><spring:message code="owner_company"/>：</label>
<sys:treeselect id="company" name="company.id"
value="${user.company.id}" labelName="company.name"
labelValue="${user.company.name}" title="公司"
@@ -111,7 +111,7 @@
<div class="col-md-2">
<div class="form-group">
<label>归属部门：</label>
<label><spring:message code="owner_group"/>：</label>
<sys:treeselect id="office" name="office.id" value="${user.office.id}" labelName="office.name"
labelValue="${user.office.name}" title="部门"
url="/sys/office/treeData?type=3" cssClass="form-control" allowClear="true"
@@ -123,7 +123,7 @@
<div class="col-md-2">
<div class="form-group">
<label>登录名：</label>
<label><spring:message code="login_name"></spring:message>：</label>
<form:input path="loginId" htmlEscape="false" maxlength="50"
class="form-control" />
</div>
@@ -134,7 +134,7 @@
<div class="col-md-2">
<div class="form-group">
<label>姓名：</label>
<label><spring:message code="name"></spring:message>：</label>
<form:input path="name" htmlEscape="false" maxlength="50"
class="form-control" />
</div>
@@ -167,16 +167,16 @@
class="table table-striped table-bordered table-condensed">
<thead>
<tr>
<th>所属公司</th>
<th>所属部门</th>
<th class="sort-column login_id">登录名</th>
<th class="sort-column name">姓名</th>
<th>身份标识</th>
<th>邮箱</th>
<th>创建时间</th>
<th><spring:message code="company" /></th>
<th><spring:message code="group" /></th>
<th class="sort-column login_id"><spring:message code="login_name" /></th>
<th class="sort-column name"><spring:message code="name" /></th>
<th><spring:message code="identify_mark" /></th>
<th><spring:message code="mail" /></th>
<th><spring:message code="create_time" /></th>
<%--<th>角色</th> --%>
<shiro:hasPermission name="sys:user:edit">
<th>操作</th>
<th><spring:message code="operation" /></th>
</shiro:hasPermission>
</tr>
</thead>
@@ -192,9 +192,9 @@
<td><fmt:formatDate value="${user.createTime}"
pattern="yyyy-MM-dd HH:mm:ss" /></td>
<shiro:hasPermission name="sys:user:edit"></shiro:hasPermission>
<td><a href="${ctx}/sys/user/form?id=${user.id}">修改</a> <a
<td><a href="${ctx}/sys/user/form?id=${user.id}"><spring:message code="edit" /></a> <a
href="${ctx}/sys/user/delete?id=${user.id}"
onclick="return confirmx('确认要删除该用户吗？', this.href)">删除</a></td>
onclick="return confirmx('确认要删除该用户吗？', this.href)"><spring:message code="delete" /></a></td>
</tr>
</c:forEach>
</tbody>