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

系统用户与系统角色在系统中尚未使用的字段属性使用隐藏域缺省值，不显示在界面中。

Browse Source 
Signed-off-by: zhangwei <zhangwei@intranet.com>
This commit is contained in:
zhangwei
2018-07-10 16:43:19 +08:00
parent ad2e448e41
commit 73917c8a28
3 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -106,13 +106,13 @@
</div> </div>
<span class="help-inline"><font color="red">*</font> </span> <span class="help-inline"><font color="red">*</font> </span>
</div> </div>
<input type="hidden" name="roleType" value="user"/>
<div class="form-group"> <%-- <div class="form-group">
<label class="col-md-3 control-label"><spring:message code="role_type"/>:</label> <label class="col-md-3 control-label"><spring:message code="role_type"/>:</label>
<div class="col-md-4"><%-- <div class="col-md-4">
<form:input path="roleType" htmlEscape="false" maxlength="50" class="required"/> <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任务"> <span class="help-inline" title="activiti有3种预定义的组类型：security-role、assignment、user 如果使用Activiti Explorer，需要security-role才能看到manage页签，需要assignment才能claim任务">
工作流组用户组类型（security-role：管理员、assignment：可进行任务分配、user：普通用户）</span> --%> 工作流组用户组类型（security-role：管理员、assignment：可进行任务分配、user：普通用户）</span>
<form:select path="roleType" class="form-control"> <form:select path="roleType" class="form-control">
<form:option value="assignment"><spring:message code="task_allot"/></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="security-role"><spring:message code="manager"/></form:option>
@@ -122,7 +122,7 @@
<spring:message code="role_type_info"/></span> <spring:message code="role_type_info"/></span>
</div> </div>
</div> </div>
--%>
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label"><spring:message code="data_range"/>:</label> <label class="col-md-3 control-label"><spring:message code="data_range"/>:</label>
@@ -130,7 +130,7 @@
<form:select path="dataScope" class="form-control"> <form:select path="dataScope" class="form-control">
<form:options items="${fns:getDictList('SYS_DATA_SCOPE')}" itemLabel="itemValue" itemValue="itemCode" htmlEscape="false"/> <form:options items="${fns:getDictList('SYS_DATA_SCOPE')}" itemLabel="itemValue" itemValue="itemCode" htmlEscape="false"/>
</form:select> </form:select>
<span class="help-inline"><spring:message code="data_range_info"/></span> <%-- <span class="help-inline"><spring:message code="data_range_info"/></span> --%>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">

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

