改进了条件的隐藏和显示

git-svn-id: https://192.168.57.71/svn/jsgkj@1453 931142cf-59ea-a443-aa0e-51397b428577

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/mt/mtmain.jsp

@@ -49,7 +49,7 @@
 		<div class="box-content" >
 <form action="${app }/mt/main" id="mtform" method="post"> 	
 			<div class="searchdiv">
-				<div class="expanddiv"><a id="expandSearchLink" class="collapselink" onclick="expandSearch();"></a></div>
+				
 				<table class="search_table" cellpadding="0" cellspacing="0" style="table-layout: fixed;">
 					<tr>
 						<th width="12%"></th>
@@ -85,6 +85,11 @@
                         <td ><div id="mtytDiv"></div></td>
                      </tr>
                      <tr>
+                     <td class="left" colspan="2">							 <a class="btn btn-default btn-sm" href="#"
+								onclick="expandSearch();"> <i
+									class="glyphicon glyphicon-minus" id="searchCond"></i> 
+									<font id="condInfo">隐藏更多条件</font>
+							</a></td>
                         <td class="right" colspan="6">
                          <authz:hasPermission name="${appName}:mtxx:main">
                          	<a class="btn btn-default btn-sm" href="#" onclick="mt.main.search()">

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/xmxxgl/xmxxglmain.jsp

@@ -51,7 +51,7 @@
 <input type="hidden" name="menuid" value="${menuid }">		
 
 			<div class="searchdiv">
-				<div class="expanddiv"><a id="expandSearchLink" class="collapselink" onclick="expandSearch();"></a></div>
+				<!--  <div class="expanddiv"><a id="expandSearchLink" class="collapselink" onclick="expandSearch();"></a></div>-->
 				<table class="search_table" cellpadding="0" cellspacing="0">
 				    <tr>
 							<th width="12%"></th>
@@ -120,7 +120,14 @@
 						<td>
 			            	<input type="text" class="form-control" name="xmbm"  value="${xmbm }">
 			            </td>
-                     <td class="right" colspan="2">
+			        </tr>
+			        <tr>
+			        <td class="left" colspan="2">							 <a class="btn btn-default btn-sm" href="#"
+								onclick="expandSearch();"> <i
+									class="glyphicon glyphicon-minus" id="searchCond"></i> 
+									<font id="condInfo">隐藏更多条件</font>
+							</a></td>
+                     <td class="right" colspan="4">
                      				<authz:hasPermission name="${appName}:xmxxgl:main">
                          			 <a class="btn btn-default btn-sm" href="#" onclick="xmxxgl.main.search()">
 							   <i class="glyphicon glyphicon-search"></i> 
@@ -135,7 +142,6 @@
 							   		<i class="glyphicon glyphicon-download-alt"></i>导出
 							   	</a>
                      </td>
-                         
                     </tr>
 				</table>
 			</div>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrbw/bwmain.jsp

@@ -61,7 +61,7 @@
 		<form action="${app }/bw/main" id="bwform" method="post"> 
 			<input type="hidden" name="menuid" value="${menuid }">	
 			<div class="searchdiv">
-				<div class="expanddiv"><a id="expandSearchLink" class="collapselink" onclick="expandSearch();"></a></div>
+				
 				<table class="search_table" cellpadding="0" cellspacing="0">
 					<tr>
 						<th width="12%"></th>
@@ -142,6 +142,11 @@
 		                </td>
 		               </tr>
 		               <tr>
+		               <td class="left" colspan="2">							 <a class="btn btn-default btn-sm" href="#"
+								onclick="expandSearch();"> <i
+									class="glyphicon glyphicon-minus" id="searchCond"></i> 
+									<font id="condInfo">隐藏更多条件</font>
+							</a></td>
 	        			<td class="right" colspan="6">
 		               		<authz:hasPermission name="${appName}:bwxx:main">
 		       	  			<a class="btn btn-default btn-sm" href="#" onclick="bw.main.search('bw')">

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrck/ckmain.jsp

@@ -47,7 +47,7 @@
 		<form action="${app }/ck/main" id="ckform" method="post"> 
 			<input type="hidden" name="menuid" value="${menuid }">	
 			<div class="searchdiv">
-				<div class="expanddiv"><a id="expandSearchLink" class="collapselink" onclick="expandSearch();"></a></div>
+				
 				<table class="search_table" cellpadding="0" cellspacing="0">
 					<tr>
 						<th width="10%"></th>
@@ -108,16 +108,14 @@
 		                 	<span id="sfwxpcksel">
 							</span>
 		                </td>
