From 83eba08780eebd82c27d4b92a20a9b6db0ddbba3 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Wed, 8 Aug 2018 11:22:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E8=BF=90=E8=90=A5=E5=95=86?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=8E=BB=E6=8E=89=E8=BF=90=E8=90=A5=E5=95=86?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/include/form/areaInfo.jsp | 12 ++++++------
 src/main/webapp/static/global/scripts/common.js   | 10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/webapp/WEB-INF/include/form/areaInfo.jsp b/src/main/webapp/WEB-INF/include/form/areaInfo.jsp
index a9e88cae6..25e78e2eb 100644
--- a/src/main/webapp/WEB-INF/include/form/areaInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/areaInfo.jsp
@@ -30,7 +30,7 @@ $(function(){
            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="area_control_type"/></label>
            <div class="col-md-6">
            	<label class="radio-inline">
-           		<input type="radio" name="areaType" value="1" class="required"><spring:message code="area"/> <spring:message code="isp"/>
+           		<input type="radio" name="areaType" value="1" class="required"><spring:message code="area"/> 
            	</label>
            	<%-- <label class="radio-inline">
            		<input type="radio" name="areaType" value="0" class="required"><spring:message code="area"/> ip
@@ -42,7 +42,7 @@ $(function(){
     </div>
 </div>
 <div class="hidden" id="areaIsp">
-<h4 class="form-section"><spring:message code="area"/> <spring:message code="isp"/><small><span class="glyphicon glyphicon-plus" title="add"></span></small></h4>
+<h4 class="form-section"><spring:message code="area"/> <%-- <spring:message code="isp"/> --%><small><span class="glyphicon glyphicon-plus" title="add"></span></small></h4>
 	<div class="container-fluid hidden row">
 		<div class="row">
 			<div class="pull-right">
@@ -54,7 +54,7 @@ $(function(){
 		        <div class="form-group">
 		        	<label class="control-label col-md-3"><spring:message code="area"/></label>
 					<div class="col-md-6">
-						<select name="areaCode" class="form-control chooseAreaOrIsp" data-live-search="true" data-live-search-placeholder="search" >
+						<select name="areaCode" class="form-control required" data-live-search="true" data-live-search-placeholder="search" >
 							<option value="" ><spring:message code="select"/></option>
 							<c:forEach items="${areas}" var="area">
 								<option value="${area.itemCode}">${area.itemValue}</option>
@@ -64,7 +64,7 @@ $(function(){
 					<div for="areaCode"></div>
 				</div>
 			</div>
-			<div class="col-md-6">
+			<div class="col-md-6 hidden">
 		        <div class="form-group">
 		        	<label class="control-label col-md-3"><spring:message code="isp"/></label>
 					<div class="col-md-6">
@@ -91,7 +91,7 @@ $(function(){
 			        <div class="form-group">
 			        	<label class="control-label col-md-3"><spring:message code="area"/></label>
 						<div class="col-md-6">
-							<select name="areaIsp[${status.index}].area" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search" >
+							<select name="areaIsp[${status.index}].area" class="selectpicker form-control required" data-live-search="true" data-live-search-placeholder="search" >
 								<option value="" ><spring:message code="select"/></option>
 								<c:forEach items="${areas}" var="area">
 									<option value="${area.itemCode}"
@@ -103,7 +103,7 @@ $(function(){
 						<div for="areaIsp[${status.index}].area"></div>
 					</div>
 				</div>
-				<div class="col-md-6">
+				<div class="col-md-6 hidden">
 			        <div class="form-group">
 			        	<label class="control-label col-md-3"><spring:message code="isp"/></label>
 						<div class="col-md-6">
diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index f76abcdd8..ad826a9ff 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -860,19 +860,19 @@ var viewAreaInfo=function(path,areaEffectiveIds,compileId){
 				var html = "";
 				var title="";
 				if(data.areaIsps.length > 0){
-					title=$.validator.messages.area+" "+$.validator.messages.isp;
+					title=$.validator.messages.area;//+" "+$.validator.messages.isp;
 					html+="<table class='table table-striped table-bordered table-condensed' style='margin-left: 10px; width: 96%;'>";
       			  	html+="<thead>";
-      			  		html+="<th style='width:50%;padding-right:0px'>"+$.validator.messages.area+"</th>" +
-      			  			  "<th style='width:50%;padding-right:0px'>"+$.validator.messages.isp+"</th>";
+      			  		html+="<th style='width:50%;padding-right:0px'>"+$.validator.messages.area+"</th>";/* +
+      			  			  "<th style='width:50%;padding-right:0px'>"+$.validator.messages.isp+"</th>";*/
       			   	html+="</thead>";
       			   	html+="<tbody>";
       			   	for(i=0;i<data.areaIsps.length;i++){
       			   		html+="<tr>";
       			   		html+="<td>"+data.areaIsps[i].areaName;
       					html+="</td>";
-      					html+="<td>"+data.areaIsps[i].ispName;
-      					html+="</td>";
+      					/*html+="<td>"+data.areaIsps[i].ispName;
+      					html+="</td>";*/
       			   		html+="</tr>";
       			   	}
       			   	html+="</tbody>";