Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/deliveryManagementApplication/deliveryManagementApplication.jsp
===================================================================
diff -u -r24635 -r24858
--- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/deliveryManagementApplication/deliveryManagementApplication.jsp	(.../deliveryManagementApplication.jsp)	(revision 24635)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/deliveryManagementApplication/deliveryManagementApplication.jsp	(.../deliveryManagementApplication.jsp)	(revision 24858)
@@ -6,7 +6,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <%@ include file="/dx-disinfectsystem/pages/disinfectsystem/commons/tagLibsPath.jsp"%>
-<title>发货管理</title>
+<title>slick发货管理</title>
 
 </style>
 <!-- bootstrap -->
@@ -22,9 +22,19 @@
 <!--自定义栅格系统-->
 <link rel="stylesheet" type="text/css" href="${basePath}/dx-disinfectsystem/css/common/bootstrap-s-gridSystem.css">
 <!--SSTS公共CSS文件-->
+<!-- slickGrid -->
+<link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/SlickGrid/slick.grid.css" type="text/css"/>
+<link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/SlickGrid/lib/enhancementpager/libs/dropkick.css" type="text/css"/>
+<link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/SlickGrid/lib/enhancementpager/libs/enhancementpager.css" type="text/css"/>
+<link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/SlickGrid/controls/slick.pager.css"type="text/css"/>
+<link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/SlickGrid/css/smoothness/jquery-ui-1.11.3.custom.css" type="text/css"/>
+<link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/SlickGrid/examples/examples.css"type="text/css"/>
+<link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/SlickGrid/controls/slick.columnpicker.css"type="text/css"/>
+
+<!-- slickGrid end -->
 <link rel="stylesheet" type="text/css" href="${basePath}/dx-disinfectsystem/css/common/dingxiang-common.css">
 <!-- 自身CSS -->											
-<link rel="stylesheet" type="text/css" href="${basePath}/dx-disinfectsystem/css/deliveryManagementApplication/deliveryManagementApplication.css">
+<link rel="stylesheet" type="text/css" href="${basePath}/dx-disinfectsystem/css/deliveryManagementApplication/slickDM.css">
 
 
 <!-- IE兼容性插件 -->	
@@ -38,192 +48,229 @@
 
 <div class="main deliveryManageMain">	
 	<div class="mainNav" style="z-index: 1005;">
-						<input type="hidden" name="" id="hiddens" />
-            <div class="mainNav-title s-col-xs-12">发货管理</div>
-    </div> 
+			<input type="hidden" name="" id="hiddens" />
+			<div class="mainNav-title s-col-xs-12">发货管理</div>
+  </div> 
 
