From f6c8a961595ea54f2c9a6b7da589480481cc6283 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 21 六月 2021 14:28:08 +0800
Subject: [PATCH] #

---
 src/main/webapp/WEB-INF/pages/waitPakInLog.jsp |   64 ++++++++++++++++++--------------
 1 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/src/main/webapp/WEB-INF/pages/waitPakInLog.jsp b/src/main/webapp/WEB-INF/pages/waitPakInLog.jsp
index 1a4331b..4dece11 100644
--- a/src/main/webapp/WEB-INF/pages/waitPakInLog.jsp
+++ b/src/main/webapp/WEB-INF/pages/waitPakInLog.jsp
@@ -9,37 +9,37 @@
 
 <script type="text/javascript" src="${path }/jsFiles/waitPakInLog.js"></script>
 <style type="text/css">
-.modal-dialog { 
-    position: absolute; 
-    top: 0; 
-    bottom: 0; 
-    left: 0; 
-    right: 0; 
-} 
+.modal-dialog {
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+}
 
-.modal-content { 
-    /*overflow-y: scroll; */ 
-    position: absolute; 
-    top: 0; 
-    bottom: 0; 
+.modal-content {
+    /*overflow-y: scroll; */
+    position: absolute;
+    top: 0;
+    bottom: 0;
     height :60%;
-    width: 100%; 
-} 
+    width: 100%;
+}
 
 .modal-body {
-    overflow-y: scroll; 
-    position: absolute; 
-    top: 55px;     
-    bottom: 65px;  
-    width: 100%; 
-} 
+    overflow-y: scroll;
+    position: absolute;
+    top: 55px;
+    bottom: 65px;
+    width: 100%;
+}
 
-.modal-header .close {margin-right: 15px;} 
+.modal-header .close {margin-right: 15px;}
 
 .modal-footer {
-    position: absolute; 
-    width: 100%; 
-	bottom: 0; 
+    position: absolute;
+    width: 100%;
+	bottom: 0;
 }
 </style>
 </head>
@@ -50,10 +50,10 @@
 	<div class="panel-body">
 		<form id="conForm" class="form-inline">
 			<input type="text" class="form-control" style="width:25%" id="search_sheet_no" name="search_sheet_no" placeholder="鐗╂枡">
-		    <input type="text" class="form-control" style="width:25%" id="search_mat_no" name="search_mat_no" placeholder="鎼滅储">	
+		    <input type="text" class="form-control" style="width:25%" id="search_mat_no" name="search_mat_no" placeholder="鎼滅储">
 		    <input type="text" id="begin_date" style="width:15%" name="begin_date" onFocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" readonly="readonly" class="form-control form-control-static" placeholder="寮�濮嬫椂闂�">
-		    <input type="text" id="end_date" style="width:15%" name="end_date" onFocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" readonly="readonly" class="form-control form-control-static" placeholder="缁撴潫鏃堕棿">	    
-		    
+		    <input type="text" id="end_date" style="width:15%" name="end_date" onFocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" readonly="readonly" class="form-control form-control-static" placeholder="缁撴潫鏃堕棿">
+
 		    <button type="button" onclick="getByCon()" class="btn btn-info ">
 		   <span class="glyphicon glyphicon-search" aria-hidden="true" >  鎼滅储</span></button>
 		</form>
@@ -67,5 +67,13 @@
 <table id="test-table" class="table table-hover text-nowrap"></table>
 </div>
 
+<!--toolbar  -->
+<div id="toolbar" class="btn-toolbar">
+	<button onclick="ExportExcel()" type="button" class="btn btn-success">
+		<span class="glyphicon glyphicon-paste" aria-hidden="true" >瀵煎嚭</span>
+	</button>
+</div>
+
+
 </body>
-</html>
\ No newline at end of file
+</html>

--
Gitblit v1.9.1