From ef1530e8b11e40967a51efa177aac462015f47dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Fri, 30 Jun 2017 00:07:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=8A=A5=E8=A1=A8=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=EF=BC=8C=E5=88=9D=E5=A7=8B=E5=8C=96=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/js/common/common.js           | 14 ++++++++
 src/main/webapp/pages/materials/person.jsp    |  4 +--
 .../webapp/pages/reports/buy_in_report.jsp    | 33 +++++++++++--------
 .../pages/reports/in_out_stock_report.jsp     | 28 +++++++++-------
 .../webapp/pages/reports/sale_out_report.jsp  | 29 +++++++++-------
 5 files changed, 69 insertions(+), 39 deletions(-)

diff --git a/src/main/webapp/js/common/common.js b/src/main/webapp/js/common/common.js
index 606ea249..3e32f56f 100644
--- a/src/main/webapp/js/common/common.js
+++ b/src/main/webapp/js/common/common.js
@@ -105,6 +105,20 @@ function getNowFormatDateTime() {
 	return currentdate;
 }
 
+/**
+ * js获取当前时间， 格式“yyyy-MM”
+ */
+function getNowFormatMonth() {
+	var date = new Date();
+	var seperator1 = "-";
+	var month = date.getMonth() + 1;
+	if (month >= 1 && month <= 9) {
+		month = "0" + month;
+	}
+	var currentdate = date.getFullYear() + seperator1 + month;
+	return currentdate;
+}
+
 /**
  * js获取当前时间， 格式“yyyy-MM-dd”
  */
diff --git a/src/main/webapp/pages/materials/person.jsp b/src/main/webapp/pages/materials/person.jsp
index 956c0b00..8939e462 100644
--- a/src/main/webapp/pages/materials/person.jsp
+++ b/src/main/webapp/pages/materials/person.jsp
@@ -28,11 +28,11 @@
 				<tr>
 			    	<td>姓名：</td>
 					<td>
-						<input name="searchName" id="searchName" style="width:230px;"/>
+						<input name="searchName" id="searchName" style="width:70px;"/>
 					</td>
 					<td>类型：</td>
 					<td>
-						<select name="searchType" id="searchType"  style="width:230px;">
+						<select name="searchType" id="searchType"  style="width:70px;">
 						<option value="">全部</option>
 						<option value="仓管员">仓管员</option>
 						<option value="财务员">财务员</option>
diff --git a/src/main/webapp/pages/reports/buy_in_report.jsp b/src/main/webapp/pages/reports/buy_in_report.jsp
index 8c65360b..5ad0e637 100644
--- a/src/main/webapp/pages/reports/buy_in_report.jsp
+++ b/src/main/webapp/pages/reports/buy_in_report.jsp
@@ -48,8 +48,11 @@
 			//初始化界面
 			$(function()
 			{
+				var thisDate = getNowFormatMonth(); //当前月份
+				$("#searchMonth").val(thisDate);
 				initTableData();
 				ininPager();
+				search();
 			});			
 			
 			//初始化表格数据
@@ -132,26 +135,28 @@
 					$.messager.alert('异常处理提示',"分页信息异常 :  " + e.name + ": " + e.message,'error');
 				}
 			}
-			
+
+			function search() {
+				showDetails(1,initPageSize);
+				var opts = $("#tableData").datagrid('options');
+				var pager = $("#tableData").datagrid('getPager');
+				opts.pageNumber = 1;
+				opts.pageSize = initPageSize;
+				pager.pagination('refresh',
+						{
+							pageNumber:1,
+							pageSize:initPageSize
+						});
+			}
 			//搜索处理
 			$("#searchBtn").unbind().bind({
 				click:function()
 				{
-					showDetails(1,initPageSize);	
-					var opts = $("#tableData").datagrid('options');  
-					var pager = $("#tableData").datagrid('getPager'); 
-					opts.pageNumber = 1;  
-					opts.pageSize = initPageSize;  
-					pager.pagination('refresh',
-					{  
-						pageNumber:1,  
-						pageSize:initPageSize  
-					});  
+					search();
 				}
 			});
 			