-    <div class="mainNav-shop">
-								<div class="buttonGroup"> 
-								 
-										<div class="form-group">
-													<button type="button" class="dx-btn-primary mainNav-shop-btn" id="seeMore" data-toggle="modal" data-target="#deliveryInfo">
-																<span class="glyphicon glyphicon-plus"></span>
-																查看
-													</button>
-													<button type="button" class="dx-btn-primary mainNav-shop-btn" id="updateHandle" data-toggle="modal" data-target="#myModal">
-															<span class="glyphicon glyphicon-print"></span>
-															设为已打印
-													</button>
-													<button type="button" class="dx-btn-primary mainNav-shop-btn" id="updateHandle" data-toggle="modal" data-target="#myModal">
-															<span class="glyphicon glyphicon-print"></span>
-															打印发货单
-													</button> 
-										 
-								</div>
-								</div> 
-								 <div class="form-group">
-								 	<label for="cleanWay1" class="col-sm-4 control-label">科室分组：</label>
-								 	<div class="col-sm-8">
-								 			<div class="form-group">
-								 						<select id="cleanWay1">
-								 							<option value="AL">Alabama</option>
-								 							<option value="WY">Wyoming</option>
-								 						</select>
-								 			</div> 
-								 	</div>
-								 </div>
-								 <div class="form-group">
-								 <label for="cleanWay1" class="col-sm-4 control-label">物品类型：</label>
-								 <div class="col-sm-8">
-								 		<div class="form-group">
-								 					<select id="cleanWay1">
-								 						<option value="AL">Alabama</option>
-								 						<option value="WY">Wyoming</option>
-								 					</select>
-								 		</div> 
-								 </div>
-								 </div>
-								 
-                 
-								
-    </div> 
-	<div class="mainTable" id="mainTable_cus">	 
-        <table id="deliveryManagementMainTable"></table>
+	<div class="mainNav-shop">
+			<div class="buttonGroup">
+				<div class="form-group">
+						<button type="button" class="dx-btn-primary mainNav-shop-btn" id="seeMore" data-toggle="modal" data-target="#deliveryInfo">
+									<span class="glyphicon glyphicon-plus"></span>
+									查看
+						</button>
+						<button type="button" class="dx-btn-primary mainNav-shop-btn" id="updateHandle" data-toggle="modal" data-target="#myModal">
+								<span class="glyphicon glyphicon-print"></span>
+								设为已打印
+						</button>
+						<button type="button" class="dx-btn-primary mainNav-shop-btn" id="updateHandle" data-toggle="modal" data-target="#myModal">
+									<span class="glyphicon glyphicon-print"></span>
+									打印发货单
+						</button>
+				</div>
+			</div> 
+			<div class="form-group">
+				<label for="cleanWay1" class="col-sm-4 control-label">科室分组：</label>
+				<div class="col-sm-8">
+						<div class="form-group">
+									<select id="cleanWay1">
+										<option value="AL">Alabama</option>
+										<option value="WY">Wyoming</option>
+									</select>
+						</div> 
+				</div>
+			</div>
+			<div class="form-group">
+				<label for="cleanWay1" class="col-sm-4 control-label">物品类型：</label>
+				<div class="col-sm-8">
+					<div class="form-group">
+								<select id="cleanWay1">
+									<option value="AL">Alabama</option>
+									<option value="WY">Wyoming</option>
+								</select>
+					</div> 
+				</div>
+			</div>
+			<div class="columnScreen   columns columns-right btn-group pull-right">
+				<button class="btn btn-default" id="mainTableRefresh" onclick="mainTableRefresh()" type="button" name="refresh" aria-label="refresh" title="刷新">
+					<i class="glyphicon glyphicon-refresh icon-refresh">
+					</i>
+				</button>
+			</div>
+			<div class="mainNav-shop-search pull-right search">
+				<input type="text" name="" class="form-control" placeholder="输入关键字查询" id="mainNav-shop-search" value="" />
+			</div>
+	</div>
+
+	<div class="mainView" id="mainTable_cus">
+    <div id="DMGridContainer" class="mainContainer">
+    	<div id="DMGrid" style="width:601px;height:500px;" class="mainContainerGrid"></div>
+    	<div class="bottomContain">
+    		<div class="pageContain">
+    				<div class="pageContainTotal">
+    						共<span id="pageTotal"></span> 条记录，每页<span id="pageSingle"></span> 条
+    				</div>
+    				<div class="pageContainButton">
+    					<ul class="pagination" id="pagination">
+    					</ul>
+    					<div class="dataAmount btn-group dropup" >
+    						<button type="button" class="btn btn-default" id="dataAmountCurrent">1</button>
+    						<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+    							<span class="caret"></span>
+    							<span class="sr-only">Toggle Dropdown</span>
+    						</button>
+    						<ul class="dropdown-menu">
+    							<li>10</li>
+    							<li>20</li>
+    							<li>30</li>
+    							<li>50</li>
+    							<li>100</li>
+    						</ul>
+    					</div>
+    				</div>
+    		</div>
+    		<input type="hidden" id="PageCount" runat="server" />
+    		<input type="hidden" id="PageSize" runat="server"  />
+    		<input type="hidden" id="countindex" runat="server" />
+    		<input type="hidden" id="loadstate" value="hason" />
+    		<input type="hidden" id="visiblePages" runat="server" value="7" />
+    	</div>
+    </div>
 	</div>  
     
 </div><!-- mainNav -->    
 <!-- 模态框1 -->
 <div class="modal fade allmodal" id="deliveryInfo" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-                    <div class="modal-dialog">
