From 9040e5dc7b01909e6f315ddecde58276faa0cee2 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Thu, 2 Aug 2018 15:41:58 +0800
Subject: [PATCH] =?UTF-8?q?(1)=E7=89=B9=E5=AE=9A=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6cfgType,=E8=80=83=E8=99=91=E8=8B=B1=E6=96=87=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E4=BD=BF=E7=94=A8input-middle=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=94=B9=E6=9D=A1=E4=BB=B6=E7=9A=84=E5=AE=BD=E5=BA=A6?=
 =?UTF-8?q?=20(2)=E4=BF=AE=E5=A4=8Dreset=20button?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/specific/specificServiceCfgList.jsp | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp
index fae6631aa..dd4de147d 100644
--- a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp
@@ -9,10 +9,6 @@
 	<style type="text/css">
 	</style>
 	<script type="text/javascript">
-	function reset(){
- 		$("#searchForm").reset();
- 	}
-	
 	/** 
 	 处理全选、全取消
 	**/
@@ -93,6 +89,8 @@
 			
 			//reset
 			$("#resetBtn").on("click",function(){
+				$("#cfgType").val("");
+				$("#cfgType").selectpicker('refresh');
 				$(".Wdate").attr("value",'');
 				$("#searchForm")[0].reset();
 			});
@@ -112,6 +110,9 @@
 				$("#showError").hide();
 			});
 			$("#treeTable").treeTable({expandLevel : 3}).show();	
+			$("#cfgType").change(function(){
+				page();
+			});
 		});
 		
 	</script>
@@ -156,6 +157,14 @@
 							
 							<!-- 搜索内容与操作按钮栏 -->
 			 				<div class="col-md-12">
+									<div class="pull-left">
+	                       				 <form:select path="cfgType" class="selectpicker select2 input-middle" >
+	                       				 	<form:option value=""><spring:message code='cfg_type'/></form:option>
+	                       				 	<c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict">
+	                       				 	<form:option value="${dict.itemCode}"><spring:message code='${dict.itemValue}'/></form:option>
+	                       				 	</c:forEach>
+	                       				 </form:select>
+	                       			</div>
 									<div class="pull-left">	
 										<div class="input-group">
                                            <div class="input-group-btn">
@@ -171,12 +180,11 @@
 	                               <div class="pull-left" style="margin-top:10px;display:none" id="showError">
 									<label class="error"><spring:message code='input_integer'/></label>
 									</div>
-	                       
 									 <div class="pull-left">
 									 <shiro:hasPermission name="specific:service:view">
 	                               		 <button type="button" class="btn blue" onClick="page()"> <i class="fa fa-search"></i> <spring:message code="search"/>  </button>
 									</shiro:hasPermission>
-										 <button type="button" class="btn btn-default" onClick="resetx()"> <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
+										 <button type="button" class="btn btn-default" id="resetBtn"> <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
 	                                     <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"></spring:message>  <i class="fa fa-angle-double-down"></i></button>
 									</div>