Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
This commit is contained in:
wangxin
@@ -6,6 +6,45 @@
|
||||
|
||||
<script type="text/javascript">
|
||||
$(function(){
|
||||
|
||||
if(!$(".district").val()&&$(".otherValue").val()){
|
||||
$(".district").find("option").each(function(){
|
||||
var text=$(this).text().toLowerCase();
|
||||
if("others"==text){
|
||||
$(this).attr("selected","selected");
|
||||
$(this).parent().siblings(".otherValue").prop("type","text");
|
||||
}
|
||||
});
|
||||
}
|
||||
$(".district").on("change",function(){
|
||||
var text=$(this).find("option:selected").text().toLowerCase();
|
||||
var other=$(this).parent("div").siblings(".otherValue");
|
||||
if("others"==text){
|
||||
other.prop("type","text");
|
||||
$(this).find("option").each(function(){
|
||||
if(other.val()==$(this).text()){
|
||||
other.val("");
|
||||
return false;
|
||||
}
|
||||
});
|
||||
}else{
|
||||
other.prop("type","hidden");
|
||||
}
|
||||
});
|
||||
$(".otherValue").on("change",function(){
|
||||
var val=$(this).val();
|
||||
if($(this).is(":visible")){
|
||||
$(this).prev("div").find("option").each(function(){
|
||||
if("others"==$(this).text().toLowerCase()){
|
||||
$(this).prop("value",val);
|
||||
if($(this).prop("selected")){
|
||||
$(this).parent("select.selectpicker").selectpicker('val',val);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
});
|
||||
$("#save").on("click",function(){
|
||||
$("#cfgFrom").attr("action","${ctx}/cfg/app/saveOrUpdateCfg");
|
||||
$("#save").submit();
|
||||
@@ -83,33 +122,38 @@ $(function(){
|
||||
<div for="cfgDesc"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<div class="form-group">
|
||||
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="whether_area_block"/></label>
|
||||
<div class="col-md-6">
|
||||
<label class="radio-inline">
|
||||
<input type="radio" class="required" name="isAreaEffective" value="1"
|
||||
<c:if test="${_cfg.isAreaEffective==1}">checked</c:if>
|
||||
><spring:message code="yes"/>
|
||||
</label>
|
||||
<label class="radio-inline">
|
||||
<input type="radio" class="required" name="isAreaEffective" value="0"
|
||||
<c:if test="${_cfg.isAreaEffective==0}">checked</c:if>
|
||||
><spring:message code="no"/>
|
||||
</label>
|
||||
<%-- <input class="form-control" type="text" name="isAreaEffective" value="${_cfg.isAreaEffective}"> --%>
|
||||
</div>
|
||||
<div for="isAreaEffective"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<div class="form-group ">
|
||||
<label class="control-label col-md-3"><spring:message code="area_effect_id"></spring:message></label>
|
||||
<div class="col-md-6">
|
||||
<input class="form-control" type="text" name="areaEffectiveIds" value="${_cfg.areaEffectiveIds}">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<c:if test="${isContainFeaturesCfg}">
|
||||
<input type="hidden" name="isAreaEffective" value="0"/>
|
||||
</c:if>
|
||||
<c:if test="${!isContainFeaturesCfg}">
|
||||
<div class="col-md-6">
|
||||
<div class="form-group">
|
||||
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="whether_area_block"/></label>
|
||||
<div class="col-md-6">
|
||||
<label class="radio-inline">
|
||||
<input type="radio" class="required" name="isAreaEffective" value="1"
|
||||
<c:if test="${_cfg.isAreaEffective==1}">checked</c:if>
|
||||
><spring:message code="yes"/>
|
||||
</label>
|
||||
<label class="radio-inline">
|
||||
<input type="radio" class="required" name="isAreaEffective" value="0"
|
||||
<c:if test="${_cfg.isAreaEffective==0}">checked</c:if>
|
||||
><spring:message code="no"/>
|
||||
</label>
|
||||
<%-- <input class="form-control" type="text" name="isAreaEffective" value="${_cfg.isAreaEffective}"> --%>
|
||||
</div>
|
||||
<div for="isAreaEffective"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<div class="form-group ">
|
||||
<label class="control-label col-md-3"><spring:message code="area_effect_id"></spring:message></label>
|
||||
<div class="col-md-6">
|
||||
<input class="form-control" type="text" name="areaEffectiveIds" value="${_cfg.areaEffectiveIds}">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</c:if>
|
||||
<c:if test="${fn:length(featuresList)>0}">
|
||||
<c:set var="index1" value="0"/>
|
||||
<c:set var="index2" value="0"/>
|
||||
@@ -191,11 +235,21 @@ $(function(){
|
||||
<div class="form-group">
|
||||
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="match_area"/></label>
|
||||
<div class="col-md-6">
|
||||
<select name="complexFeaturesList[${index2}].district" class="required selectpicker select2 form-control" title="<spring:message code="select"/>" >
|
||||
<c:set var="districtValue" value="noSelect"></c:set>
|
||||
<select name="complexFeaturesList[${index2}].district" class="district required selectpicker select2 form-control" title="<spring:message code="select"/>" >
|
||||
<c:forEach items="${fns:getFeaturesDictData(features.tableName) }" var="item">
|
||||
<option value="${item.itemValue }" <c:if test="${_cfg.complexFeaturesList[index2].district==item.itemValue }">selected</c:if>><spring:message code="${item.itemValue}"></spring:message></option>
|
||||
<c:if test="${_cfg.complexFeaturesList[index2].district==item.itemValue }">
|
||||
<c:set var="districtValue" value="${item.itemValue }"></c:set>
|
||||
</c:if>
|
||||
</c:forEach>
|
||||
<c:if test="${districtValue eq 'noSelect' and not empty _cfg.cfgId}">
|
||||
<option value="${_cfg.complexFeaturesList[index2].district}" selected>
|
||||
${_cfg.complexFeaturesList[index2].district}
|
||||
</option>
|
||||
</c:if>
|
||||
</select>
|
||||
<input type="hidden" name="" placeholder="请输入自定义域" class="otherValue form-control" value="${_cfg.complexFeaturesList[index2].district}"/>
|
||||
<%-- <input class="required form-control" type="text" name="complexFeaturesList[${index2}].district" value="${_cfg.complexFeaturesList[index2].district }"> --%>
|
||||
</div>
|
||||
<div for="cfgDesc"></div>
|
||||
|
||||
@@ -285,7 +285,7 @@
|
||||
<c:if test="${isContainFeaturesCfg}">
|
||||
<td>
|
||||
<a href="${ctx}/cfg/app/showFeaturesCfg?serviceId=${cfg.serviceId}&compileId=${cfg.compileId }&action=${cfg.action}&cfgId=${cfg.cfgId}&cfgName=${cfgName}">
|
||||
<spring:message code="show"></spring:message>
|
||||
<spring:message code="detail"></spring:message>
|
||||
</a>
|
||||
</td>
|
||||
</c:if>
|
||||
@@ -361,10 +361,10 @@
|
||||
</c:when>
|
||||
<c:when test="${cfg.isAudit eq '0'}">
|
||||
<shiro:hasPermission name="cfg:edit">
|
||||
<li><a href="${ctx}/cfg/app/updateForm?serviceId=${cfg.serviceId}&action=${cfg.action}&cfgId=${cfg.cfgId}&cfgName=${cfgName}" onclick="javascript:return confirm('sure？', this.href)"><spring:message code="edit"></spring:message></a></li>
|
||||
<li><a href="${ctx}/cfg/app/updateForm?serviceId=${cfg.serviceId}&action=${cfg.action}&compileId=${cfg.compileId}&cfgId=${cfg.cfgId}&cfgName=${cfgName}" onclick="javascript:return confirm('sure？', this.href)"><spring:message code="edit"></spring:message></a></li>
|
||||
</shiro:hasPermission>
|
||||
<shiro:hasPermission name="cfg:delete">
|
||||
<li><a href="${ctx}/cfg/app/deleteCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&cfgId=${cfg.cfgId}&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="delete"></spring:message></a></li>
|
||||
<li><a href="${ctx}/cfg/app/deleteCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&compileId=${cfg.compileId}&cfgId=${cfg.cfgId}&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="delete"></spring:message></a></li>
|
||||
</shiro:hasPermission>
|
||||
</c:when>
|
||||
</c:choose>
|
||||
@@ -373,15 +373,15 @@
|
||||
<c:choose>
|
||||
<c:when test="${cfg.isAudit eq '1'}">
|
||||
<shiro:hasPermission name="cfg:audit:cancel">
|
||||
<li><a href="${ctx}/cfg/app/auditCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&cfgId=${cfg.cfgId}&isAudit=3&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="cancel"></spring:message></a></li>
|
||||
<li><a href="${ctx}/cfg/app/auditCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&compileId=${cfg.compileId}&cfgId=${cfg.cfgId}&isAudit=3&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="cancel"></spring:message></a></li>
|
||||
</shiro:hasPermission>
|
||||
</c:when>
|
||||
<c:when test="${cfg.isAudit eq '0'}">
|
||||
<shiro:hasPermission name="cfg:audit:valid">
|
||||
<li><a href="${ctx}/cfg/app/auditCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&cfgId=${cfg.cfgId}&isAudit=1&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="approved"></spring:message></a></li>
|
||||
<li><a href="${ctx}/cfg/app/auditCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&compileId=${cfg.compileId}&cfgId=${cfg.cfgId}&isAudit=1&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="approved"></spring:message></a></li>
|
||||
</shiro:hasPermission>
|
||||
<shiro:hasPermission name="cfg:audit:invalid">
|
||||
<li><a href="${ctx}/cfg/app/auditCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&cfgId=${cfg.cfgId}&isAudit=2&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="unapproved"></spring:message></a></li>
|
||||
<li><a href="${ctx}/cfg/app/auditCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&compileId=${cfg.compileId}&cfgId=${cfg.cfgId}&isAudit=2&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="unapproved"></spring:message></a></li>
|
||||
</shiro:hasPermission>
|
||||
</c:when>
|
||||
</c:choose>
|
||||
|
||||
@@ -120,11 +120,21 @@ $(function(){
|
||||
<div class="form-group">
|
||||
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="match_area"/></label>
|
||||
<div class="col-md-6">
|
||||
<c:set var="districtValue" value="noSelect"></c:set>
|
||||
<select name="complexFeaturesList[${index2}].district" class="required selectpicker select2 form-control" title="<spring:message code="select"/>" >
|
||||
<c:forEach items="${fns:getFeaturesDictData(features.tableName) }" var="item">
|
||||
<option value="${item.itemValue }" <c:if test="${_cfg.complexFeaturesList[index2].district==item.itemValue }">selected</c:if>><spring:message code="${item.itemValue}"></spring:message></option>
|
||||
<c:if test="${_cfg.complexFeaturesList[index2].district==item.itemValue }">
|
||||
<c:set var="districtValue" value="${item.itemValue }"></c:set>
|
||||
</c:if>
|
||||
</c:forEach>
|
||||
<c:if test="${districtValue eq 'noSelect' and not empty _cfg.cfgId}">
|
||||
<option value="${_cfg.complexFeaturesList[index2].district}" selected>
|
||||
${_cfg.complexFeaturesList[index2].district}
|
||||
</option>
|
||||
</c:if>
|
||||
</select>
|
||||
|
||||
<%-- <input class="required form-control" type="text" name="complexFeaturesList[${index2}].district" value="${_cfg.complexFeaturesList[index2].district }"> --%>
|
||||
</div>
|
||||
<div for="cfgDesc"></div>
|
||||
|
||||
@@ -159,10 +159,10 @@
|
||||
$("#addBtn").attr("disabled", false);
|
||||
} else if ($(obj).val() == '3') {
|
||||
if ($(".table-list").length > 1) {
|
||||
alert('<spring:message code="special_service_message"/>');
|
||||
$(obj).val(v);
|
||||
//alert('<spring:message code="special_service_message"/>');
|
||||
//$(obj).val(v);
|
||||
} else if ($(".table-list").length == 1) {
|
||||
$("#addBtn").attr("disabled", true);
|
||||
//$("#addBtn").attr("disabled", true);
|
||||
} else if ($(".table-list").length == 0) {
|
||||
$("#addBtn").attr("disabled", false);
|
||||
}
|
||||
@@ -241,7 +241,7 @@
|
||||
'</div>'
|
||||
);
|
||||
$("[name=tableType]").selectpicker('refresh');
|
||||
if ($("#serviceType").val() == '1' || $("#serviceType").val() == '3') {
|
||||
if ($("#serviceType").val() == '1') {
|
||||
$("#addBtn").attr("disabled", true);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user