-                        <div class="modal-content">
-                            <div class="modal-header">
-                                <button type="button" class="close" data-dismiss="modal" 
-                                        aria-hidden="true">×
-                                </button>
-                                <h4 class="modal-title" id="myModalLabel">
-                                    发货信息
-                                </h4>
-                            </div>
-                            <div class="modal-body" id="toolsModalBody"> 
-                                <!-- 模态框 -->
-                                <!-- 发货信息 -->
-                                 <div class="deliveryInfo">
-                                     <div class="deliveryInfo-left">
-                                         <div class="deliveryInfo-left-title">
-                                             基础信息
-                                         </div>
-                                            <div class="deliveryInfo-left-top">
-                                                 <div class="deliveryInfo-left-ul">
-                                                     <ul>
-                                                         <li>
-                                                             <div class="form-group">
-																															 <label for="cleanWay1" class="col-sm-4 control-label">流水号：</label>
-																															 <div class="col-sm-8">
-																																	<input type="text" class="form-control" > 
-																															 </div>
-                                                             </div>
-                                                         </li>
-																												 <!-- // -->
-																												 <li>
-																												 		<div class="form-group">
-																												 			<label for="cleanWay1" class="col-sm-4 control-label">申请科室：</label>
-																												 			<div class="col-sm-8">
-																												 				<input type="text" class="form-control" > 
-																												 			</div>
-																												 		</div>
-																												 </li>
-																												<li>
-																													<div class="form-group">
-																														<label for="cleanWay1" class="col-sm-4 control-label">责任人：</label>
-																														<div class="col-sm-8">
-																															<input type="text" class="form-control" > 
-																														</div>
-																													</div>
-																												</li>
-																												<li>
-																													<div class="form-group">
-																														<label for="cleanWay1" class="col-sm-4 control-label">发货时间：</label>
-																														<div class="col-sm-8">
-																															<input type="text" class="form-control" > 
-																														</div>
-																													</div>
-																												</li>  
-                                                     </ul>
-                                                     <ul>
-																												 <li>
-																												 	<div class="form-group">
-																												 		<label for="cleanWay1" class="col-sm-4 control-label">申请人：</label>
-																												 		<div class="col-sm-8">
-																												 			<input type="text" class="form-control" > 
-																												 		</div>
-																												 	</div>
-																												 </li> 
-																												 <li>
-																												 <div class="form-group">
-																												 	<label for="cleanWay1" class="col-sm-4 control-label">申请时间：</label>
-																												 	<div class="col-sm-8">
-																												 		<input type="text" class="form-control" > 
-																												 	</div>
-																												 </div>
-																												 </li> 
-																												 <li>
-																												 <div class="form-group">
-																												 	<label for="cleanWay1" class="col-sm-4 control-label">发货员：</label>
-																												 	<div class="col-sm-8">
-																												 		<input type="text" class="form-control" > 
-																												 	</div>
-																												 </div>
-																												 </li> 
-																												 <li>
-																												 <div class="form-group">
-																												 	<label for="cleanWay1" class="col-sm-4 control-label">住院号：</label>
-																												 	<div class="col-sm-8">
-																												 		<input type="text" class="form-control" > 
-																												 	</div>
-																												 </div>
-																												 </li> 
-                                                     </ul>
-                                                 </div>
-                                             </div>
-                                             <div class="deliveryInfo-left-bottom">
-                                                 <table id="baseInfo"></table>
-                                             </div>
-                                     </div>
-                                     <div class="deliveryInfo-right">
-                                         <div class="deliveryInfo-right-top">
-                                             <div class="deliveryInfo-right-top-title">
-                                                 丢失材料明细
-                                             </div>
-                                             <div class="deliveryInfo-right-top-table">
-                                                 <table id="missingMaterialDetails"></table>
-                                             </div>
-                                         </div>
-                                         <div class="deliveryInfo-right-bottom">
-                                             <div class="deliveryInfo-right-bottom-title">
-                                                 发货单明细
-                                             </div>
-                                             <div class="deliveryInfo-right-bottom-table">
-                                                  <table id="invoiceDetails"></table>
-                                             </div>
-                                         </div>
-                                     </div>
-                                 </div>
-                                <!-- 发货信息 end -->
-                            </div>
-                            <div class="modal-footer">
-                                <button type="button" class="btn btn-default" 
-                                        data-dismiss="modal">关闭
-                                </button>
-                                <button type="button" class="btn btn-primary">
-                                    提交更改
-                                </button>
-                            </div>  
-                            <!-- 模态框 end -->
+		<div class="modal-dialog">
+				<div class="modal-content">
+						<div class="modal-header">
+								<button type="button" class="close" data-dismiss="modal" 
+												aria-hidden="true">×
+								</button>
+								<h4 class="modal-title" id="myModalLabel">
+										发货信息
+								</h4>
+						</div>
+						<div class="modal-body" id="toolsModalBody"> 
+								<!-- 模态框 -->
+								<!-- 发货信息 -->
+								 <div class="deliveryInfo">
+										 <div class="deliveryInfo-left">
+												 <div class="deliveryInfo-left-title">
+														 基础信息
+												 </div>
+														<div class="deliveryInfo-left-top">
+																 <div class="deliveryInfo-left-ul">
+																		 <ul>
+																				 <li>
+																						 <div class="form-group">
+																							 <label for="cleanWay1" class="col-sm-4 control-label">流水号：</label>
+																							 <div class="col-sm-8">
+																									<input type="text" class="form-control" > 
+																							 </div>
+																						 </div>
+																				 </li>
+																				 <!-- // -->
+																				 <li>
+																						<div class="form-group">
+																							<label for="cleanWay1" class="col-sm-4 control-label">申请科室：</label>
+																							<div class="col-sm-8">
+																								<input type="text" class="form-control" > 
+																							</div>
+																						</div>
+																				 </li>
+																				<li>
+																					<div class="form-group">
+																						<label for="cleanWay1" class="col-sm-4 control-label">责任人：</label>
+																						<div class="col-sm-8">
+																							<input type="text" class="form-control" > 
+																						</div>
+																					</div>
+																				</li>
+																				<li>
+																					<div class="form-group">
+																						<label for="cleanWay1" class="col-sm-4 control-label">发货时间：</label>
+																						<div class="col-sm-8">
+																							<input type="text" class="form-control" > 
+																						</div>
+																					</div>
+																				</li>  
+																		 </ul>
+																		 <ul>
+																				 <li>
+																					<div class="form-group">
+																						<label for="cleanWay1" class="col-sm-4 control-label">申请人：</label>
+																						<div class="col-sm-8">
+																							<input type="text" class="form-control" > 
+																						</div>
+																					</div>
+																				 </li> 
+																				 <li>
+																				 <div class="form-group">
+																					<label for="cleanWay1" class="col-sm-4 control-label">申请时间：</label>
+																					<div class="col-sm-8">
+																						<input type="text" class="form-control" > 
+																					</div>
+																				 </div>
+																				 </li> 
+																				 <li>
+																				 <div class="form-group">
+																					<label for="cleanWay1" class="col-sm-4 control-label">发货员：</label>
+																					<div class="col-sm-8">
+																						<input type="text" class="form-control" > 
+																					</div>
+																				 </div>
+																				 </li> 
+																				 <li>
+																				 <div class="form-group">
+																					<label for="cleanWay1" class="col-sm-4 control-label">住院号：</label>
+																					<div class="col-sm-8">
+																						<input type="text" class="form-control" > 
+																					</div>
+																				 </div>
+																				 </li> 
+																		 </ul>
+																 </div>
+														 </div>
+														 <div class="deliveryInfo-left-bottom">
+																 <table id="baseInfo"></table>
+														 </div>
+										 </div>
+										 <div class="deliveryInfo-right">
+												 <div class="deliveryInfo-right-top">
+														 <div class="deliveryInfo-right-top-title">
+																 丢失材料明细
+														 </div>
+														 <div class="deliveryInfo-right-top-table">
+																 <table id="missingMaterialDetails"></table>
+														 </div>
+												 </div>
+												 <div class="deliveryInfo-right-bottom">
+														 <div class="deliveryInfo-right-bottom-title">
+																 发货单明细
+														 </div>
+														 <div class="deliveryInfo-right-bottom-table">
+																	<table id="invoiceDetails"></table>
+														 </div>
+												 </div>
+										 </div>
+								 </div>
+								<!-- 发货信息 end -->
+						</div>
+						<div class="modal-footer">
+								<button type="button" class="btn btn-default" 
+												data-dismiss="modal">关闭
+								</button>
+								<button type="button" class="btn btn-primary">
+										提交更改
+								</button>
+						</div>  
+						<!-- 模态框 end -->
 
