voipForm界面修改业务调整

src/main/java/com/nis/web/service/configuration/AvContentCfgService.java

@@ -79,9 +79,17 @@ public class AvContentCfgService extends BaseService{
 	 */
 	public CfgIndexInfo getCfgIndexInfo(CfgIndexInfo entity) {
 		CfgIndexInfo cfg=avContentCfgDao.getCfgIndexInfo(entity);
-		List<AvVoipAccountCfg>  voipAccounts=getVoipAccountCfgList(entity);
+		List<AvVoipAccountCfg>  voipAccounts=new ArrayList<>();
-		List<AvVoipIpCfg>  voipIps=getVoipIpCfgList(entity);
+		voipAccounts=getVoipAccountCfgList(entity);
-		getVoipIpCfgList(entity);
+		if(voipAccounts ==null || voipAccounts.size() <=0){
+			voipAccounts.add(new AvVoipAccountCfg());
+		}
+		List<AvVoipIpCfg>  voipIps=new ArrayList<>();
+		voipIps=getVoipIpCfgList(entity);
+		if(voipIps ==null || voipIps.size() <=0){
+			voipIps.add(new AvVoipIpCfg());
+		}
+		
 		cfg.setVoipAccounts(voipAccounts);
 		cfg.setVoipIps(voipIps);
 		

src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp

@@ -65,27 +65,31 @@ $(function(){
 		},
 		errorContainer: "#messageBox",
 	});
-	//业务内容增加
-	$("span[title='add']").on("click",function(){
-		$(".voipIp0").removeClass("hidden");
-	});
 	$(".action").on("change",function(){
 		$("#serviceId").val($(this).attr("serviceId"));
 	});
+	//业务内容增加
+	/* $("span[title='add']").on("click",function(){
+		$(".voipIp0").removeClass("hidden");
+	}); */
 });
 
 
 //业务窗口打开
 var addContent=function(obj,contentClassName){
 	$("."+contentClassName+"0").removeClass("hidden").removeClass("disabled");
-	$("."+contentClassName).find("input,select").attr("disabled","");
+	$("."+contentClassName+"0").find("input,select").each(function(){
+		$(this).removeAttr("disabled");
+	});
 	$(obj).addClass("hidden");
 }
 
 //业务窗口关闭
 var delContent=function(contentClassName,addBtnClassName){
 	$("."+contentClassName).addClass("hidden");
-	$("."+contentClassName).find("input,select").attr("disabled","true");
+	$("."+contentClassName).find("input,select").each(function(){
+		$(this).attr("disabled","true");
+	});
 	$("."+addBtnClassName).removeClass("hidden");
 }
 
@@ -145,9 +149,23 @@ var delContent=function(contentClassName,addBtnClassName){
 							<!-- desc and action -->
 							
 							<!--/ip info-->
-							<h4 class="form-section"> <spring:message code="av_voip_ip_title"/><small> <span class="glyphicon glyphicon-plus hidden voipIpAdd" onClick="addContent(this,'voipIp')" title="add"></span></small></h4>	
+							<h4 class="form-section"> <spring:message code="av_voip_ip_title"/><small>
+							
+							<span  class="glyphicon glyphicon-plus voipIpAdd" onClick="addContent(this,'voipIp')" title="add"></span>
+							</small>
+							</h4>	
 							<c:forEach items="${_cfg.voipIps}" var="voipIp" varStatus="status">
+							<c:if test="${not empty _cfg.cfgId}">
+									<c:choose>
+										<c:when test="${empty voipIp.cfgId}">
+											<div class="row boxSolid hidden disabled voipIp${status.index }">
+										</c:when>
+										<c:otherwise>
 											<div class="row boxSolid voipIp${status.index }">
+									</c:otherwise>
+									</c:choose>
+							</c:if>
+							
 							<input type="hidden" name="voipIps[${status.index }].cfgId" value="${voipIp.cfgId}">
 							<!-- 配置域类型 -->
 	                   		<c:forEach items="${regionList}" var="region">
@@ -304,9 +322,19 @@ var delContent=function(contentClassName,addBtnClassName){
 							</c:forEach>
 							<!--/ip info-->
 							<!--account info-->
-							<h4 class="form-section"> <spring:message code="av_voip_account_title"/><small> <span class="glyphicon glyphicon-plus hidden voipAccountAdd" onClick="addContent(this,'voipAccount')" title="add"></span></small></h4>	
+							<h4 class="form-section"> <spring:message code="av_voip_account_title"/><small> <span class="glyphicon glyphicon-plus voipAccountAdd" onClick="addContent(this,'voipAccount')" title="add"></span></small></h4>	
 							<c:forEach items="${_cfg.voipAccounts}" var="voipAccount" varStatus="status">
+							
+							<c:if test="${not empty _cfg.cfgId}">
+									<c:choose>
+										<c:when test="${empty voipAccount.cfgId}">
+											<div class="row boxSolid hidden disabled voipAccount${status.index }">
+										</c:when>
+										<c:otherwise>
 											<div class="row boxSolid voipAccount${status.index }">
+									</c:otherwise>
+									</c:choose>
+							</c:if>
 							<input type="hidden" name="voipAccounts[${status.index }].cfgId" value="${voipAccount.cfgId}">
 	                        <!-- 配置域类型 -->
 	                   		<c:forEach items="${regionList}" var="region">