Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

This commit is contained in:
duandongmei
2018-09-13 11:47:50 +08:00
4 changed files with 29 additions and 14 deletions

View File

@@ -53,14 +53,17 @@ $(document).ready(function(){
<div class="col-md-12">
<div class="pull-left">
<form:select path="action" class="selectpicker select2 input-small">
<form:option value=""><spring:message code="action"/></form:option>
<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="action">
<c:if test="${action.itemValue eq 'action_reject' or action.itemValue eq 'action_monit' }">
<form:option value="${action.itemCode }" ><spring:message code="${action.itemValue }"/></form:option>
</c:if>
<form:option value=""><spring:message code="action"/></form:option>
<c:forEach items="${serviceList}" var="service"
varStatus="satus">
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
<c:if test="${(dict.itemCode eq service.action) && (service.action ne 128) && (service.action ne 32) && (service.action ne 96) }">
<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
</c:if>
</c:forEach>
</form:select>
</div>
</c:forEach>
</form:select>
</div>
<div class="pull-left">
<div class="input-group">
<div class="input-group-btn">