-                            </div>
-                            
-                        </div><!-- /.modal-content -->
-                    </div><!-- /.modal-dialog -->	
+						</div>
+						
+				</div><!-- /.modal-content -->
+		</div><!-- /.modal-dialog -->	
 </div>
 <!-- 模态框1 -->
  <!-- jquery 1.9.1 -->
@@ -250,14 +297,42 @@
 	<script language="javascript" type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/bootstrap-datetimepicker/branch/js/bootstrap-datetimepicker.js"></script>
 	
 <!-- JS公共类 -->
+<!-- slickGrid -->
+<script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/lib/firebugx.js"></script>
+<script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/lib/jquery-ui-1.11.3.min.js"></script>
+<script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/lib/jquery-ui-1.8.16.custom.min.js"></script>
+<script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/lib/jquery.event.drag-2.3.0.js"></script>
+<script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/lib/jquery.jsonp-2.4.min.js"></script>
+<script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/slick.core.js"></script>
+<script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/slick.formatters.js"></script>
+<script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/slick.editors.js"></script>
+<script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/plugins/slick.rowselectionmodel.js"></script>
+<script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/slick.dataview.js"></script>
+<script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/slick.remotemodel.js"></script>
+<script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/controls/slick.pager.js"></script>
+<script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/controls/slick.columnpicker.js"></script>
+<script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/plugins/slick.checkboxselectcolumn.js"></script>
+<script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/plugins/slick.autotooltips.js"></script>
+<script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/plugins/slick.cellrangedecorator.js"></script>
+<script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/plugins/slick.cellrangeselector.js"></script>
+<script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/plugins/slick.cellcopymanager.js"></script>
+<script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/plugins/slick.cellselectionmodel.js"></script>
+<script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/plugins/slick.rowselectionmodel.js"></script>
+<!-- <script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/lib/enhancementpager/libs/jquery.dropkick-1.0.0.js"></script> -->
+<script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/lib/enhancementpager/slick.enhancementpager.js"></script>
+<script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/slick.groupitemmetadataprovider.js"></script>
+<script src="${basePath}/dx-disinfectsystem/plugins/SlickGrid/slick.grid.js"></script>
+<!-- slickGrid end -->
+
 <!-- <script type="text/javascript" src="tools.js"></script>   -->
 	
 <script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/ie-6/html5shiv-3.7.3/dist/html5shiv.min.js"></script>
 <script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/ie-6/Respond-master/dest/respond.min.js"></script>	
 	
 	
 <!-- 引入自身js -->
-<script type="text/javascript" src="${basePath}/dx-disinfectsystem/js/deliveryManagementApplication/deliveryManagementApplication.min.js"></script>
+<script type="text/javascript" src="${basePath}/dx-disinfectsystem/js/deliveryManagementApplication/jqPaginator.min.js"></script>
+<script type="text/javascript" src="${basePath}/dx-disinfectsystem/js/deliveryManagementApplication/slickDM.js"></script>
 </body>
     <script type="text/javascript">
    	 var WWWROOT = '${basePath}';