@@ -12,12 +12,12 @@
$("#inputForm").validate({ $("#inputForm").validate({
rules: { rules: {
loginId: {remote: "${ctx}/sys/user/checkLoginName?oldLoginId=" + encodeURIComponent('${user.loginId}')}, loginId: {remote: "${ctx}/sys/user/checkLoginName?oldLoginId=" + encodeURIComponent('${user.loginId}')},
'office.name': {officeIsValid: true }, // 'office.name': {officeIsValid: true },
'entity.name': {required: true } 'entity.name': {required: true }
}, },
messages: { messages: {
loginId: {remote: "<spring:message code='name_existed'/>"}, loginId: {remote: "<spring:message code='name_existed'/>"},
'office.name': {officeIsValid: "<spring:message code='company_range'/>"}, // 'office.name': {officeIsValid: "<spring:message code='company_range'/>"},
confirmNewPassword: {equalTo: "<spring:message code='equal_password'/>"} confirmNewPassword: {equalTo: "<spring:message code='equal_password'/>"}
}, },
submitHandler: function(form){ submitHandler: function(form){
@@ -121,7 +121,10 @@
</div> </div>
<span class="help-inline"><font color="red">*</font> </span> <span class="help-inline"><font color="red">*</font> </span>
</div> </div>
<div class="form-group"> <input type="hidden" name="company.id" value="0"/>
<input type="hidden" name="entity.id" value="0"/>
<input type="hidden" name="office.id" value="0"/>
<%-- <div class="form-group">
<label class="col-md-3 control-label"><spring:message code="owner_company"/>:</label> <label class="col-md-3 control-label"><spring:message code="owner_company"/>:</label>
<div class="col-md-4"> <div class="col-md-4">
<sys:treeselect id="company" name="company.id" value="${user.company.id}" labelName="company.name" labelValue="${user.company.name}" <sys:treeselect id="company" name="company.id" value="${user.company.id}" labelName="company.name" labelValue="${user.company.name}"
@@ -143,7 +146,7 @@
<sys:treeselect id="office" name="office.id" value="${user.office.id}" labelName="office.name" labelValue="${user.office.name}" <sys:treeselect id="office" name="office.id" value="${user.office.id}" labelName="office.name" labelValue="${user.office.name}"
title="group" url="/sys/office/treeData?type=3" cssClass="required form-control" notAllowSelectRoot="true"/> title="group" url="/sys/office/treeData?type=3" cssClass="required form-control" notAllowSelectRoot="true"/>
</div> </div>
</div> </div> --%>
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label"><spring:message code="name"/>:</label> <label class="col-md-3 control-label"><spring:message code="name"/>:</label>
@@ -169,8 +172,8 @@
</div> </div>
<span class="help-inline"><font color="red">*</font> </span> <span class="help-inline"><font color="red">*</font> </span>
</div> </div>
<input type="hidden" name="identity" value="0"/>
<div class="form-group"> <%-- <div class="form-group">
<label class="col-md-3 control-label"><spring:message code="identify_mark"></spring:message>:</label> <label class="col-md-3 control-label"><spring:message code="identify_mark"></spring:message>:</label>
<div class="col-md-4 "> <div class="col-md-4 ">
<form:select path="identity" class="selectpicker select2 form-control"> <form:select path="identity" class="selectpicker select2 form-control">
@@ -180,15 +183,15 @@
<span class="help-inline"><font><spring:message code="manager_info"/></font></span> <span class="help-inline"><font><spring:message code="manager_info"/></font></span>
</div> </div>
</div> </div> --%>
<input type="hidden" name="email" value="0"/>
<div class="form-group"> <%-- <div class="form-group">
<label class="col-md-3 control-label"><spring:message code="mail"/>:</label> <label class="col-md-3 control-label"><spring:message code="mail"/>:</label>
<div class="col-md-4"> <div class="col-md-4">
<form:input path="email" htmlEscape="false" maxlength="100" class="required email form-control"/> <form:input path="email" htmlEscape="false" maxlength="100" class="required email form-control"/>
</div> </div>
<span class="help-inline"><font color="red">*</font> </span> <span class="help-inline"><font color="red">*</font> </span>
</div> </div> --%>
<div class="form-group"> <div class="form-group">

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

@@ -95,7 +95,7 @@
<div class="col-md-12 filter-action-select-panle" <div class="col-md-12 filter-action-select-panle"
style="background-color: transparent"> style="background-color: transparent">
<div class="row"> <div class="row">
<div class="col-md-2"> <%-- <div class="col-md-2">
<div class="form-group"> <div class="form-group">
<label><spring:message code="owner_company"/>：</label> <label><spring:message code="owner_company"/>：</label>
@@ -118,7 +118,7 @@
notAllowSelectParent="true"/> notAllowSelectParent="true"/>
</div> </div>
</div> </div> --%>
<div class="col-md-2"> <div class="col-md-2">
@@ -167,12 +167,12 @@
class="table table-striped table-bordered table-condensed"> class="table table-striped table-bordered table-condensed">
<thead> <thead>
<tr> <tr>
<th><spring:message code="company" /></th> <%-- <th><spring:message code="company" /></th>
<th><spring:message code="group" /></th> <th><spring:message code="group" /></th> --%>
<th class="sort-column login_id"><spring:message code="login_name" /></th> <th class="sort-column login_id"><spring:message code="login_name" /></th>
<th class="sort-column name"><spring:message code="name" /></th> <th class="sort-column name"><spring:message code="name" /></th>
<th><spring:message code="identify_mark" /></th> <%-- <th><spring:message code="identify_mark" /></th> --%>
<th><spring:message code="mail" /></th> <%-- <th><spring:message code="mail" /></th> --%>
<th><spring:message code="create_time" /></th> <th><spring:message code="create_time" /></th>
<%--<th>角色</th> --%> <%--<th>角色</th> --%>
<shiro:hasPermission name="sys:user:edit"> <shiro:hasPermission name="sys:user:edit">
@@ -183,12 +183,12 @@
<tbody> <tbody>
<c:forEach items="${page.list}" var="user"> <c:forEach items="${page.list}" var="user">
<tr> <tr>
<td>${user.company.name}</td> <%-- <td>${user.company.name}</td>
<td>${fns:getOfficeDesc(user.office.id)}</td> <td>${fns:getOfficeDesc(user.office.id)}</td> --%>
<td><a href="${ctx}/sys/user/form?id=${user.id}">${user.loginId}</a></td> <td><a href="${ctx}/sys/user/form?id=${user.id}">${user.loginId}</a></td>
<td>${user.name}</td> <td>${user.name}</td>
<td>${user.identity eq 1 ?'管理人员':'普通人员'}</td> <%-- <td>${user.identity eq 1 ?'管理人员':'普通人员'}</td> --%>
<td>${user.email}</td> <%-- <td>${user.email}</td> --%>
<td><fmt:formatDate value="${user.createTime}" <td><fmt:formatDate value="${user.createTime}"
pattern="yyyy-MM-dd HH:mm:ss" /></td> pattern="yyyy-MM-dd HH:mm:ss" /></td>
<shiro:hasPermission name="sys:user:edit"></shiro:hasPermission> <shiro:hasPermission name="sys:user:edit"></shiro:hasPermission>