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:
zhangshilin
2018-03-28 08:42:32 +08:00
parent 91bad82aa4
commit 379d1e9011
18 changed files with 354 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp
View File

@@ -126,35 +126,35 @@
typeChild:true
},
'isLeaf':{
leafChange:true,
leafHasTree:true
leafChange:true
//leafHasTree:true
}
},
messages: {
'parent.itemValue':{
isLevelNoSure:"选择此配置上下层级数将超过最大层级"
isLevelNoSure:'<spring:message code="isLevelNoSure"/>'
},
'itemCode':{
//isLevelNoSure:"选择此配置上下层级数将超过四级",
required:'请填写配置编码',
remote:'该配置编码已存在'
required:'<spring:message code="required"/>',
remote:'<spring:message code="is_repeat"/>'
},
'itemValue':{
required:'编码对应值必须填写'
required:'<spring:message code="required"/>'
},
'itemType':{
typeSame:'请选择一致的上下级配置数据类型',
typeChild:'该配置包含下级配置，数据类型更改后与子类不一致'
typeSame:'<spring:message code="typeSame"/>',
typeChild:'<spring:message code="typeChild"/>'
},
'isLeaf':{
leafChange:'该配置包含下级配置，不得改为叶子节点',
leafHasTree:'该配置上级为根节点，不得设为叶子节点'
leafChange:'<spring:message code="leafChange"/>'
//leafHasTree:'该配置上级为根节点，不得设为叶子节点'
}
},
submitHandler: function(form){
loading('正在提交，请稍等...');
loading('<spring:message code="submitting"/>');
form.submit();
},
errorContainer: "#messageBox",
@@ -191,7 +191,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 serviceDictInfo.serviceDictId?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission name="sys:menu:edit"><spring:message code="show"/></shiro:lacksPermission></div>
<i class="fa fa-gift"></i><c:if test="${not empty serviceDictInfo.serviceDictId}"><spring:message code='edit'/></c:if><c:if test="${empty serviceDictInfo.serviceDictId}"><spring:message code='add'/></c:if></div>
<div class="tools">
<!-- <a href="javascript:;" class="collapse"> </a>
<a href="#portlet-config" data-toggle="modal" class="config"> </a>
@@ -212,7 +212,8 @@
<div class="form-group">
<label class="col-md-3 control-label"><spring:message code="superior_config"/>:</label>
<div class="col-md-4">
<sys:treeselect id="serviceDictInfo" name="parent.serviceDictId" value="${serviceDictInfo.parent.serviceDictId}" labelName="parent.itemValue" labelValue="${serviceDictInfo.parent.itemValue eq '根节点'?'根节点':fns:getServiceDictInfoById(serviceDictInfo.parent.serviceDictId).itemValue}"
<c:set var="fatherName"><spring:message code="root_node"/></c:set>
<sys:treeselect id="serviceDictInfo" name="parent.serviceDictId" value="${serviceDictInfo.parent.serviceDictId}" labelName="parent.itemValue" labelValue="${serviceDictInfo.parent.itemValue eq 'root_node'?fatherName:fns:getServiceDictInfoById(serviceDictInfo.parent.serviceDictId).itemValue}"
title="菜单" url="/basics/serviceDictInfo/treeData?itType=${itType}" extId="${serviceDictInfo.serviceDictId}" cssClass="required form-control"/>
</div>
</div>
@@ -223,9 +224,7 @@
<c:forEach items="${fns:getDictList('SERVICE_DICT_ITM_TYPE')}" var="dict">
<c:forEach items="${intArr}" var="itTemp">
<c:if test="${dict.itemCode eq itTemp}">
<option value="${dict.itemCode}"
<c:if test="${serviceDictInfo.itemType eq dict.itemCode}">selected="selected"</c:if>
>${dict.itemValue}</option>
<option value="${dict.itemCode}" <c:if test="${serviceDictInfo.itemType eq dict.itemCode}">selected="selected"</c:if>><spring:message code="${dict.itemValue}"/></option>
</c:if>
</c:forEach>
</c:forEach>
@@ -233,7 +232,7 @@
</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="item_code"/>:</label>
<div class="col-md-4">
<form:input path="itemCode" htmlEscape="false" maxlength="50" class="form-control"/>
</div>
@@ -247,9 +246,10 @@
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="is_leaf"/>:</label>
<div class="col-md-4">
<%-- <form:radiobuttons path="isLeaf" items="${fns:getDictOption('SYS_YES_NO')}" /> --%>
<form:select path="isLeaf" class="form-control">
<form:options items="${fns:getDictList('SYS_YES_NO')}" itemLabel="itemValue" itemValue="itemCode" htmlEscape="false"/>
<c:forEach items="${fns:getDictList('INT_YES_NO')}" var="dict">
<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
</c:forEach>
</form:select>
</div>
</div>