-			function showDetails(pageNo,pageSize)
-			{
+			function showDetails(pageNo,pageSize) {
 				$.ajax({
 					type:"post",
 					url: "<%=path %>/depotHead/findByMonth.action",
@@ -219,7 +224,7 @@
 						return;
 					}
 				});
-			}			
+			}
 		</script>
 	</body>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/pages/reports/in_out_stock_report.jsp b/src/main/webapp/pages/reports/in_out_stock_report.jsp
index 35e64075..1379cabb 100644
--- a/src/main/webapp/pages/reports/in_out_stock_report.jsp
+++ b/src/main/webapp/pages/reports/in_out_stock_report.jsp
@@ -7,7 +7,7 @@
 <!DOCTYPE html>
 <html>
   	<head>
-    	<title>进销存管理</title>
+    	<title>库存状况</title>
         <meta charset="utf-8">
 		<!-- 指定以IE8的方式来渲染 -->
 		<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
@@ -53,8 +53,11 @@
 			//初始化界面
 			$(function()
 			{
+				var thisDate = getNowFormatMonth(); //当前月份
+				$("#searchMonth").val(thisDate);
 				initTableData();
 				ininPager();
+				search();
 				exportExcel();
 			});	
 			
@@ -173,19 +176,22 @@
 			var orgPerson = "";
 
 			//搜索处理
+			function search() {
+				showPersonDetails(1,initPageSize);
+				var opts = $("#tableData").datagrid('options');
+				var pager = $("#tableData").datagrid('getPager');
+				opts.pageNumber = 1;
+				opts.pageSize = initPageSize;
+				pager.pagination('refresh',
+						{
+							pageNumber:1,
+							pageSize:initPageSize
+						});
+			}
 			$("#searchBtn").unbind().bind({
 				click:function()
 				{
-					showPersonDetails(1,initPageSize);	
-					var opts = $("#tableData").datagrid('options');  
-					var pager = $("#tableData").datagrid('getPager'); 
-					opts.pageNumber = 1;  
-					opts.pageSize = initPageSize;  
-					pager.pagination('refresh',
-					{  
-						pageNumber:1,  
-						pageSize:initPageSize  
-					});  
+					search();
 				}
 			});
 			
diff --git a/src/main/webapp/pages/reports/sale_out_report.jsp b/src/main/webapp/pages/reports/sale_out_report.jsp
index dcf9ef93..74bf98d4 100644
--- a/src/main/webapp/pages/reports/sale_out_report.jsp
+++ b/src/main/webapp/pages/reports/sale_out_report.jsp
@@ -50,8 +50,11 @@
 			$(function()
 			{
 				$("#searchTable .tip").css("padding-left","15px").css("color","red");
+				var thisDate = getNowFormatMonth(); //当前月份
+				$("#searchMonth").val(thisDate);
 				initTableData();
 				ininPager();
+				search();
 			});			
 			
 			//初始化表格数据
@@ -136,19 +139,21 @@
 			}
 			
 			//搜索处理
-			$("#searchBtn").unbind().bind({
-				click:function()
+			function search() {
+				showDetails(1,initPageSize);
+				var opts = $("#tableData").datagrid('options');
+				var pager = $("#tableData").datagrid('getPager');
+				opts.pageNumber = 1;
+				opts.pageSize = initPageSize;
+				pager.pagination('refresh',
 				{
-					showDetails(1,initPageSize);	
-					var opts = $("#tableData").datagrid('options');  
-					var pager = $("#tableData").datagrid('getPager'); 
-					opts.pageNumber = 1;  
-					opts.pageSize = initPageSize;  
-					pager.pagination('refresh',
-					{  
-						pageNumber:1,  
-						pageSize:initPageSize  
-					});  
+					pageNumber:1,
+					pageSize:initPageSize
+				});
+			}
+			$("#searchBtn").unbind().bind({
+				click:function() {
+					search();
 				}
 			});