From a0cac9e4f66266a968df1b1c05e7bc3008577d9f Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.18>
Date: 星期五, 02 十一月 2018 09:09:09 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/infor_manage.jsp |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/gx_tieta/WebRoot/infor_manage.jsp b/gx_tieta/WebRoot/infor_manage.jsp
index 3ab5a2f..8f7de0a 100644
--- a/gx_tieta/WebRoot/infor_manage.jsp
+++ b/gx_tieta/WebRoot/infor_manage.jsp
@@ -15,6 +15,7 @@
     <link href="css/basic.css" type="text/css" rel="stylesheet" />
     <link href="css/staffInfor.css" type="text/css" rel="stylesheet" />
 	<link href="css/confirm.css" type="text/css" rel="stylesheet" />
+	<link href="src/css/layui.css" type="text/css" rel="stylesheet">
     <script type="text/javascript" src="js/jquery-1.8.3.js"></script>
     <!-- <script type="text/javascript" src="js/base.js"></script> -->
     <style>
@@ -171,6 +172,7 @@
 </body>
 <script type="text/javascript" src="js/createTab.js"></script>
 <script type="text/javascript" src="js/myConfirm.js"></script>
+<script type="text/javascript" src="src/layui.all.js"></script>
 <script type="text/javascript">
 	var permits;
 	<%	Object obj=session.getAttribute("permits");
@@ -469,14 +471,17 @@
 	
 	$(document).ready(function(){
 		searchUser_inf();
+		
+		$(window).resize(function() {
+			setTblWidth($('#tbHead'), $('#staff-infor'));
+		});
 	});
 	
 	var User_all;
 	function searchUser_inf(){
 		userlist=new Array();
 		// 鐢熸垚绛夊緟妗�
-		//createWait($('#staff-infor'));
-		//createAllMask($('body'),0);	
+		var load = layer.load(1);	
 		$.post("User_infAction!searchAll",$('#search_form').serialize(),function(data){
 			data=data.result;
 			data=eval("("+data+")");
@@ -525,9 +530,7 @@
 				//鐢熸垚鐢ㄦ埛琛ㄦ牸
 				createTable('tbHead','tbFixed',newArrTh.length,newArrTh,newArrTd);
 				createTable('staff-infor','tbScroll',newArrTh.length,newArrTh,newArrTd); 
-				var tblScroll=$('#staff-infor').scrollLeft();
-				$('#tbHead table').css('left',-tblScroll);
-				//console.info(Page);
+				setTblWidth($('#tbHead'), $('#staff-infor'));
 			}else{
 				User_all=undefined;	
 				uidlist=undefined;
@@ -543,8 +546,7 @@
 				$('#total').text(0);
 			}
 			
-			//$('#staff-infor .wait').remove();
-			//$('body').children('.mask').remove();
+			layer.close(load);
 		});
 	}
 	

--
Gitblit v1.9.1