-		                <td>
-	                	
-	                	</td>
-	                	<td>
-	                	
-	                	</td>
-	                	<td>
-	                	
-	                	</td>
-		               	<td class="right" colspan="2">
+		             </tr>
+		             <tr>
+		             	 <td class="left" colspan="2">							 <a class="btn btn-default btn-sm" href="#"
+								onclick="expandSearch();"> <i
+									class="glyphicon glyphicon-minus" id="searchCond"></i> 
+									<font id="condInfo">隐藏更多条件</font>
+							</a></td>
+		               	<td class="right" colspan="4">
 		               	 <authz:hasPermission name="${appName}:ckxx:main">
 		       	  			<a class="btn btn-default btn-sm" href="#" onclick="ck.main.search()">
 						   		<i class="glyphicon glyphicon-search"></i>查询

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/gkjyrmain.jsp

@@ -170,7 +170,8 @@
 						<tr>
 							<td class="left" colspan="2">							 <a class="btn btn-default btn-sm" href="#"
 								onclick="expandSearch();"> <i
-									class="glyphicon glyphicon-plus"></i> 显示更多条件
+									class="glyphicon glyphicon-minus" id="searchCond"></i> 
+									<font id="condInfo">隐藏更多条件</font>
 							</a></td>
 							<td class="right"></td>
 							<td></td>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrxkzfz/xkzfzmain.jsp

@@ -53,7 +53,7 @@
 		<form action="${app }/xkzfz/main" id="xkzfzform" method="post"> 
 			<input type="hidden" name="menuid" value="${menuid }">	
 			<div class="searchdiv">
-				<div class="expanddiv"><a id="expandSearchLink" class="collapselink" onclick="expandSearch();"></a></div>
+				
 				<table class="search_table" cellpadding="0" cellspacing="0">
 					<tr>
 						<th width="10%"></th>
@@ -124,7 +124,14 @@
 			                </select>
 			            </td>
 		                <td></td>
-		               	<td class="right" colspan="2">
+		        	</tr>
+		        	<tr>
+		        	<td class="left" colspan="2">							 <a class="btn btn-default btn-sm" href="#"
+								onclick="expandSearch();"> <i
+									class="glyphicon glyphicon-minus" id="searchCond"></i> 
+									<font id="condInfo">隐藏更多条件</font>
+							</a></td>
+		               	<td class="right" colspan="4">
 		       	  			<a class="btn btn-default btn-sm" href="#" onclick="xkzfz.main.search()">
 						   		<i class="glyphicon glyphicon-search"></i>查询
 						   	</a>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/xkzxx/xkzxxmain.jsp

@@ -100,7 +100,7 @@
 		<form action="${app }/xkzxx/main" id="xkzxxform" method="post"> 
 			<input type="hidden" name="menuid" value="${menuid }">	
 			<div class="searchdiv">
-				<div class="expanddiv"><a id="expandSearchLink" class="collapselink" onclick="expandSearch();"></a></div>
+				<!--  <div class="expanddiv"><a id="expandSearchLink" class="collapselink" onclick="expandSearch();"></a></div>-->
 				<table class="search_table" cellpadding="0" cellspacing="0">
 					<tr>
 						<th width="11%"></th>
@@ -175,6 +175,11 @@
                         <td><div id="xkzsfdqSel"></div></td>
                     </tr>
                     <tr>
+                    <td class="left" colspan="2">							 <a class="btn btn-default btn-sm" href="#"
+								onclick="expandSearch();"> <i
+									class="glyphicon glyphicon-minus" id="searchCond"></i> 
+									<font id="condInfo">隐藏更多条件</font>
+							</a></td>
                          <td class="right" colspan="6">
 		       	  			<a class="btn btn-default btn-sm" href="#" onclick="xkzxx.main.search()">
 						   		<i class="glyphicon glyphicon-search"></i>查询

gkjsjy/trunk/WebContent/static/biz/js/common.js

@@ -965,7 +965,19 @@ function pageinfo3(){
 
 
 function expandSearchTable(display){
+    //按钮对象
+    var buttonObj=$("#searchCond");
 	var tableObj=$(".search_table");
+	if(display=="none"){
+	    buttonObj.removeClass("glyphicon glyphicon-minus");
+        buttonObj.addClass("glyphicon glyphicon-plus");
+        $("#condInfo")[0].innerHTML="显示更多条件";
+	}else{
+	    buttonObj.removeClass("glyphicon glyphicon-plus");
+        buttonObj.addClass("glyphicon glyphicon-minus");
+        $("#condInfo")[0].innerHTML="隐藏更多条件";
+	}
+	
 	//alert(tableObj.find("tr").prevAll().length);
 	//alert(tableObj.find('tr:eq(1)'));
 	var col = tableObj.find("tr").prevAll().length;//获取表格列数