Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp
===================================================================
diff -u -r24653 -r24698
--- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp	(.../assemblyManagement.jsp)	(revision 24653)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp	(.../assemblyManagement.jsp)	(revision 24698)
@@ -30,7 +30,7 @@
 <link rel="stylesheet" type="text/css" href="${basePath}/dx-disinfectsystem/plugins/ie-6/ddouble-bsie-fe3a04a/bootstrap/css/bootstrap-ie6.min.css">
 <link rel="stylesheet" type="text/css" href="${basePath}/dx-disinfectsystem/plugins/ie-6/ddouble-bsie-fe3a04a/bootstrap/css/ie.css">
 <!-- x-editable-develop -->
-<link rel="stylesheet"href="${basePath}/dx-disinfectsystem/plugins/bootstrap-x-editable-develop/dist/bootstrap3-editable/css/bootstrap-editable.css">
+<link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/bootstrap-x-editable-develop/dist/bootstrap3-editable/css/bootstrap-editable.css">
 <!-- bootstrap table -->
 <link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/bootstrap-table/css/bootstrap-table.css">
 <!-- bootstrap 固定表头  -->
@@ -48,21 +48,33 @@
 
 <!-- 自身CSS -->											
 <link rel="stylesheet" type="text/css" href="${basePath}/dx-disinfectsystem/css/index/index.css">
+<style>
+	 html { overflow: hidden;}
+    body{background:#fff;}
+   .datetimepicker-dropdown-bottom-right{z-index: 200000000;}   
+    table tr{
+		height:30px !important;
+	}
+	.cleanPadding .detail-view td{
+		padding:0px 0px !important;
+		text-align:center;
+	}
+	
+	#in{
+		position:relative;
+		 height: 28px !important;
+		 right:0px;
+		 outline: none;
+         border: none;
+         background:#fff;
+	}
+
+</style>
 <!--[if lt IE 9]>
 <![endif]-->
 <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>
-	<style>
-        body{background:#fff;}
-       .datetimepicker-dropdown-bottom-right{z-index: 200000000;}   
-        table tr{
-    		height:30px !important;
-		}
-		.cleanPadding .detail-view td{
-			padding:0px 0px !important;
-			text-align:center;
-		}
-	</style>
+	
 <script type="text/javascript" src="${basePath}/js/common.js" /></script>
 <script type="text/javascript" src="${basePath}/js/extUtils.js" /></script>
 <script type="text/javascript" src="${basePath}/js/json3.min.js"></script>
@@ -89,12 +101,11 @@
 		    	<div class="row">
 		    		<div class="col-md-5 assembly-task-left" style="height:100%;">
 		    			<form action="" class="form-inline" onsubmit="return false;">
-		    				<div id="tableTopBox" >
+		    				<div id="tableTopBox" style="hieght:250px;">
 				    			<div class="assembly-task-lefttop">
 				    				<div class="form-group basketry">
 									    <label for="searchBarcode">扫描篮筐条码:</label>
 									    <input type="text" class="form-control input-sm" id="searchBarcode" placeholder="扫描篮筐条码">
-									  
 									</div>
 				    			</div>
 			    				<div class="form-group assembly-task-leftprint" id="printClass" style="width:200px;">
@@ -106,6 +117,7 @@
 								 	</select>
 								</div>	    			
 					    		<div class="assembly-task-inputh" id="assemblyTaskLeftTopTableWrapp"> 
+					    			<table id='assemblyTaskLeftTopTable' class='table table-striped cleanPadding table-bordered table-hover' data-height='210' data-toggle data-toggle='table'></table>
 					    		</div>
 				    		</div>
 				    		<div class="assembly-task-leftfoot" id="tableFootBox">
@@ -163,7 +175,7 @@
 		    			<div class="assembly-task-middlefoot" >
 		    				<div>
 								<form class="form-inline">
-									<div class="assembly-task-middlefoot-formlist">
+									<!-- <div class="assembly-task-middlefoot-formlist">
 									  <div class="form-group pull-left assembly-task-middlefoot-form">
 									    <label>检查人条码:</label>
 									    <div class="setInputH">
@@ -176,7 +188,7 @@
 									    	<input type="text" class="form-control" placeholder="检查人" id="inspectorInput">
 									    </div>
 									  </div>
-									</div>
+									</div> -->
 									<div class="assembly-task-middlefoot-formlist">
 									  <div class="form-group pull-left assembly-task-middlefoot-form">
 									    <label>配包人条码:</label>
@@ -205,7 +217,7 @@
 									    </div>
 									  </div>
 									</div>
-									<div class="assembly-task-middlefoot-formlist">
+									<!-- <div class="assembly-task-middlefoot-formlist">
 									  <div class="form-group pull-left assembly-task-middlefoot-form">
 									    <label>包装人条码:</label>
 									    <div class="setInputH">
@@ -218,23 +230,23 @@
 									    	<input type="text" class="form-control" placeholder="包装人" id="wrapper">
 									    </div>
 									  </div>
-									</div>
+									</div> -->
+								<!-- 	<div class="assembly-task-middlefoot-formlist">
+								  <div class="form-group pull-left assembly-task-middlefoot-form">
+								    <label>灭菌人条码:</label>
+								    <div class="setInputH">
+								    	<input type="text" class="form-control" placeholder="灭菌人条码" id="sterileUserCode">
+								    </div>
+								  </div>
+								  <div class="form-group pull-right assembly-task-middlefoot-form">
+								    <label>灭菌人:</label>
+								    <div class="setInputH">
+								    	<input type="text" class="form-control" placeholder="灭菌人" id="sterileUserName">
+								    </div>
+								  </div>
+								</div> -->
 									<div class="assembly-task-middlefoot-formlist">
 									  <div class="form-group pull-left assembly-task-middlefoot-form">
-									    <label>灭菌人条码:</label>
-									    <div class="setInputH">
-									    	<input type="text" class="form-control" placeholder="灭菌人条码" id="sterileUserCode">
-									    </div>
-									  </div>
-									  <div class="form-group pull-right assembly-task-middlefoot-form">
-									    <label>灭菌人:</label>
-									    <div class="setInputH">
-									    	<input type="text" class="form-control" placeholder="灭菌人" id="sterileUserName">
-									    </div>
-									  </div>
-									</div>
-									<div class="assembly-task-middlefoot-formlist">
-									  <div class="form-group pull-left assembly-task-middlefoot-form">
 									    <label>灭菌程序:</label>
 									    <div class="setInputH">
 									    	<select name="" id="sterilingType">
@@ -329,29 +341,43 @@
 					    	<select id="endSelect">
 							</select>
 						</div>
+<!-- 
 						<div class="pull-left ml30">
 			    			<div class="form-group pull-left text-right w100">
 					      		<label class=" control-label" for="instrumentSetSelect">器械包名称:</label>
 					    	</div>
+					         <select name="parentid" style="width:200px" id="instrumentSetSelect"  multiple="multiple">
+					    		<option selected="selected" value="666"></option>
+							 </select> 
+						</div> -->
+						
+						<!-- simon-test begin-->
+						<div class="pull-left ml30">
+							
+			    			<div class="form-group pull-left text-right w100">
+					      		<label class=" control-label" for="instrumentSetSelect">器械包名称:</label>
+					    	</div>
 					    	<select name="parentid" style="width:200px" id="instrumentSetSelect"  multiple="multiple">
-					    		<!-- <option selected="selected" value="666"></option> -->
+					    		
 							</select>
+							<input type="text" id= "in" style="width:200px;height:32px;border-radius:4px;" autocomplete="off"/>
+							<!-- <input type="button" value="设置光标" id= "setFocus" style="width:200px;height:32px;border-radius:4px;"/> -->
 						</div>
+						<!--simon-test end -->
 		    		</div>
 				   	<div class="today-assemble-record-time"> 
 		    			<div class="form-group ml30">
 						   <label  class="pull-left text-right w100" for="departmentsSelect">科室:</label>
 						   <select name="parentid" style="width:200px" id="departmentsSelect"  multiple="multiple">
-					    		<option selected="selected" value="666"></option>
 							</select>
 						</div>
 						<div class="form-group ml30 clearfix qxb-tm">
 						   <label  class="pull-left text-right w100">器械包条码:</label>
 						   <input type="text" class="form-control pull-left" placeholder="器械包条码" id="instrumentCode">
 					    </div>
 					    <div class="form-group ml30 clearfix qxb-tm">
-						   <label  class="pull-left text-right w100" style="padding-right:6px;" id="packagePeople">配包者:</label>
-						   <input type="text" class="form-control pull-left" placeholder="配包者" style="margin-left: -3px;">
+						   <label  class="pull-left text-right w100" style="padding-right:6px;">配包者:</label>
+						   <input type="text" class="form-control pull-left" placeholder="配包者" style="margin-left: -3px;"  id="packagePeople">
 					    </div>
 		    		</div>
 				</form>
@@ -370,6 +396,7 @@
 					</button>
 			    </div>
 				<div id="todayAssemblyRecordTableWrapp" class="over-hidden">
+					<table id='todayAssemblyRecordTable' class='table table-striped table-bordered table-hover' data-toggle data-toggle='table'></table>
 				</div>				
 		    </div>
 	    </div>
@@ -680,7 +707,7 @@
 	       <div class="modal-content">
 	           <div class="modal-header">
 	               <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	               <h4 class="modal-title title-font"></h4>
+	               <h4 class="modal-title title-font">修改器械包信息</h4>
 	           </div>
 	           <div class="modal-body" >
 	           		<form class="form-inline">
@@ -963,28 +990,24 @@
 <script language="javascript" type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/bootstrap-datetimepicker/branch/js/bootstrap-datetimepicker.js"></script>
 
 <!-- bootstrap select2 -->
-<script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/select2-develop/js/select2.min.js"></script>
+<%-- <script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/select2-develop/js/select2.min.js"></script> --%>
+<%-- <script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/select2-develop/js/select2.full.min.js"></script> --%>
+<script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/select2-develop/dist/js/changeselect2.full.js"></script>
 <script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/select2-develop/js/zh-CN.js"></script>
-<script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/select2-develop/js/select2.full.min.js"></script>
 <!-- 配置项js -->
 <%@ include file="/disinfectsystem/print/print2.jsp"%>
 <script type="text/javascript" src="${basePath}/disinfectsystem/print/print.js"/></script>
 <script type="text/javascript" src="${basePath}/disinfectsystem/config/${profile}/print/printConfig.js"/></script>	 
 <script type="text/javascript" src="${basePath}/disinfectsystem/config/${profile}/config.js"></script>
-<script type="text/javascript" src="${basePath}/disinfectsystem/common/cssdUtils.js" /></script>	
-<script type="text/javascript" src="${basePath}/dwr/interface/PackingTableManager.js"></script>
-<script type="text/javascript" src="${basePath}/dwr/interface/UserTableManager.js"></script>
-<script type="text/javascript" src="${basePath}/dwr/interface/TousseInstanceTableManager.js"></script>
-<script type="text/javascript" src="${basePath}/dwr/interface/ForeignTousseApplicationTableManager.js"></script>
-<script type="text/javascript" src="${basePath}/dwr/interface/SterilizationRecordTableManager.js"></script>
-<script type="text/javascript" src="${basePath}/dwr/interface/SupplyRoomConfigTableManager.js"></script>
-<script type="text/javascript" src="${basePath}/dwr/interface/ExpirationDateInfoTableManager.js"></script>
-<script type="text/javascript" src="${basePath}/dwr/engine.js"></script>
+<script type="text/javascript" src="${basePath}/disinfectsystem/common/cssdUtils.js" /></script>
 
+
+
 <!-- 判断数组的方法  -->
 <script type="text/javascript" src="${basePath}/dx-disinfectsystem/js/common/common-tools.js"></script>
 <!-- 引入自身js -->
 <script type="text/javascript" src="${basePath}/dx-disinfectsystem/js/assemblyManagement/assemblyManagement.js"></script>
+<script type="text/javascript" src="${basePath}/dx-disinfectsystem/js/assemblyManagement/todayAssemblyManagementRecord.js"></script>
 </body>
 <script type="text/javascript">
 	 //回收报损
@@ -1020,6 +1043,9 @@
 	     searchURL = searchURL.substring(1, searchURL.length);
 	     taskGroup = decodeURIComponent(searchURL.split("?")[0].split("=")[1]);
 	 }
+
+
+	
 </script>
 </html>
 
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagement.js
===================================================================
diff -u -r24653 -r24698
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagement.js	(.../assemblyManagement.js)	(revision 24653)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagement.js	(.../assemblyManagement.js)	(revision 24698)
@@ -7,8 +7,6 @@
 var loseOrDameage_type;
 var loseOrDameage_packingTaskId;
 
-
-
 //打印标签部分
 var packing = false;
 var packingToussesArray = []; // 装配的器械包数组，用于Selenium自动化测试
@@ -17,8 +15,8 @@
 
 //增加table的paddiing
 function addPaddingBottom(pbClass){
-  $("."+pbClass).find(".fixed-table-container").css("padding-bottom","45px");
-  $("#"+pbClass).find(".fixed-table-container").css("padding-bottom","45px");
+    $("."+pbClass).find(".fixed-table-container").css("padding-bottom","45px");
+    $("#"+pbClass).find(".fixed-table-container").css("padding-bottom","45px");
 }
 //点击装配按钮
 $("#packPrint").click(function(){
@@ -54,15 +52,15 @@
 	var sterileDate = $("#determineDate").val();
 
 	if(sterileDate == undefined || sterileDate == ""){
-      var date = new Date();
-      Y = date.getFullYear() + '-';
-      M = (date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1) : date.getMonth()+1) + '-';
-      D = date.getDate() + ' ';
-      D = (date.getDate() < 10 ? '0'+(date.getDate()) : date.getDate());
-      sterileDate =  parseInt(Y+M+D);
-
+        var date = new Date();
+	    Y = date.getFullYear();
+	    M = (date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1) : date.getMonth()+1);
+	    D = (date.getDate() < 10 ? '0'+(date.getDate()) : date.getDate());
+	    sterileDate =  Y+"-"+M+"-"+D;
     }
-	console.log("日期",sterileDate);
+    console.log("psese....",Date.parse(sterileDate.replace(/-/g,"/")));
+	console.log("时间",sterileDate);
+        console.log("转化时间",new Date(sterileDate).getTime());
 	//外来器械拆包信息  splitPackage
 	//篮筐条码
 	//扫描的篮筐条码 scannedBasketBarcodes
@@ -100,20 +98,20 @@
 	}
 	
 	// 开始构造参数循环调用装配方法
-	  var tempTableId = "";
-	  if($("#assemblyTaskleftFootTable").bootstrapTable('getSelections').length>0){
-		  tempTableId = "assemblyTaskleftFootTable"; 
-	  }else{
-		  tempTableId = "assemblyTaskLeftTopTable"; 
-	  }
-	  var table = $("#" + tempTableId);
-	  var selections = table.bootstrapTable('getSelections');
-	  if(selections == null || selections.length == 0){
-		  return ;
-	  }
-	  var packingTaskArray = [];
-	  for(var tousseIndex=0;tousseIndex<selections.length;tousseIndex++){
-		  var tousseNode = selections[tousseIndex];
+	var tempTableId = "";
+	if($("#assemblyTaskleftFootTable").bootstrapTable('getSelections').length>0){
+		tempTableId = "assemblyTaskleftFootTable"; 
+	}else{
+		tempTableId = "assemblyTaskLeftTopTable"; 
+	}
+	var table = $("#" + tempTableId);
+	var selections = table.bootstrapTable('getSelections');
+	if(selections == null || selections.length == 0){
+		return ;
+	}
+	var packingTaskArray = [];
+	for(var tousseIndex=0;tousseIndex<selections.length;tousseIndex++){
+		var tousseNode = selections[tousseIndex];
   		var pTousseName = tousseNode.tousseName;
   		var haveIDCard = tousseNode.haveIDCard;
   		 // 跳过有标识牌的器械包
@@ -122,65 +120,65 @@
   		 }*/
   		 //器械包装配数量
   		var packingAmount = tousseNode.amount;
-  		 if(packingAmount <= 0){
-  		  continue;
-  		}
+	    if(packingAmount <= 0){
+	        continue;
+	    }
 
-	  var taskIdArray = [];
-      var scannedBasketBarcodes = [];
-      var basketBarcode;
-      var tousseName;
-      var tousseType;
-      var packageType;
-      var sterilingType;
-      var supplierName;
-      var damages;
-      var errors;
-      var department;
-      var departmentArray = [];
-      var status;
-      var urgentAmount;
-      //遍历器械包下的每条装配任务数据
-      var children = tousseNode.children;
+		var taskIdArray = [];
+	    var scannedBasketBarcodes = [];
+	    var basketBarcode;
+	    var tousseName;
+	    var tousseType;
+	    var packageType;
+	    var sterilingType;
+	    var supplierName;
+	    var damages;
+	    var errors;
+	    var department;
+	    var departmentArray = [];
+	    var status;
+	    var urgentAmount;
+	    //遍历器械包下的每条装配任务数据
+	    var children = tousseNode.children;
       
-      for(var taskIndex=0;taskIndex<children.length;taskIndex++){
-      	var task = children[taskIndex];
-				tousseName = task.tousseName;
-				status = task.status;
-				basketBarcode = task.basketBarcode;
-				urgentAmount = task.urgentAmount;
-      	var taskId = task.taskId;
-      	
-      	var amount = task.amount;
-      	if(amount > packingAmount){
-      		amount = packingAmount;
-      	}
-      	packageType = task.packageType;
-//            	if(useManualSelectPackageType()){
-//            		packageType = Ext4.getCmp('packageType').getValue();
-//            	}
-        sterilingType = task.sterilingMethod;
-//            	if(isUndefinedOrNullOrEmpty(sterilingType) || useManualSelectPackageType()){
-//            		sterilingType = Ext4.getCmp('sterilingType').getValue();
-//            	}
-      	tousseType = task.tousseType;
-      	supplierName = task.supplierName;
-      	damages = task.damages;
-      	errors = task.errors;
-      	department = task.department;
-      	departmentArray.push(department);
-      	if(!sstsConfig.allowPackingWhenUnSupplementMaterial){
-     		if(errors != null && errors.length > 0){
-         		//showResult("材料缺失，不够组成器械包，请补充缺失器械！" , null , sstsConfig.messagePauseTimeOnPackingPage);
-                alert("材料缺失，不够组成器械包，请补充缺失器械！");
-         		return;
-            }
-            if(damages != null && damages.length > 0){
-            	//showResult("材料已报损，不够组成器械包，请补充报损器械！" , null , sstsConfig.messagePauseTimeOnPackingPage);
-            	alert("材料已报损，不够组成器械包，请补充报损器械！");
-            	return;
-            }
-     	}    	
+        for(var taskIndex=0;taskIndex<children.length;taskIndex++){
+      	    var task = children[taskIndex];
+			tousseName = task.tousseName;
+			status = task.status;
+			basketBarcode = task.basketBarcode;
+			urgentAmount = task.urgentAmount;
+      	    var taskId = task.taskId;
+      		var amount = task.amount;
+	      	if(amount > packingAmount){
+	      		amount = packingAmount;
+	      	}
+      	    packageType = task.packageType;
+          	//  if(useManualSelectPackageType()){
+            //		packageType = Ext4.getCmp('packageType').getValue();
+            //	}
+            sterilingType = task.sterilingMethod;
+            //	if(isUndefinedOrNullOrEmpty(sterilingType) || useManualSelectPackageType()){
+            //		sterilingType = Ext4.getCmp('sterilingType').getValue();
+            //	}
+	      	tousseType = task.tousseType;
+	      	supplierName = task.supplierName;
+	      	damages = task.damages;
+	      	errors = task.errors;
+	      	department = task.department;
+	      	departmentArray.push(department);
+	      	if(!sstsConfig.allowPackingWhenUnSupplementMaterial){
+	     		if(errors != null && errors.length > 0){
+	         		//showResult("材料缺失，不够组成器械包，请补充缺失器械！" , null , sstsConfig.messagePauseTimeOnPackingPage);
+	                alert("材料缺失，不够组成器械包，请补充缺失器械！");
+	         		return;
+	            }
+	            if(damages != null && damages.length > 0){
+	            	//showResult("材料已报损，不够组成器械包，请补充报损器械！" , null , sstsConfig.messagePauseTimeOnPackingPage);
+	            	alert("材料已报损，不够组成器械包，请补充报损器械！");
+	            	return;
+	            }
+	     	} 
+	     	taskIdArray.push(taskId);   	
             	/*if(status == '待确认'){
 					showResult(tousseName+",有器械丢失，请确认！" , null , sstsConfig.messagePauseTimeOnPackingPage);
 					return;
@@ -196,154 +194,147 @@
                        return;
                    }
             	}*/
-        taskIdArray.push(taskId);
+        	
               /* if(packingAmount > 0){
                
                	scannedBasketBarcodes.push(basketBarcode);
                	packingAmount -= amount;
                	
                }*/
-            	
-			 };
-			/* if(packingAmount > 0){
-				 showResult(tousseName + "需装配数量已超过该器械包所有装配任务数量之和." , null , sstsConfig.messagePauseTimeOnPackingPage);
-				 delBasketItems.splice(dl,1);//删除
-				 return;
-			 }*/
-			
-			 //请求后台装配方法
-			 taskIdArray = taskIdArray.join(";");
-//			 packingTousse(false,basketBarcode,scannedBasketBarcodes.join(";"),taskIdArray.join(";"),tousseName,tousseType,pNode.get('amount'),packageType,sterilingType,supplierName,departmentArray.join(";"),pNode.get('urgentAmount'));
-			    //var taskIds = taskIdsArray.join(";");
-				//装配数量
-				var inputId ="";
-				if (tempTableId ==  "assemblyTaskleftFootTable") {
-					inputId = '#input_'+tousseNode.tousseID;
-				} else {
-					inputId = '#topInput_'+tousseNode.tousseID;
-				}
-				var inputAmount = $(inputId).val();
-				//return;
-				var params = {
-						"taskIds":taskIdArray,
-				    	"inspector":inspector,
-				    	"inspectorCode":inspectorCode,
-				    	"operator":operator,
-				    	"operatorCode":operatorCode,
-				    	"reviewer":reviewer,
-				    	"reviewerCode":reviewerCode,
-				    	"sterileUserName":sterileUserName,
-				    	"sterileUserCode":sterileUserCode,
-				    	"wrapper":wrapper,
-				    	"wrapperCode":wrapperCode,
-				    	"packageType":packageType,
-				    	"sterilingType":sterilingType,
-				    	"sterileDate": new Date(sterileDate).getTime(),
-				    	"packAmount":inputAmount,
-				    	"taskGroup":taskGroup,
-				    	"frequency":frequency,
-				    	"urgentAmount":urgentAmount,
-				    	"remark":remark
-					};
-				
-				
-				if(inspector == ""){
-					alert("请扫描检查人条码");
-					return;
-				}
-				if(operator == "" ){
-					alert("请扫描配包人条码");
-					return;
-				}
-				if(reviewer == ""){
-					alert("请扫描审核人条码");
-					return;
-				}
-				if(wrapper == ""){
-					alert("请扫描包装人条码");
-					return;
-				}
-				if(sterileUserName == ""){
-					alert("请扫描灭菌人条码");
-					return;
-				}
-				$.ajax({
-				    url:WWWROOT+"/disinfectSystem/packingController/packingTousse.mhtml",
-				    dataType: "json",
-				    async:false,
-				    cache:false,//解决ie
-				    type: "post", 
-				    data:{
-				    	"packingParams": JSON.stringify(params)
-				    },
-				    success:function(result){
-				    	if(result.success == true){
-				    		if (tempTableId ==  "assemblyTaskleftFootTable") {
-				    			reloadPackingTasks();//刷新左下表格
-				    		} else {
-					    		packingTasks = result.packingTasks;
-					    		packingTaskArray = packingTaskArray.concat(packingTasks);
-				    		}
-				    		alert(result.message);
-				    		processAfterPacking(false,result,tousseName,inputAmount);
-			    		    
-				    	}else{
-				    		var addNumHtml= "<div class='panel panel-primary panel-tips'>"
-					               + "<div class='panel-heading'>提示</div>"
-					               + "<div class='panel-body'>"
-					               + ""+result.message+""
-					               + "</div>"
-					               + "</div>";
-				    		$("body").append(addNumHtml);
-				    	}
-				    	
-			
-		   }	
+	    };
+		/* if(packingAmount > 0){
+			 showResult(tousseName + "需装配数量已超过该器械包所有装配任务数量之和." , null , sstsConfig.messagePauseTimeOnPackingPage);
+			 delBasketItems.splice(dl,1);//删除
+			 return;
+		 }*/
+		
+		taskIdArray = taskIdArray.join(";");
+		// packingTousse(false,basketBarcode,scannedBasketBarcodes.join(";"),taskIdArray.join(";"),tousseName,tousseType,pNode.get('amount'),packageType,sterilingType,supplierName,departmentArray.join(";"),pNode.get('urgentAmount'));
+	    //var taskIds = taskIdsArray.join(";");
+		//装配数量
+		var inputId ="";
+		if (tempTableId ==  "assemblyTaskleftFootTable") {
+			inputId = '#input_'+tousseNode.tousseID;
+		} else {
+			inputId = '#topInput_'+tousseNode.tousseID;
+		}
+		var inputAmount = $(inputId).val();
+
+		//return;
+		var params = {
+			"taskIds":taskIdArray,
+	    	"inspector":inspector,
+	    	"inspectorCode":inspectorCode,
+	    	"operator":operator,
+	    	"operatorCode":operatorCode,
+	    	"reviewer":reviewer,
+	    	"reviewerCode":reviewerCode,
+	    	"sterileUserName":sterileUserName,
+	    	"sterileUserCode":sterileUserCode,
+	    	"wrapper":wrapper,
+	    	"wrapperCode":wrapperCode,
+	    	"packageType":packageType,
+	    	"sterilingType":sterilingType,
+	    	"sterileDate": Date.parse(sterileDate.replace(/-/g,"/")),//这样转换是为了兼容ie8
+	    	"packAmount":inputAmount,
+	    	"taskGroup":taskGroup,
+	    	"frequency":frequency,
+	    	"urgentAmount":urgentAmount,
+	    	"remark":remark
+		};
+        
+
+		if(inspector == ""){
+			alert("请扫描检查人条码");
+			return;
+		}
+		if(operator == "" ){
+			alert("请扫描配包人条码");
+			return;
+		}
+		if(reviewer == ""){
+			alert("请扫描审核人条码");
+			return;
+		}
+		if(wrapper == ""){
+			alert("请扫描包装人条码");
+			return;
+		}
+		if(sterileUserName == ""){
+			alert("请扫描灭菌人条码");
+			return;
+		}
+		$.ajax({
+		    url:WWWROOT+"/disinfectSystem/packingController/packingTousse.mhtml",
+		    dataType: "json",
+		    async:false,
+		    cache:false,//解决ie
+		    type: "get", 
+		    data:{
+		    	"packingParams": JSON.stringify(params)
+		    	
+		    },
+		    success:function(result){
+		    	if(result.success == true){
+		    		if (tempTableId ==  "assemblyTaskleftFootTable") {
+		    			reloadPackingTasks();//刷新左下表格
+		    		} else {
+			    		packingTasks = result.packingTasks;
+			    		packingTaskArray = packingTaskArray.concat(packingTasks);
+		    		}
+		    		alert(result.message);
+		    		processAfterPacking(false,result,tousseName,inputAmount);
+		    	}else{
+		    		var addNumHtml= "<div class='panel panel-primary panel-tips'>"
+			               + "<div class='panel-heading'>提示</div>"
+			               + "<div class='panel-body'>"
+			               + ""+result.message+""
+			               + "</div>"
+			               + "</div>";
+		    		$("body").append(addNumHtml);
+		    	}
+			}	
 		});
-	  }
+	}
 	  
-	   var assembleArray = [];
-		if (assemblyTaskLeftTopTableCon != undefined 
-				&& assemblyTaskLeftTopTableCon.length > 0) {
-			for (var i = 0; i < assemblyTaskLeftTopTableCon.length; i++) {
-				var assembleModel = assemblyTaskLeftTopTableCon[i];
-				if (assembleModel.children.length <= 0) {
-					continue;
+	var assembleArray = [];
+	if (assemblyTaskLeftTopTableCon != undefined && assemblyTaskLeftTopTableCon.length > 0) {
+		for (var i = 0; i < assemblyTaskLeftTopTableCon.length; i++) {
+			var assembleModel = assemblyTaskLeftTopTableCon[i];
+			if (assembleModel.children.length <= 0) {
+				continue;
+			}
+			var assembleArrayModel = [];//新children
+			for (var j = 0; j < assembleModel.children.length; j++) {
+				var objTaskId = assembleModel.children[j].taskId;
+				for (var k = 0; k < packingTaskArray.length; k++) {
+					//相等更改数量
+					if (objTaskId == packingTaskArray[k].taskId) {
+						assembleModel.children[j].amount = packingTaskArray[k].unPackAmount;
+					} 
 				}
-				var assembleArrayModel = [];//新children
-				for (var j = 0; j < assembleModel.children.length; j++) {
-					var objTaskId = assembleModel.children[j].taskId;
-					for (var k = 0; k < packingTaskArray.length; k++) {
-						//相等更改数量
-						if (objTaskId == packingTaskArray[k].taskId) {
-							assembleModel.children[j].amount = packingTaskArray[k].unPackAmount;
-						} 
-					}
 					
-					//大于0，保存起来
-					if (assembleModel.children[j].amount > 0) {
-						assembleArrayModel.push(assembleModel.children[j]);
-					}
+				//大于0，保存起来
+				if (assembleModel.children[j].amount > 0) {
+					assembleArrayModel.push(assembleModel.children[j]);
 				}
+			}
 				
-				if (assembleArrayModel.length > 0) {
-					//把不需要删除的重新赋值给children，改变了children的值
-					assembleModel.children = assembleArrayModel;
-					assembleModel.amount = 0;
-					for (var m = 0; m < assembleArrayModel.length; m++) {
-						assembleModel.amount += parseInt(assembleArrayModel[m].amount);
-					}
-					assembleArray.push(assembleModel);
+			if (assembleArrayModel.length > 0) {
+				//把不需要删除的重新赋值给children，改变了children的值
+				assembleModel.children = assembleArrayModel;
+				assembleModel.amount = 0;
+				for (var m = 0; m < assembleArrayModel.length; m++) {
+					assembleModel.amount += parseInt(assembleArrayModel[m].amount);
 				}
-				
+				assembleArray.push(assembleModel);
 			}
 		}
+	}
 		
-		assemblyTaskLeftTopTableCon = assembleArray;
-		reloadPackingLeftTopTasks();//刷新左上表格
-		printLabelsAfterPacking();//打印标签
-				
-	  
+	assemblyTaskLeftTopTableCon = assembleArray;
+	reloadPackingLeftTopTasks();//刷新左上表格
+	printLabelsAfterPacking();//打印标签
 });
 
 function hidePackingTousseBtnClick_mask(){
@@ -369,15 +360,15 @@
 		isPrintLabelNow = false;
 	}
 	
-//	for(var i=0;i<tousses.length;++i){
-//		if(tousses[i].isPrint){
-//			continue;
-//		}
-//		if(sstsConfig.printLabelWhenReviewing && tousses[i].isReview){
-//			continue;
-//		}
-//		tousseesToPrint.push(tousses[i]);
-//	}
+	//	for(var i=0;i<tousses.length;++i){
+	//		if(tousses[i].isPrint){
+	//			continue;
+	//		}
+	//		if(sstsConfig.printLabelWhenReviewing && tousses[i].isReview){
+	//			continue;
+	//		}
+	//		tousseesToPrint.push(tousses[i]);
+	//	}
 	// 现在不打印标签
 	if (isPrintLabelNow == false || !packing){
 		//showResult(packAmount + "个" + showName + "装配完成" , null , sstsConfig.messagePauseTimeOnPackingPage);
@@ -387,9 +378,9 @@
 	else{
 		// 该物品的器械包定义是否需要打印标签
 		if (isPrint){
-//			if(printImmediately){
-//				doPrintLabels(tousses);
-//			}
+			//if(printImmediately){
+				//doPrintLabels(tousses);
+			//}
 			tousseesToPrint = tousseesToPrint.concat(tousses);
 		}
 		else{
@@ -398,7 +389,6 @@
 		}
 		
 	}
-//	Ext4.getCmp("idCardBarcode").setValue('');//?
 }
 
 function printLabelsAfterPacking(){
@@ -407,7 +397,7 @@
 	}
 	//hidePackingTousseBtnClick_mask();//装配以后提示正在加载的进度条
 	var packAmount = packedToussesArray.length;//返回的数据
-//	showResult(packAmount + "个" + showName + "装配完成");
+	//showResult(packAmount + "个" + showName + "装配完成");
 	//打印分组类型?这个是获取打印分组类型里面的值吗？
 	var printGroupType = $("#printPacketTypes option:selected").val();
 	//var printGroupType = Ext4.getCmp('printGroupType').getValue();
@@ -540,7 +530,6 @@
 	});
 }
 
-
 //包装类型
 function packageTypeRequest(){
 	$.ajax({
@@ -592,65 +581,57 @@
 
 
 $(function(){
+	setInterval(function(){
+	    var  boxW = $(".assembly-task-middlefoot").width();
+	    var jgw  = (boxW-220)/2;
+	    $(".setInputH").css({"width":jgw+"px"});
+	},350);
 	var documentHeight  = $(window).height();
-	//父级标签
-	var parentHead = window.parent.$(".head-index");
-	var navbar =  window.parent.$(".content-index");
-	var parentHeadIf = window.parent.$(".content-index-toggle-off");
-	var todayTableHeight = documentHeight - parentHead.height() - navbar.height() - 124;
-
 	//页面一加载就获取焦点
-	$("#searchBarcode").focus();
-   loseAndDamageNum();//丢失和报损的数字
-   /* left top table start*/
-   var tabH = documentHeight-39-123;
-   var tableHTop = tabH*0.45;
-   var tableHFoot = tabH*0.55;
-   $("#tableTopBox").css({"height":tableHTop+"px"});
-   $("#tableFootBox").css({"height":tableHFoot+"px"});
-   var resultHTop = tableHTop-40;
-   var resultHFoot = tableHFoot-76; 
-
-
-   var assemblyTaskLeftTopTable = "<table id='assemblyTaskLeftTopTable' class='table table-striped cleanPadding table-bordered table-hover' data-height='" + resultHTop + "' data-toggle data-toggle='table'></table>";
-   $("#assemblyTaskLeftTopTableWrapp").append(assemblyTaskLeftTopTable);
+    $("#searchBarcode").focus();
+    loseAndDamageNum();//丢失和报损的数字
+  
+    var tabH = documentHeight-39-123;
+ 	var tableHFoot = tabH-250;
+    $("#tableFootBox").css({"height":tableHFoot+"px"});   
+    var resultHFoot = tableHFoot-76; 
+   
+    /* left top table start*/
+ 
     /*在篮筐中输入条码*/
-     $("#searchBarcode").keydown(function(e){
-       if (e.keyCode == 13) {
-     	  var searchBarcodeVal = $("#searchBarcode").val();
-     	
-     	  if(searchBarcodeVal == ""){
-     		  alert("请扫描篮筐条码");
-     		  return;
-     	  }
+    $("#searchBarcode").keydown(function(e){
+        if (e.keyCode == 13) {
+     	    var searchBarcodeVal = $("#searchBarcode").val();
+     	    if(searchBarcodeVal == ""){
+     		    alert("请扫描篮筐条码");
+     		    return;
+     	    }
      	 
-       $("#searchBarcodeHidden").val(searchBarcodeVal);
-       searchBarcodeHidden = $("#searchBarcodeHidden").val();
-       $("#searchBarcode").val("");
-       reloadTopTableMoreborde(searchBarcodeHidden);
+        	$("#searchBarcodeHidden").val(searchBarcodeVal);
+            searchBarcodeHidden = $("#searchBarcodeHidden").val();
+            $("#searchBarcode").val("");
+            reloadTopTableMoreborde(searchBarcodeHidden);
            //把表格高度变小
-           $("#assemblyTaskLeftTopTable").css({"min-width": "1100px"});
-           $("#assemblyTaskLeftTopTable th,#assemblyTaskLeftTopTable td").css({
-             "padding-bottom":"2px",
-             "padding-top":"2px"
-           });
-           $(".fixed-table-toolbar .columns,.fixed-table-toolbar .bs-bars").css({
-             "line-height":"0",
-             "margin-top":"4px",
-             "margin-bottom":"4px"
-           });
+            $("#assemblyTaskLeftTopTable").css({"min-width": "1100px"});
+	        $("#assemblyTaskLeftTopTable th,#assemblyTaskLeftTopTable td").css({
+	            "padding-bottom":"2px",
+	            "padding-top":"2px"
+	        });
+	        $(".fixed-table-toolbar .columns,.fixed-table-toolbar .bs-bars").css({
+	            "line-height":"0",
+	            "margin-top":"4px",
+	            "margin-bottom":"4px"
+	        });
           // subText("assemblyTaskleftTopTable");
           // $("#assemblyTaskLeftTopTableWrapp .fixed-table-container").css({"padding-bottom":"25px"});
            //topTableRowClickEvent();
        } 
-   })
+    })
 
-
-
     //中间的高度
-   //计算table的高度
+    //计算table的高度
     //var taskmiddleTop = $(".assembly-task-middlefoot").offset().top;
-     //console.log("高度，，",taskmiddleTop);
+    //console.log("高度，，",taskmiddleTop);
      
     taskmiddleH = documentHeight -335-123;
     $(".assembly-task-middlefoot").css({"height":taskmiddleH+"px","overflow-y":"auto"});
@@ -696,90 +677,70 @@
    
     assemblyTaskLeftTopload([],assemblyTaskLeftTopTable_columns);
     $(".fixed-table-toolbar .columns,.fixed-table-toolbar .bs-bars").css({
-      "line-height":"0",
-      "margin-top":"4px",
-      "margin-bottom":"4px"
+        "line-height":"0",
+        "margin-top":"4px",
+        "margin-bottom":"4px"
     });
     $("#assemblyTaskLeftTopTableWrapp .fixed-table-container").css({"padding-bottom":"25px"});
-     //右边材料清单
-     var materialsTop = $("#materialsMenu").offset().top;
-     var materialsH = documentHeight-materialsTop-123;
-     var materialstable = "<table id='materialsTable' class='table table-striped table-bordered table-hover' data-height='"+materialsH+"' data-toggle data-toggle='table'></table>";                   
-     $("#materialsMenu").append(materialstable);
-     materialsLoadTable([],materials_columns);
-      //把表格的高度变小
-     $("#materialsTable").css({"min-width": "300px"});
-     $("#materialsTable th,#materialsTable td").css({
-       "padding-bottom":"2px",
-       "padding-top":"2px"
-     })
-     /*材料清单 table end*/
+    //右边材料清单
+    var materialsTop = $("#materialsMenu").offset().top;
+    var materialsH = documentHeight-materialsTop-123;
+    var materialstable = "<table id='materialsTable' class='table table-striped table-bordered table-hover' data-height='"+materialsH+"' data-toggle data-toggle='table'></table>";                   
+    $("#materialsMenu").append(materialstable);
+    materialsLoadTable([],materials_columns);
+    //把表格的高度变小
+    $("#materialsTable").css({"min-width": "300px"});
+    $("#materialsTable th,#materialsTable td").css({
+        "padding-bottom":"2px",
+        "padding-top":"2px"
+    })
+    /*材料清单 table end*/
    
-  //补充丢失/报损表格
-  var addLoseTable="<table id='addLoseTable' class='table table-striped table-bordered table-hover' data-height='284' data-toggle data-toggle='table'></table>";
-  $('#addLoseTableWrapper').append(addLoseTable);
-  registerLoseOrDamageSubmitHandler("comfirmAddlose");
-  //补充丢失弹框
-  $("#addLose").click(function(){
-	  loseOrDamageModel("丢失","");
-  });  
-  //补充报损器械弹框
-  $("#addBreakage").click(function(){
-	loseOrDamageModel("报损","");
-  })
-   //添加报损器械按钮弹框
-  $("#addBreakageMsg").click(function(){
-    $('#addBreakageMsgModel').modal('show');
-    $("#addBreakageMsgModel .modal-title").text("器材报损单信息");
-    addPaddingBottom("addBreakageMsgModel");
-  })
+    //补充丢失/报损表格
+    var addLoseTable="<table id='addLoseTable' class='table table-striped table-bordered table-hover' data-height='284' data-toggle data-toggle='table'></table>";
+    $('#addLoseTableWrapper').append(addLoseTable);
+    registerLoseOrDamageSubmitHandler("comfirmAddlose");
+	//补充丢失弹框
+	$("#addLose").click(function(){
+		loseOrDamageModel("丢失","");
+	});  
+    //补充报损器械弹框
+    $("#addBreakage").click(function(){
+	    loseOrDamageModel("报损","");
+    })
+    //添加报损器械按钮弹框
+    $("#addBreakageMsg").click(function(){
+	    $('#addBreakageMsgModel').modal('show');
+	    $("#addBreakageMsgModel .modal-title").text("器材报损单信息");
+	    addPaddingBottom("addBreakageMsgModel");
+    })
 
-  //添加报质量监测按钮弹框
-  $("#addQuality").click(function(){
-    $('#addQualityModel').modal('show');
-    $("#addQualityModel .modal-title").text("质量监测信息");
-  })
+    //添加报质量监测按钮弹框
+    $("#addQuality").click(function(){
+        $('#addQualityModel').modal('show');
+        $("#addQualityModel .modal-title").text("质量监测信息");
+    })
 
-  //打印回收清单按钮弹框
-  $("#printRecycleList").click(function(){
-    $('#printRecycleListModel').modal('show');
-    $("#printRecycleListModel .modal-title").text("打印回收清单");
-  })
+    //打印回收清单按钮弹框
+    $("#printRecycleList").click(function(){
+        $('#printRecycleListModel').modal('show');
+        $("#printRecycleListModel .modal-title").text("打印回收清单");
+    })
 
- 
- 
-  //装配记录点击表格废弃按钮弹框
-  $("#deleteInstrumentBag").click(function(){
-    $('#discardModel').modal('show');
-  })
-
-  //装配记录点击表格修改按钮弹框
-  $("#amendClick").click(function(){
-    $('#amendClickModel').modal('show');
-    $("#amendClickModel .modal-title").text("修改器械包信息");
-  })
-
-  //装配记录点击表格加急按钮弹框
-  $("#urgent").click(function(){
-    $('#urgentModel').modal('show');
-  })
+    //说明书
+    $("#stateBook").click(function(){
+        $('#stateBookModel').modal('show');
+        $("#stateBookModel .modal-title").text("说明书");
+    })
   
-
-  
-  //说明书
-  $("#stateBook").click(function(){
-    $('#stateBookModel').modal('show');
-    $("#stateBookModel .modal-title").text("说明书");
-  })
-  
-  //教学图片
-  $("#teachImg").click(function(){
-    $('#teachImgModel').modal('show');
-    $("#teachImgModel .modal-title").text("教学图片");
-  })
+    //教学图片
+    $("#teachImg").click(function(){
+        $('#teachImgModel').modal('show');
+        $("#teachImgModel .modal-title").text("教学图片");
+    })
  
-  /*left foot table start*/
-  var assemblyTaskleftFootTable_columns=[ 
+    /*left foot table start*/
+    var assemblyTaskleftFootTable_columns=[ 
         {
           checkbox : true,
           switchable: false
@@ -890,17 +851,17 @@
            align : 'center',
            sortable:true
         }
-  ]; 
-  var assemblyTaskleftFootTable = "<table id='assemblyTaskleftFootTable' class='table table-striped table-bordered table-hover cleanPadding' data-height='" + resultHFoot + "' data-toggle data-toggle='table'></table>";                  
-  $("#assemblyTaskleftFootTableWrapp").append(assemblyTaskleftFootTable);  
-  function reloadPackingTasks(){
-	  $("#assemblyTaskleftFootTable").bootstrapTable("destroy");
-	  loadPackingTasks();
-  }
-  window.reloadPackingTasks = reloadPackingTasks;
-  //左下表格数据
-  function loadPackingTasks(){
-	  $.ajax({
+    ]; 
+    var assemblyTaskleftFootTable = "<table id='assemblyTaskleftFootTable' class='table table-striped table-bordered table-hover cleanPadding' data-height='" + resultHFoot + "' data-toggle data-toggle='table'></table>";                  
+    $("#assemblyTaskleftFootTableWrapp").append(assemblyTaskleftFootTable);  
+	function reloadPackingTasks(){
+	    $("#assemblyTaskleftFootTable").bootstrapTable("destroy");
+		loadPackingTasks();
+	}
+    window.reloadPackingTasks = reloadPackingTasks;
+    //左下表格数据
+    function loadPackingTasks(){
+	    $.ajax({
 		    url:WWWROOT+"/disinfectSystem/packingController/getPackingTaskList.mhtml",
 		    dataType: "json", 
 		    cache:false,//解决ie
@@ -911,7 +872,6 @@
 		        //console.log('start');
 		    },
 		    success: function(result) {
-		    	console.log("左下下下下下表格",result);
 		    	if(result.success == true){
 		    		var mapParent = {};
 		    	      for(var i=0;i<result.data.length;i++){
@@ -933,139 +893,131 @@
 		    		alert("错误");
 		    	}*/
 		    }
-		  });
-  }
-  loadPackingTasks();
-  function assemblyTaskLeftFootload(tableDate,columns){
-	  $("#assemblyTaskleftFootTable").bootstrapTable('destroy');
-      $("#assemblyTaskleftFootTable").bootstrapTable(
-        {   
-            data:tableDate,
-            method : 'get',
-            dataType : "json",
-            dataField : "data",// 这是返回的json数组的key.默认好像是"rows".这里只有前后端约定好就行
-            striped : true,// 设置为 true 会有隔行变色效果
-            undefinedText : " ",// 当数据为 undefined 时显示的字符
-            pagination : false, // 分页
-            pageNumber : 1,// 如果设置了分页，首页页码
-            data_local : "zh-US",// 表格汉化
-            responseHandler : "",
-            search:false,
-            detailView: true,//父子表
-            toolbar:'',
-            sortable: true,//是否启用排序
-            sortOrder: "desc",//排序方式
-            sortName: 'appTime',//排序字段
-            showColumns: true,//删选列按钮
-            showRefresh: true,//刷新按钮
-            clickToSelect: true,
-            formatLoadingMessage: function () {  
-              return "请稍等，正在加载中...";  
-            },  
-            formatNoMatches:function(){ //未找到匹配记录
-              //return " ";
-            },
-            queryParams : function(params) {
-                return {
-                    start : params.offset,
-                    limit : params.limit,
-                    keyword : params.search
-                };
-            },
-            onRefresh: function(params){
-            	if(params && params.type =='click'){
-            		refreshFootTable();
-            	}
-            },
-            idField : "id",
-            columns : columns,//表头
-            onExpandRow: function (index, row, $detail) {
-            	
-            	var thW = $("#assemblyTaskleftFootTable").find("th");
-            	var childrens = row.children;
-                var table="<table id='assemblyTaskleftFootTableSub'>";
-            	for(var i=0;i<childrens.length;i++){   
-            		var tipsColor = "";
-            		var operateHtml = "<img src='/dx-disinfectsystem/img/stop.png' class='cor' onclick='confirmDeleteFootTabel(this)'/>"; 
-            		table += "<tr taskId='"+childrens[i].taskId+"'>"
-                 			+"<td width='"+($(thW[0]).width()+1)+"'></td>"
-                 			+"<td width='"+($(thW[1]).width()+2)+"'></td>";
-            		if(childrens[i].status == '待装配'){
-			            var supplent = true;
-			            for(var j = 0;j < childrens[i].errors.length ; j++) {
-			                if(errorTypeAdd != childrens[i].errors[j].errorType && ((childrens[i].errors[j].amount - childrens[i].errors[j].additionalAmount) != 0)) {
-			                    supplent = false;
-			                }
-			            }
-			            if(!supplent){
-			            	operateHtml += "<button type='button' class='btn btn-success cor' onclick='addloseFootTableBtn(this);'>丢失</button>";
-			            	tipsColor = "style='color:red;'"
-			            }
-			    
-			            if(childrens[i].damages.length > 0){
-			            	operateHtml += "<button type='button' class='btn btn-success cor' onclick='addDameageFootTableBtn(this)'>报损</button>";
-			            	tipsColor = "style='color:red;'";
-			            }
-			          }
-			        	
-            		table += "<td width='"+($(thW[2]).width()+2)+"' "+tipsColor+" ><span id='datachild_index"+i+"'>"+childrens[i].tousseName+"</span></td>"
-            		     +"<td width='"+($(thW[3]).width()+2)+"'>"+childrens[i].amount+"</td>"
-                     +"<td width='"+($(thW[4]).width()+2)+"'>"+childrens[i].urgentAmount+"</td>"
-                     +"<td width='"+($(thW[5]).width()+2)+"'>"+childrens[i].urgentLevel+"</td>"
-                     +"<td width='"+($(thW[6]).width()+2)+"'>"+childrens[i].basketName+"</td>"
-                     +"<td width='"+($(thW[7]).width()+2)+"'>"+operateHtml+"</td>"
-                     +"<td width='"+($(thW[8]).width()+2)+"'>"+childrens[i].department+"</td>"
-                     +"<td width='"+($(thW[9]).width()+2)+"'>"+childrens[i].washTime+"</td>"
-                     +"<td width='"+($(thW[10]).width()+2)+"'>"+childrens[i].status+"</td>"
-                     +"<td width='"+($(thW[11]).width()+1)+"'>"+childrens[i].dateTime+"</td>"
-                     +"</tr>"
-            	}
-              table +="</table>";
-              $detail.html(table);
-              subText("assemblyTaskleftFootTableSub");
-              var footTableSubTr = $detail.find("#assemblyTaskleftFootTableSub tbody tr");
-              materialListSub(footTableSubTr,row);//子级材料清单
-                
-            },
-           onClickRow: function(row,element){
-      			$("#sterilingType").val(row.sterilingMethod);
-      			//根据灭菌程序设置灭菌方式的值
-      			$("#sterilingType").change(); 
-           },
-          onCheck:function(row){//foot
-            $("#sterilingType").val(row.sterilingMethod);
-            //根据灭菌程序设置灭菌方式的值
-            $("#sterilingType").change();
-            //$("#packageType").val(row.packageType);
-             packageTypeRequest();//包裝類型
-             sterilizerNameRequest();//灭菌炉
-        	 packPrintChange();///判断按钮
-        	  $("#assemblyTaskLeftTopTable").bootstrapTable("uncheckAll");
-      		  //父级材料清单
-            materialList(row);
-        	
-           },
-           onUncheck:function(){
-        	   packPrintChange();
-           }
-        });
-  }
+		});
+    }
+    loadPackingTasks();
+    function assemblyTaskLeftFootload(tableDate,columns){
+	    $("#assemblyTaskleftFootTable").bootstrapTable('destroy');
+        $("#assemblyTaskleftFootTable").bootstrapTable(
+	        {   
+	            data:tableDate,
+	            method : 'get',
+	            dataType : "json",
+	            dataField : "data",// 这是返回的json数组的key.默认好像是"rows".这里只有前后端约定好就行
+	            striped : true,// 设置为 true 会有隔行变色效果
+	            undefinedText : " ",// 当数据为 undefined 时显示的字符
+	            pagination : false, // 分页
+	            pageNumber : 1,// 如果设置了分页，首页页码
+	            data_local : "zh-US",// 表格汉化
+	            responseHandler : "",
+	            search:false,
+	            detailView: true,//父子表
+	            toolbar:'',
+	            sortable: true,//是否启用排序
+	            sortOrder: "desc",//排序方式
+	            sortName: 'appTime',//排序字段
+	            showColumns: true,//删选列按钮
+	            showRefresh: true,//刷新按钮
+	            clickToSelect: true,
+	            formatLoadingMessage: function () {  
+	              return "请稍等，正在加载中...";  
+	            },  
+	            formatNoMatches:function(){ //未找到匹配记录
+	              //return " ";
+	            },
+	            onRefresh: function(params){
+	            	if(params && params.type =='click'){
+	            		refreshFootTable();
+	            	}
+	            },
+	            idField : "id",
+	            columns : columns,//表头
+	            onExpandRow: function (index, row, $detail) {
+	            	
+	            	var thW = $("#assemblyTaskleftFootTable").find("th");
+	            	var childrens = row.children;
+	                var table="<table id='assemblyTaskleftFootTableSub'>";
+	            	for(var i=0;i<childrens.length;i++){   
+	            		var tipsColor = "";
+	            		var operateHtml = "<img src='/dx-disinfectsystem/img/stop.png' class='cor' onclick='confirmDeleteFootTabel(this)'/>"; 
+	            		table += "<tr taskId='"+childrens[i].taskId+"'>"
+	                 			+"<td width='"+($(thW[0]).width()+1)+"'></td>"
+	                 			+"<td width='"+($(thW[1]).width()+2)+"'></td>";
+	            		if(childrens[i].status == '待装配'){
+				            var supplent = true;
+				            for(var j = 0;j < childrens[i].errors.length ; j++) {
+				                if(errorTypeAdd != childrens[i].errors[j].errorType && ((childrens[i].errors[j].amount - childrens[i].errors[j].additionalAmount) != 0)) {
+				                    supplent = false;
+				                }
+				            }
+				            if(!supplent){
+				            	operateHtml += "<button type='button' class='btn btn-success cor' onclick='addloseFootTableBtn(this);'>丢失</button>";
+				            	tipsColor = "style='color:red;'"
+				            }
+				    
+				            if(childrens[i].damages.length > 0){
+				            	operateHtml += "<button type='button' class='btn btn-success cor' onclick='addDameageFootTableBtn(this)'>报损</button>";
+				            	tipsColor = "style='color:red;'";
+				            }
+				          }
+				        	
+	            		table += "<td width='"+($(thW[2]).width()+2)+"' "+tipsColor+" ><span id='datachild_index"+i+"'>"+childrens[i].tousseName+"</span></td>"
+	            		     +"<td width='"+($(thW[3]).width()+2)+"'>"+childrens[i].amount+"</td>"
+	                     +"<td width='"+($(thW[4]).width()+2)+"'>"+childrens[i].urgentAmount+"</td>"
+	                     +"<td width='"+($(thW[5]).width()+2)+"'>"+childrens[i].urgentLevel+"</td>"
+	                     +"<td width='"+($(thW[6]).width()+2)+"'>"+childrens[i].basketName+"</td>"
+	                     +"<td width='"+($(thW[7]).width()+2)+"'>"+operateHtml+"</td>"
+	                     +"<td width='"+($(thW[8]).width()+2)+"'>"+childrens[i].department+"</td>"
+	                     +"<td width='"+($(thW[9]).width()+2)+"'>"+childrens[i].washTime+"</td>"
+	                     +"<td width='"+($(thW[10]).width()+2)+"'>"+childrens[i].status+"</td>"
+	                     +"<td width='"+($(thW[11]).width()+1)+"'>"+childrens[i].dateTime+"</td>"
+	                     +"</tr>"
+	            	}
+	              table +="</table>";
+	              $detail.html(table);
+	              subText("assemblyTaskleftFootTableSub");
+	              var footTableSubTr = $detail.find("#assemblyTaskleftFootTableSub tbody tr");
+	              materialListSub(footTableSubTr,row);//子级材料清单
+	                
+	            },
+	            onClickRow: function(row,element){
+	      			$("#sterilingType").val(row.sterilingMethod);
+	      			//根据灭菌程序设置灭菌方式的值
+	      			$("#sterilingType").change(); 
+	            },
+	            onCheck:function(row){//foot
+		            $("#sterilingType").val(row.sterilingMethod);
+		            //根据灭菌程序设置灭菌方式的值
+		            $("#sterilingType").change();
+		            //$("#packageType").val(row.packageType);
+		            packageTypeRequest();//包裝類型
+		            sterilizerNameRequest();//灭菌炉
+		        	packPrintChange();///判断按钮
+		        	$("#assemblyTaskLeftTopTable").bootstrapTable("uncheckAll");
+		      		//父级材料清单
+		            materialList(row);
+	            },
+	            onUncheck:function(){
+	        	    packPrintChange();
+	            }
+	    });
+    }
  
- function refreshFootTable(){
-	 reloadPackingTasks();
- }
+	function refreshFootTable(){
+		reloadPackingTasks();
+	}
 
-  //把表格的高度变小
-  $("#assemblyTaskleftFootTable").css({"min-width": "1100px"});
-  $("#assemblyTaskleftFootTable th,#assemblyTaskleftFootTable td").css({
-    "padding-bottom":"2px",
-    "padding-top":"2px"
-  })
- $("#assemblyTaskLeftFootTableWrapp .fixed-table-container").css({"padding-bottom":"25px"});
-  /*left foot table end*/
+    //把表格的高度变小
+    $("#assemblyTaskleftFootTable").css({"min-width": "1100px"});
+    $("#assemblyTaskleftFootTable th,#assemblyTaskleftFootTable td").css({
+	    "padding-bottom":"2px",
+	    "padding-top":"2px"
+    })
+    $("#assemblyTaskLeftFootTableWrapp .fixed-table-container").css({"padding-bottom":"25px"});
+    /*left foot table end*/
   
-  //补充器械模态框
-  var allModelication_columns=[ 
+    //补充器械模态框
+    var allModelication_columns=[ 
         {
           title : '序号',
           field : 'serialNumber',
@@ -1096,11 +1048,10 @@
            field : 'operate',
            align : 'center'
         }
-  ];
-  
-   
-  //丢失按钮表格中操作状态是补充打印时会弹出的top 模态框
-  var addPrintModelication_columns=[ 
+    ];
+
+    //丢失按钮表格中操作状态是补充打印时会弹出的top 模态框
+    var addPrintModelication_columns=[ 
         {
           title : '当前条码',
           field : 'curentBarode',
@@ -1131,9 +1082,9 @@
            align : 'center',
            sortable:true //正序,逆序
         }
-  ];
-  //丢失按钮表格中操作状态是补充打印时会弹出的footleft 模态框
-  var addPrintFootLeft_columns=[ 
+    ];
+    //丢失按钮表格中操作状态是补充打印时会弹出的footleft 模态框
+    var addPrintFootLeft_columns=[ 
         {
           title : '条码',
           field : 'barode',
@@ -1164,10 +1115,10 @@
            align : 'center',
            sortable:true //正序,逆序
         }
-  ];
+    ];
   
-   //丢失按钮表格中操作状态是补充打印时会弹出的footright 模态框
-  var addPrintFootRight_columns=[ 
+    //丢失按钮表格中操作状态是补充打印时会弹出的footright 模态框
+    var addPrintFootRight_columns=[ 
         {
           title : '器械名称',
           field : 'instrumentName',
@@ -1180,267 +1131,15 @@
           align : 'center',
           sortable:true //正序,逆序
         }
-  ];
-//今天本组装配记录start
- var todayAssemblyRecord_columns=[ 
-    {
-      checkbox : true,
-    },
-    {
-      title : "科室",
-      field : 'depart',
-      align : 'center',
-      sortable:true //正序,逆序
-    },
-    {
-       title : '供应商',
-       field : 'supplierName',
-       align : 'center',
-      sortable:true //正序,逆序
-    },
-    {
-       title : '器械包',
-       field : 'tousseName',
-       align : 'center',
-       sortable:true //正序,逆序
-    },
-    {
-       title : '拆包名称',
-       field : 'splitTousseName',
-       align : 'center',
-       sortable:true //正序,逆序
-    },
-     {
-       title : '数量',
-       field : 'amount',
-       align : 'center',
-       sortable:true //正序,逆序
-    },
-     {
-       title : '配包人',
-       field : 'packer',
-       align : 'center',
-       sortable:true //正序,逆序
-    }, {
-       title : '审核人',
-       field : 'reviewer',
-       align : 'center',
-       sortable:true //正序,逆序
-    }, {
-       title : '装配时间',
-       field : 'packTimeStr',
-       align : 'center',
-       sortable:true //正序,逆序
-    }
-    , {
-       title : '材料汇总',
-       field : 'foreignMaterialsAmount',
-       align : 'center',
-       sortable:true //正序,逆序
-    }
-    , {
-       title : '医生',
-       field : 'doctor',
-       align : 'center',
-       sortable:true //正序,逆序
-    }
-
- ];
-  var todayAssemblyRecordTable = "<table id='todayAssemblyRecordTable' class='table table-striped table-bordered table-hover' data-toggle data-toggle='table'></table>";                   
-   $("#todayAssemblyRecordTableWrapp").append(todayAssemblyRecordTable);
-var InitTable =function(url){
-		//先销毁表格
-	$('#todayAssemblyRecordTable').bootstrapTable("destroy");
-		//添加表格
-	$('#todayAssemblyRecordTable').bootstrapTable({
-		url:url,
-		method:'post',		//请求方式
-		contentType: "application/x-www-form-urlencoded",//请求数据内容格式 默认是 application/json 自己根据格式自行服务端处理
-		height: todayTableHeight,
-		search: true,			//是否搜索
-		pagination: true,	//是否分页
-		pageList: [5, 10, 20, 50],//分页步进值
-		sidePagination: "server",	//服务端分页
-		queryParamsType: "limit",	//查询参数组织方式
-		onColumnSwitch:onColumnSwitch,
-		toolbar:'#exportExcel',
-		queryParams : queryParams, 
-		searchOnEnterKey: "true",	//回车搜索
-		showRefresh: "true",			//刷新按钮
-		showColumns: true,				//列选择按钮
-		minimumCountColumns: 1,		//最少允许的列数
-		clickToSelect: true,			//是否启用点击选中行
-		uniqueId: "ID",						//每一行的唯一标识，一般为主键列
-		cardView: false,          //是否显示详细视图
-		detailView: false,				//是否显示父子表
-		showExport: true,
-		exportDataType: "selected",//导出checkbox选中的行数
-		paginationLoop: false, 		//是否无限循环
-		columns: todayAssemblyRecord_columns,
-	});
-	return InitTable;
-}
-    InitTable(WWWROOT+"/disinfectSystem/grid/gridController/getGrid.mhtml");
-    $("#todayAssemblyRecordTableWrapp .fixed-table-pagination").css("top",$(".wrapp").height()-47);
-	//jq过滤事件
-	var addArray= new Array();
-	var array=[];
-	for (var i = 0; i < todayAssemblyRecord_columns.length; i++) { 
-		if(!todayAssemblyRecord_columns[i].field)
-		{
-			console.log("no create field:"+todayAssemblyRecord_columns[i].field);
-		}
-		if(todayAssemblyRecord_columns[i].field==null)
-		{ 
-			console.log("null field:"+todayAssemblyRecord_columns[i].field);
-		}
-		else
-		{
-				array.push(todayAssemblyRecord_columns[i].field);
-		}
-	}
-
-	$('#todayHistoryHidden').val(JSON.stringify(array));
-	//列筛选
-	function onColumnSwitch(field,checked){
-		var str ={'Name':field,'states':checked}
-		addArray.push(str);
-		Array.prototype.indexOf = function(val) {
-				for (var i = 0; i < this.length; i++) {
-						if (this[i] == val) return i;
-				}
-				return -1;
-		};
-		Array.prototype.remove = function(val) {
-				var index = this.indexOf(val);
-				if (index > -1) {
-						this.splice(index, 1);
-				}
-		};
-		for(var i=0;i<addArray.length;i++){
-				if(addArray[i].states===false){
-						array.remove(addArray[i].Name);
-				}
-				if(addArray[i].states===true){
-						array.push(addArray[i].Name);
-				}
-		}
-		$('#todayHistoryHidden').val(JSON.stringify(array));
-	}
-
-	function queryParams(params,searchName) {
-		console.log("params",params);
-		if(params.search==null||params.search==""){
-			var filtersValue = [];
-		}
-		else{
-		/*	//搜索
-			var todayHistoryHiddenVals = JSON.parse($("#todayHistoryHidden").val());
-			console.log("asasas");
-			var filtersValue = [];
-			
-			for(var i=0;i<todayHistoryHiddenVals.length;i++){//hiddenArr.length
-				if(hiddenArr[i]=="startDateStr"){ 
-					continue;
-				}
-				var filtersAppend = {
-						columnLabel: todayHistoryHiddenVals[i],
-						propFullName: "",
-						value: params.search,
-						operator: ""
-				};
-				filtersValue[i]=filtersAppend;
-			}
-			//
-			filtersValue = [
-				{
-					columnLabel:todayHistoryHiddenVals[1],propFullName:"",value:params.search,operator:"like"
-				}
-					,
-					{
-						columnLabel:hiddenArr[0],propFullName:"",value:params.search,operator:""
-					}
-			]
-			//
-*/		}
-		var temp = {   
-			//这里的键的名字和控制器的变量名必须一直，这边改动，控制器也需要改成一样的
-			offset: params.offset, //页码
-			limit: params.limit,   //每页的条数
-			filters: filtersValue,
-			gridId: "com.forgon.disinfectsystem.packing.findPackingRecordList",
-		}; 
-		return {gridParams:JSON.stringify(temp)};
-	} 
- 
-    //今天分组装配记录
-    $("#todayAssemblyRecordTableWrapp .fixed-table-container").css("padding-bottom","43px");
-    //高度自适应，分页条的定位 
-	$(window).resize(function () {
-		$("#todayAssemblyRecordTable").bootstrapTable('resetView', { 
-			height : $(window).height()  - parentHead.height() - navbar.height() - 124
-		}); 
-		$("#todayAssemblyRecordTableWrapp .fixed-table-pagination").css("top",$(".wrapp").height());
-	});
+    ];
    
-    //点击查询按钮
-	$("#queryTodayPackingRecord").click(function(){
-		var beginSelect = $("#beginSelect option:selected").val();
-		var beginSelect = $("#endSelect option:selected").val();
-		var instrumentSetSelect = $("#instrumentSetSelect option:selected").val();
-		var instrumentCode = $("#instrumentCode").val();
-		var packagePeople = $("#packagePeople").val();
-		
-
-
-		//console.log("todayHistoryHidden",$("#todayHistoryHidden").val());
-		var filters = [];
-		var fil = [];
-		var filtersAppend = {
-				columnLabel:"tousseName",
-				type:'string',//字符串类型
-				value:"阑尾拉钩",
-				operator: "like"
-		};	
-		filters.push(filtersAppend);
-		//console.log("filters",filters);
-		var temp = {   
-				//这里的键的名字和控制器的变量名必须一直，这边改动，控制器也需要改成一样的
-				offset:"", //页码
-				limit: "",   //每页的条数
-				filters: fil,
-				gridId: "com.forgon.disinfectsystem.packing.findPackingRecordList",
-	    }; 
-		
-		$.ajax({
-  		    url:WWWROOT+"/disinfectSystem/grid/gridController/getGrid.mhtml",
- 		    dataType: "json", 
- 		    async: false, 
- 		    data: {gridParams:JSON.stringify(temp)}, 
- 		    type: "post", 
- 		    success: function(result) {
- 		    	console.log("返回的数据",result);
- 		    	if(result.success == true){
- 		    		
- 		    	}else{
- 		    		//alert(result.message);
- 		    	}
- 		    }
-  			
-  		})
-		
-	})
-
-    //器械丢失补充模态框
-   
-   // loadTable("addLoseTable",allModel.list,allModelication_columns,false,false,"",false,true,false);
-
+  
     //器械報損补充模态框
     var addBreakageTable="<table id='addBreakageTable' class='table table-striped table-bordered table-hover' data-height='284' data-toggle data-toggle='table'></table>";
     $('#addBreakageTableWrapper').append(addBreakageTable);
     addBreakageTableload("addBreakageTable",allModelication_columns,addBreakageTableData);
 
-   //丢失按钮表格中操作状态是补充打印时会弹出top的 模态框
+    //丢失按钮表格中操作状态是补充打印时会弹出top的 模态框
     var printAddModelMiddleTable = "<table id='printAddModelMiddleTable' class='table table-striped table-bordered table-hover' data-height='200' data-toggle data-toggle='table'></table>";                   
     $("#printAddModelMiddleTableWrapp").append(printAddModelMiddleTable);
     //loadTable("printAddModelMiddleTable",addPrint.list,addPrintModelication_columns,false,false,"",false,true,false);
@@ -1466,146 +1165,95 @@
     //loadTable("printAmendtable",allApp.list,allApplication_columns,false,false,"printAmend",false,true,false);
     
     //调模态框居中的方法
-   // modelCenter(".addLoseModel"); //器械丢失
+    // modelCenter(".addLoseModel"); //器械丢失
     modelCenter(".addBreakageModel"); //器械報損
     modelCenter(".deleteMsgModel"); //删除模态框
-    modelCenter("#discardModel"); //废弃模态框、
-    modelCenter("#discardReason"); //废弃 点是
-    modelCenter("#urgentModel"); //加急模态框
     modelCenter("#printRecycleListModel"); //打印回收清单按钮
     modelCenter("#todayAssemblyRecordModel"); //装配记录点击表格
     modelCenter("#AmendClickModel"); //装配记录点击表格修改按钮
     modelCenter("#deleteInstrumentBag"); //装配记录点击表格废弃按钮
-    modelCenter("#urgent"); //装配记录点击表格加急按钮
     
+    
     $("#assemblyTaskLeftTopTable").on("check.bs.table",function(row){
     	//首先判断FootTable是否已有选中
     	/*var footCheckeds=$("#assemblyTaskleftFootTable").bootstrapTable("getSelections");
     	if(footCheckeds.length>0){*/
-    		$("#assemblyTaskleftFootTable").bootstrapTable("uncheckAll");
+        $("#assemblyTaskleftFootTable").bootstrapTable("uncheckAll");
     		//packPrintChange();
     	/*}*/
-    		//材料清单
-      		$.ajax({
-      		    url:WWWROOT+"/disinfectSystem/baseData/tousseDefinitionController/getMaterialDefinitionByTousseName.mhtml",
-     		    dataType: "json", 
-     		    async: false, 
-     		    data: {"tousseName":row.tousseName,"tousseDefinitionId":row.tousseID}, 
-     		    type: "post", 
-     		    success: function(result) {
-     		    	if(result.success == true){
-     		    		//器械总数
-     		    		$("#materialTotalAmount").text(result.materialTotalAmount);
-     		    		//一次性物品总数
- 		    			$("#diposableGoodsTotalAmount").text(result.diposableGoodsTotalAmount);         		    			
- 		    			$("#materialsTable").bootstrapTable('destroy');
-         		    	materialsLoadTable(result.rows,materials_columns);
-         		    	metarilsFocus();//显示功能检查
-     		    	}else{
-     		    		alert(result.message);
-     		    	}
-     		    }
-      			
-      		})
-    	
+		//材料清单
+  		$.ajax({
+  		    url:WWWROOT+"/disinfectSystem/baseData/tousseDefinitionController/getMaterialDefinitionByTousseName.mhtml",
+ 		    dataType: "json", 
+ 		    async: false, 
+ 		    data: {"tousseName":row.tousseName,"tousseDefinitionId":row.tousseID}, 
+ 		    type: "post", 
+ 		    success: function(result) {
+ 		    	if(result.success == true){
+ 		    		//器械总数
+ 		    		$("#materialTotalAmount").text(result.materialTotalAmount);
+ 		    		//一次性物品总数
+		    			$("#diposableGoodsTotalAmount").text(result.diposableGoodsTotalAmount);         		    			
+		    			$("#materialsTable").bootstrapTable('destroy');
+     		    	materialsLoadTable(result.rows,materials_columns);
+     		    	metarilsFocus();//显示功能检查
+ 		    	}else{
+ 		    		alert(result.message);
+ 		    	}
+ 		    }
+  		})
     })
 
 });
 
 //加载table
 function loadTable(id,tableDate,columns,isPagination,isSearch,toolbarId,detailView,showColumn,isRefresh){//detailView树形菜单
     $("#"+id).bootstrapTable(
-                {   
-                    data:tableDate,
-                    method : 'get',
-                    dataType : "json",
-                    dataField : "data",// 这是返回的json数组的key.默认好像是"rows".这里只有前后端约定好就行
-                    striped : true,// 设置为 true 会有隔行变色效果
-                    undefinedText : " ",// 当数据为 undefined 时显示的字符
-                    pagination : isPagination, // 分页
-                    pageNumber : 1,// 如果设置了分页，首页页码
-                    data_local : "zh-US",// 表格汉化
-                    responseHandler : "",
-                    search:isSearch,
-                    toolbar:'#'+toolbarId,
-                    //height:setheight,
-                    pageSize : 30,// 如果设置了分页，页面数据条数
-                    pageList : [ 10,20,30], // 如果设置了分页，设置可供选择的页面数据条数。设置为All则显示所有记录。
-                    paginationPreText: "上一页",
-                    paginationNextText: "下一页",
-                    paginationFirstText: "首页",
-                    paginationLastText: "尾页",
-                    detailView:detailView,//树形菜单
-                    sortable: true,//是否启用排序
-                    sortOrder: "desc",//排序方式
-                    sortName: 'appTime',//排序字段
-                    showColumns: showColumn,//删选列按钮
-                    showRefresh: isRefresh,//刷新按钮
-                    silent: true,  //刷新事件必须设置  
-                    formatLoadingMessage: function () {  
-                      return "请稍等，正在加载中...";  
-                    },  
-                    queryParams : function(params) {
-                        return {
-                            start : params.offset,
-                            limit : params.limit,
-                            keyword : params.search
-                        };
-                    },
-                    onDblClickRow: function (row) {
-                        
-                    },
-                    idField : "id",
-                    columns : columns
-                });
-   
+        {   
+            data:tableDate,
+            method : 'get',
+            dataType : "json",
+            dataField : "data",// 这是返回的json数组的key.默认好像是"rows".这里只有前后端约定好就行
+            striped : true,// 设置为 true 会有隔行变色效果
+            undefinedText : " ",// 当数据为 undefined 时显示的字符
+            pagination : isPagination, // 分页
+            pageNumber : 1,// 如果设置了分页，首页页码
+            data_local : "zh-US",// 表格汉化
+            responseHandler : "",
+            search:isSearch,
+            toolbar:'#'+toolbarId,
+            //height:setheight,
+            pageSize : 30,// 如果设置了分页，页面数据条数
+            pageList : [ 10,20,30], // 如果设置了分页，设置可供选择的页面数据条数。设置为All则显示所有记录。
+            paginationPreText: "上一页",
+            paginationNextText: "下一页",
+            paginationFirstText: "首页",
+            paginationLastText: "尾页",
+            detailView:detailView,//树形菜单
+            sortable: true,//是否启用排序
+            sortOrder: "desc",//排序方式
+            sortName: 'appTime',//排序字段
+            showColumns: showColumn,//删选列按钮
+            showRefresh: isRefresh,//刷新按钮
+            silent: true,  //刷新事件必须设置  
+            formatLoadingMessage: function () {  
+              return "请稍等，正在加载中...";  
+            },  
+            queryParams : function(params) {
+                return {
+                    start : params.offset,
+                    limit : params.limit,
+                    keyword : params.search
+                };
+            },
+            onDblClickRow: function (row) {
+                
+            },
+            idField : "id",
+            columns : columns
+    });
 }
 
-//今天本组装配记录
-function todayAssemblyRecordTableload(todayId,tableHead,tableConData){
-  $("#"+todayId).bootstrapTable(
-    {  
-        striped : true,// 设置为 true 会有隔行变色效果
-        undefinedText : " ",// 当数据为 undefined 时显示的字符
-        pagination : true, // 分页
-        pageNumber : 1,// 如果设置了分页，首页页码
-        data_local : "zh-US",// 表格汉化
-        responseHandler : "",
-        search:true,
-        toolbar:'#exportExcel',
-        pageSize : 30,// 如果设置了分页，页面数据条数
-        pageList : [ 10,20,30], // 如果设置了分页，设置可供选择的页面数据条数。设置为All则显示所有记录。
-        paginationPreText: "上一页",
-        paginationNextText: "下一页",
-        paginationFirstText: "首页",
-        paginationLastText: "尾页",
-        height:recoredTableH,
-       // detailView:detailView,//树形菜单
-        sortable: true,//是否启用排序
-        sortOrder: "desc",//排序方式
-        sortName: 'appTime',//排序字段
-        showColumns: true,//删选列按钮
-        showRefresh: false,//刷新按钮
-        silent: true,  //刷新事件必须设置  
-        data:tableConData,
-        formatLoadingMessage: function () {  
-          return "请稍等，正在加载中...";  
-        },  
-        queryParams : function(params) {
-            return {
-                start : params.offset,
-                limit : params.limit,
-                keyword : params.search
-            };
-        },
-        onClickRow: function (row) {//点击每一行
-          $("#todayAssemblyRecordModel").modal('show');
-          $("#todayAssemblyRecordModel .fixed-table-container").css("padding-bottom","40px");
-        },
-        idField : "id",
-        columns : tableHead
-  });
-}
 
 //器械報損补充
 function addBreakageTableload(todayId,tableHead,tableConData){
@@ -1637,7 +1285,7 @@
         },
         idField : "id",
         columns : tableHead
-  });
+    });
 }
 //报损模态
 var addBreakageTableData =new Array();
@@ -1671,129 +1319,10 @@
   });
 
 }*/
-var printAmendtable_columns=[ 
-     {
-       checkbox : true,
-     },
-     {
-       title : "条形码",
-       field : 'barCode',
-       align : 'center',
-       sortable:true //正序,逆序
-     },
-     {
-        title : '器械包',
-        field : 'instrument',
-        align : 'center',
-       sortable:true //正序,逆序
-     },
-     {
-        title : '科室',
-        field : 'deparent',
-        align : 'center',
-        sortable:true //正序,逆序
-     },
-     {
-        title : '配包员',
-        field : 'bagpeo',
-        align : 'center',
-        sortable:true //正序,逆序
-     },
-      {
-        title : '审核人',
-        field : 'auditor',
-        align : 'center',
-        sortable:true //正序,逆序
-     },
-      {
-        title : '包装人',
-        field : 'openBagPeo',
-        align : 'center',
-        sortable:true //正序,逆序
-     }, {
-        title : '清洗时间',
-        field : 'cleanDate',
-        align : 'center',
-        sortable:true //正序,逆序
-     }, {
-        title : '装配时间',
-        field : 'bagDate',
-        align : 'center',
-        sortable:true //正序,逆序
-     }
-     , {
-        title : '包装类型',
-        field : 'bagClass',
-        align : 'center',
-        sortable:true //正序,逆序
-     }
-     , {
-        title : '灭菌程序',
-        field : 'sterilizeProcedure',
-        align : 'center',
-        sortable:true //正序,逆序
-     }
-      , {
-        title : '失效日期',
-        field : 'expiryDate',
-        align : 'center',
-        sortable:true //正序,逆序
-     }
-      , {
-        title : '灭菌炉',
-        field : 'sterilizeBox',
-        align : 'center',
-        sortable:true //正序,逆序
-     }
-      , {
-        title : '炉次',
-        field : 'boxNum',
-        align : 'center',
-        sortable:true //正序,逆序
-     }
-      , {
-        title : '状态',
-        field : 'sterilizeSatatus',
-        align : 'center',
-        sortable:true //正序,逆序
-         }
 
-   ];
-//今天本组装配记录点击表格每一行出现的弹框表格
-$("#printAmendtable").bootstrapTable(
-  {  
-      striped : true,// 设置为 true 会有隔行变色效果
-      undefinedText : " ",// 当数据为 undefined 时显示的字符
-      pageNumber : 1,// 如果设置了分页，首页页码
-      data_local : "zh-US",// 表格汉化
-      responseHandler : "",
-      toolbar:'#printAmend',
-      sortable: true,//是否启用排序
-      sortOrder: "desc",//排序方式
-      sortName: 'appTime',//排序字段
-      showColumns: true,//删选列按钮
-      showRefresh: false,//刷新按钮
-      silent: true,  //刷新事件必须设置  
-      //data:printAmendtableData,
-      formatLoadingMessage: function () {  
-        return "请稍等，正在加载中...";  
-      },  
-      queryParams : function(params) {
-          return {
-              start : params.offset,
-              limit : params.limit,
-              keyword : params.search
-          };
-      },
-      onClickRow: function (row) {//点击每一行
-        $("#todayAssemblyRecordModel").modal('show');
-      },
-      idField : "id",
-      columns : printAmendtable_columns 
-});
 
 $(window).resize(function () {
-  $("#todayAssemblyRecordTable").bootstrapTable('resetView');//自适应宽度
+  //$("#todayAssemblyRecordTable").bootstrapTable('resetView');//自适应宽度
   $("#printAddModelMiddleTable").bootstrapTable('resetView');//自适应宽度
   $("#assemblyTaskLeftTopTable").bootstrapTable('resetView');//自适应宽度
   $("#assemblyTaskLeftFootTable").bootstrapTable('resetView');//自适应宽度
@@ -1903,52 +1432,31 @@
   $("#discardReason").modal('show');
 }
 
-
-
-
 //日期插件
 function datePick(dateId,format,direction){
-  $("#"+dateId).datetimepicker({//选择年月日
-　　format: format,
-　　language: 'zh-CN',
-　　weekStart: 1,
-　　todayBtn: 1,//显示‘今日’按钮
-　　autoclose: 1,
-　　todayHighlight: 1,
-　　startView: 2,//Number, String. 默认值：0, 'hour'，日期时间选择器所能够提供的最精确的时间选择视图。
-　　minView: 2,  
-　　//clearBtn:true,//清除按钮
-　　forceParse: 0,
-    pickerPosition:direction
-　});
+    $("#"+dateId).datetimepicker({//选择年月日
+	　　format: format,
+	　　language: 'zh-CN',
+	　　weekStart: 1,
+	　　todayBtn: 1,//显示‘今日’按钮
+	　　autoclose: 1,
+	　　todayHighlight: 1,
+	　　startView: 2,//Number, String. 默认值：0, 'hour'，日期时间选择器所能够提供的最精确的时间选择视图。
+	　　minView: 2,  
+	　　//clearBtn:true,//清除按钮
+	　　forceParse: 0,
+	    pickerPosition:direction
+　  });
 }
 datePick("dateFrom_breakage","yyyy-mm-dd hh:ii:ss","bottom-right");//添加报损器械
 datePick("determineDate","yyyy-mm-dd","top-right");//灭菌日期
 datePick("dateFrom_Amend","yyyy-mm-dd hh:ii:ss","bottom-right");//灭菌开始时间
 datePick("dateFrom_printBegin","yyyy-mm-dd hh:ii:ss","bottom-right");//打印回收清单开始时间
 datePick("dateFrom_printEnd","yyyy-mm-dd hh:ii:ss","bottom-right");//打印回收清单结束时间
 
-//今天本组装配记录开始时间和结束时间
-function initSelectDate(selectId) {
-  var dataMiss =["00", "15", "30", "45"];
-  var optionHtml = "<option value='$optionValue'>$optionText</option>";
-  for (var i = 0; i < 24; i++) {
-    for (var j = 0; j < dataMiss.length; j++) {
-      var temp = "";
-      if (i < 10) {
-        temp = "0" + i + ":" + dataMiss[j];
-      } else {
-        temp = i + ":" + dataMiss[j];
-      }
-      $("#" + selectId).append(optionHtml.replace("$optionValue", temp)
-          .replace("$optionText", temp));
-    }
-  };
-}
-initSelectDate("beginSelect");
-initSelectDate("endSelect");
 
 
+
 //今天本组装配
 $(function(){
   /*$("#aa").select2({
@@ -1988,67 +1496,8 @@
     }
   });*/
 	
-	var allBagName = {"results":[
-    {"id": 1, text: '小手术包' },
-    {"id|1-100": 2, text: '小麻醉包' },
-    {"id|1-100": 3, text: '小麻醉骨科包'},
-    {"id|1-100": 4, text: '大麻醉包' },
-    {"id|1-100": 5, text: '小器械包' },
-    {"id|1-100": 6, text: '大器械包' },
-    {"id|1-100": 7, text: '大器械骨科包' }]}
-  selectPull("instrumentSetSelect",allBagName);//器械包名称
-  function selectPull(selId,allData){
-    $("#"+selId).select2({
-      data:allData,
-      language: "zh-CN",
-      placeholder:'关键词搜素',
-      allowClear:true,
-      minimumInputLength: 1,
-      maximumSelectionLength:1
-    })
 
-  }
-  //科室
-  /*Mock.mock(
-      'http://mockjsdepartmentame', 
-      {
-        'totalCount': 60,
-          'list|10':[
-            {"id|1-100": 1, text: '骨科1' }
-         ]
-      }
-  );*/
-  $("#departmentsSelect").select2({
-	  /* ajax: {
-      url: "http://mockjsdepartmentame",
-      contentType:'application/json;charset=utf-8',
-      dataType: 'json',
-      type: 'POST',
-      delay: 1000,
-      cache: true,
-      data: function (params) {
-        return {
-          ksmc: params.term, // 此时搜索框中的内容
-              page: params.page || 1//当有结果分页时有此参数，指出当前分页
-        };
-      },
-      processResults: function (data, params) {
-              params.page = params.page || 1;
-              return {
-                  results: data.list,
-                  pagination: {
-                      more: (params.page * 10) < data.totalCount
-                  }
-              };
-          },
-          cache: true
-      },*/
-    language: "zh-CN",
-    placeholder:'关键词搜素',
-    allowClear:true,
-    minimumInputLength: 1,
-    maximumSelectionLength:1
-  })
+  
 
   //报损科室
    /*Mock.mock(
@@ -2223,70 +1672,64 @@
 //截取left foot table 文字
 function subText(subId){
 	//return;
-  var leftFootTrs = $("#" + subId + " tbody tr");
-  if (subId == "assemblyTaskleftTopTable") {
-    leftFootTrs = $("#assemblyTaskLeftTopTable tbody tr");
-  }
-  for (var i = 0;i < leftFootTrs.length; i++) {
-    var leftFootTds = $(leftFootTrs[i]).find("td");
-    //console.log("trtrt"+leftFootTds);
-    for (var j = 0; j< leftFootTds.length; j++) {
-      var leftFootTd = leftFootTds[j];
-      //判断该td下是否有img或者button标签，有就continue
-      if ($(leftFootTd).has("img:not('.stratImg')").length > 0 || $(leftFootTd).has('button').length > 0) {
-        continue;
-      }
-       //判断该td下是否有span标签，并且含有assemblymanaged-date类，是就continue
-      /*if($(leftFootTd).has('span').length > 0 && $(leftFootTd).find("span").hasClass('assemblymanaged-date')){
-        continue;
-      }*/
+    var leftFootTrs = $("#" + subId + " tbody tr");
+	if (subId == "assemblyTaskleftTopTable") {
+	    leftFootTrs = $("#assemblyTaskLeftTopTable tbody tr");
+	}
+    for (var i = 0;i < leftFootTrs.length; i++) {
+        var leftFootTds = $(leftFootTrs[i]).find("td");
+        for (var j = 0; j< leftFootTds.length; j++) {
+            var leftFootTd = leftFootTds[j];
+		    //判断该td下是否有img或者button标签，有就continue
+		    if ($(leftFootTd).has("img:not('.stratImg')").length > 0 || $(leftFootTd).has('button').length > 0) {
+		        continue;
+	        }
+	        //判断该td下是否有span标签，并且含有assemblymanaged-date类，是就continue
+		    /*if($(leftFootTd).has('span').length > 0 && $(leftFootTd).find("span").hasClass('assemblymanaged-date')){
+		        continue;
+		    }*/
 
-      var leftFootTdText = $(leftFootTd).text();
-      var tempImgSrc = $(leftFootTd).find("img").attr("src");
-      if($(leftFootTd).attr("txts") == undefined || $(leftFootTd).attr("txts").length <= 0){
-        $(leftFootTd).attr("txts",leftFootTdText);
-      }
-     
+            var leftFootTdText = $(leftFootTd).text();
+            var tempImgSrc = $(leftFootTd).find("img").attr("src");
+		    if($(leftFootTd).attr("txts") == undefined || $(leftFootTd).attr("txts").length <= 0){
+		        $(leftFootTd).attr("txts",leftFootTdText);
+		    }
 
-     if (leftFootTdText.length > 4) {
-        //截取后
-        var subleftFootText = leftFootTdText.substring(0,3)+"...";
-        if (tempImgSrc != undefined) {
-          $(leftFootTd).html("<img src='" + tempImgSrc + "'/>" + subleftFootText);
-        } else {
-          $(leftFootTd).text(subleftFootText);
-        }
-       
+            if (leftFootTdText.length > 4) {
+                //截取后
+        	    var subleftFootText = leftFootTdText.substring(0,3)+"...";
+		        if (tempImgSrc != undefined) {
+		            $(leftFootTd).html("<img src='" + tempImgSrc + "'/>" + subleftFootText);
+		        } else {
+		            $(leftFootTd).text(subleftFootText);
+		        }
 
+                $(leftFootTd).mouseover(function(e){
+			        $(this).css( "cursor","pointer");
+			        var e =e||window.event;
+			        var txts = $(this).attr("txts");
 
-        $(leftFootTd).mouseover(function(e){
-          $(this).css( "cursor","pointer");
-          var e =e||window.event;
-          var txts = $(this).attr("txts");
+			        var scrollX = document.documentElement.scrollLeft || document.body.scrollLeft;  
+			        var scrollY = document.documentElement.scrollTop || document.body.scrollTop;  
+			        var x = e.pageX || e.clientX + scrollX;  
+			        var y = e.pageY || e.clientY + scrollY; 
 
-          var scrollX = document.documentElement.scrollLeft || document.body.scrollLeft;  
-          var scrollY = document.documentElement.scrollTop || document.body.scrollTop;  
-          var x = e.pageX || e.clientX + scrollX;  
-          var y = e.pageY || e.clientY + scrollY; 
+          			$("#showTip").html(txts);
+			        $("#showTip").css({
+		                "position":"absolute",
+		                "left": x + "px",
+		                "top": y + "px",
+		                "z-index":"2000001"
+			        })
+                    $("#showTip").show();
+                });
 
-
-          $("#showTip").html(txts);
-          
-          $("#showTip").css({
-              "position":"absolute",
-              "left": x + "px",
-              "top": y + "px",
-              "z-index":"2000001"
-          })
-          $("#showTip").show();
-        });
-
-        $(leftFootTd).mouseout(function(){
-          $("#showTip").html("").hide();
-        })
-      }
+		        $(leftFootTd).mouseout(function(){
+		          $("#showTip").html("").hide();
+		        })
+            }
+        }
     }
-  }
 }
 
 /*function topTableRowClickEvent() {
@@ -2542,12 +1985,10 @@
 // 右侧table td绑定点击事件 end
 
 window.onload=function(){
-  $("#assemblyTaskLeftTopTableWrapp").bootstrapTable('resetView');//自适应宽度
-  $("#assemblyTaskleftFootTableWrapp").bootstrapTable('resetView');//自适应宽度
-  subText("assemblyTaskleftTopTable");//截取
-  subText("assemblyTaskleftFootTable");//截取left foot table
- 
- 
+    $("#assemblyTaskLeftTopTableWrapp").bootstrapTable('resetView');//自适应宽度
+    $("#assemblyTaskleftFootTableWrapp").bootstrapTable('resetView');//自适应宽度
+    subText("assemblyTaskleftTopTable");//截取
+    subText("assemblyTaskleftFootTable");//截取left foot table
 }
 
 /*数字增减*/
@@ -2571,98 +2012,95 @@
 	               + ""+touseName+"装配数量不能大于"+numVals+""
 	               + "</div>"
 	               + "</div>";
-	 $("body").append(addNumHtml);
-	 return;
-   } 
-   if(numVals == 0 || numVals < maxValue){
-	   addVal = parseInt($(that).parent().siblings("input").val())+1;
-	   $(that).parent().siblings("input").val(addVal);
-   }
+        $("body").append(addNumHtml);
+	    return;
+    } 
+    if(numVals == 0 || numVals < maxValue){
+	    addVal = parseInt($(that).parent().siblings("input").val())+1;
+	    $(that).parent().siblings("input").val(addVal);
+    }
 }
 setInterval(function(){
 	$(".panel-tips").hide();
 },9000);
 
 function reduceNum(that){
- addVal = parseInt($(that).parent().siblings("input").val())-1;
-  if(addVal<0){
-    return;
-  }else{
-	  $(that).parent().siblings("input").val(addVal);
-  }
+    addVal = parseInt($(that).parent().siblings("input").val())-1;
+    if(addVal<0){
+	     return;
+	}else{
+		$(that).parent().siblings("input").val(addVal);
+	}
 }
 //增加炉次
 function addFrequency(that){
-  var addVal = parseInt($(that).parent().siblings("input").val())+1;
-  if(($(that).parent().siblings("input").val())==""){
-    addVal =1;
-  }
-  $(that).parent().siblings("input").val(addVal);
+    var addVal = parseInt($(that).parent().siblings("input").val())+1;
+	if(($(that).parent().siblings("input").val())==""){
+	    addVal =1;
+	}
+    $(that).parent().siblings("input").val(addVal);
 }
 function reduceFrequency(that){
-  var reduceVal = parseInt($(that).parent().siblings("input").val())-1;
-  if(reduceVal<0){
-    return;
-  }else{
-	  $(that).parent().siblings("input").val(reduceVal);
-  }
+    var reduceVal = parseInt($(that).parent().siblings("input").val())-1;
+    if(reduceVal<0){
+        return;
+	}else{
+		$(that).parent().siblings("input").val(reduceVal);
+	}
 }
+//材料清单表格上mouseover显示的表格
 function metarilsFocus(){
-	 //材料清单表格上mouseover显示的表格
-	  var materialsTr= $("#materialsTable tbody tr");
-	  var tables;
-	  for (var i = 0; i< materialsTr.length; i++) {
+	var materialsTr= $("#materialsTable tbody tr");
+	var tables;
+	for (var i = 0; i< materialsTr.length; i++) {
 	    $(materialsTr[i]).mouseover(function(e){
-	      $(".metariles-firstTd").parent().empty().append("<tr class='metariles-firstTd'><th>清洗质量检查方法</th><th>清洗质量检查关注点</th><th>功能检查</th></tr>");
-	      $(this).css({"cursor":"pointer"});
-	      var washQualityCheckPoint = $(this).find("td span").attr("washQualityCheckPoint");
-	      var washQualityCheckMethod = $(this).find("td span").attr("washQualityCheckMethod");
-	      var functionCheck = $(this).find("td span").attr("functionCheck");
-	      tables = "<tr>"
+	        $(".metariles-firstTd").parent().empty().append("<tr class='metariles-firstTd'><th>清洗质量检查方法</th><th>清洗质量检查关注点</th><th>功能检查</th></tr>");
+	        $(this).css({"cursor":"pointer"});
+	        var washQualityCheckPoint = $(this).find("td span").attr("washQualityCheckPoint");
+	        var washQualityCheckMethod = $(this).find("td span").attr("washQualityCheckMethod");
+	        var functionCheck = $(this).find("td span").attr("functionCheck");
+	        tables = "<tr>"
 	             + "<td>"+washQualityCheckPoint+"</td>"
 	             +"<td>"+washQualityCheckMethod+"</td>"
 	             + "<td>"+functionCheck+"</td>"
 	             + "</tr>";
-	      $(".metariles-firstTd").after(tables);     
-	      var e =e||window.event;
-	      var scrollX = document.documentElement.scrollLeft || document.body.scrollLeft;  
-	      var scrollY = document.documentElement.scrollTop || document.body.scrollTop;  
-	      var x = e.pageX || e.clientX + scrollX;  
-	      var y = e.pageY || e.clientY + scrollY; 
-	      var windowWidth = $(window).width();
-	      var windowHeight = $(window).height();
-	      var materialsW = $(".metariles-list-tips").width();
-	      var materialsH = $(".metariles-list-tips").height();
+	        $(".metariles-firstTd").after(tables);     
+	        var e =e||window.event;
+	        var scrollX = document.documentElement.scrollLeft || document.body.scrollLeft;  
+	        var scrollY = document.documentElement.scrollTop || document.body.scrollTop;  
+	        var x = e.pageX || e.clientX + scrollX;  
+	        var y = e.pageY || e.clientY + scrollY; 
+	        var windowWidth = $(window).width();
+	        var windowHeight = $(window).height();
+	        var materialsW = $(".metariles-list-tips").width();
+	        var materialsH = $(".metariles-list-tips").height();
 	        y= y+10;
-	      if(x>(windowWidth-materialsW)){
-	        x = (windowWidth-materialsW-50);
-	      }
-	      if(y>(windowHeight-materialsH-100)){
-	        y = (windowHeight-materialsH-50);
-	        x = (windowWidth-materialsW-300);
-	      }
-	      $(".metariles-list-tips").css({
-	          "position":"absolute",
-	          "left": x + "px",
-	          "top": y + "px",
-	          "z-index":"200000"
-	      })
-	      
-	      
-	      $(".metariles-list-tips").show();
+	        if(x>(windowWidth-materialsW)){
+	            x = (windowWidth-materialsW-50);
+	        }
+		    if(y>(windowHeight-materialsH-100)){
+		        y = (windowHeight-materialsH-50);
+		        x = (windowWidth-materialsW-300);
+		    }
+	        $(".metariles-list-tips").css({
+	            "position":"absolute",
+		        "left": x + "px",
+		        "top": y + "px",
+		        "z-index":"200000"
+	        })
+
+	        $(".metariles-list-tips").show();
 	    })
-	   $(materialsTr[i]).mouseout(function(e){
-	      $(".metariles-list-tips").hide();
-	  })
-	 }
-	 
-	  
+	    $(materialsTr[i]).mouseout(function(e){
+	        $(".metariles-list-tips").hide();
+	    })
+	}	  
 }
 //补充丢失/报损器械弹框start
 //補充丟失删除行
 function deleteLoseRow(id){
-	  $('#addLoseTable').bootstrapTable('removeByUniqueId',id);
-	  addLOseInstrumentTypeSelect("addLOse_instrument");
+	$('#addLoseTable').bootstrapTable('removeByUniqueId',id);
+	addLOseInstrumentTypeSelect("addLOse_instrument");
 }
 //丢失分类类型option
 var addLoseClassifyTypeOptions = "";   
@@ -2671,85 +2109,79 @@
     type: "get", 
     async:true,
     success:function(result){
-      if(result.success == true){     
-    	  for(var i=0;i<result.rows.length;i++){
-    		  addLoseClassifyTypeOptions = addLoseClassifyTypeOptions + "<option value='"+result.rows[i].value+"'>"+result.rows[i].value+"</option>";
-    	  }
-    	 
-      }else{
-        //alert(result.message);
-      }
-      
+        if(result.success == true){     
+    	    for(var i=0;i<result.rows.length;i++){
+    		    addLoseClassifyTypeOptions = addLoseClassifyTypeOptions + "<option value='"+result.rows[i].value+"'>"+result.rows[i].value+"</option>";
+    	    } 
+        }else{
+            //alert(result.message);
+        }
     }
- });
+});
 
 var addLoseModel_columns=[ 
-  {
-    title : '序号',
-    align : 'center',
-    formatter:function(v,row,index){
-      return index+1;
-      
+    {
+        title : '序号',
+        align : 'center',
+	    formatter:function(v,row,index){
+	        return index+1;
+	    }
+    },
+    {
+        title : '器械名称',
+        field : 'materialName',
+        align : 'center'
+    },
+    {
+        title : '待补充数量',
+        field : 'amount',
+        align : 'center'
+    },
+    {
+        title : '分类类型',
+        align : 'center',
+	    formatter:function(v,row,index){
+			   //console.log("id..",row.id); 
+	        return "<select style='width:auto;' class='addLOse_instrument' id='addLOseClassifyType_"+row.id+"'><option style='color:gray' value='请选择分类类型'>请选择分类类型</option>"+addLoseClassifyTypeOptions+"</select>";   
+	    }
+    },
+    {
+        title : '器械类型',
+        align : 'center',
+	    formatter:function(v,row,index){
+	        return "<select style='width:auto;'  class='addLOse_instrumentSelect' id='addLOseInstrumentType_"+row.id+"'><option style='color:gray' value='请选择器械类型'>请选择器械类型</option></select>";             
+	    }
+    },
+    {
+        title : '操作',
+        align : 'center',
+        formatter:function(v,row,index){
+            return "<img src='/dx-disinfectsystem/img/stop.png' class='cor' onclick='deleteLoseRow("+row.id+")'/>";
+        }
     }
-  },
-  {
-    title : '器械名称',
-    field : 'materialName',
-    align : 'center'
-  },
-  {
-    title : '待补充数量',
-    field : 'amount',
-    align : 'center'
-  },
-  {
-     title : '分类类型',
-     align : 'center',
-     formatter:function(v,row,index){
-		   //console.log("id..",row.id); 
-        return "<select style='width:auto;' class='addLOse_instrument' id='addLOseClassifyType_"+row.id+"'><option style='color:gray' value='请选择分类类型'>请选择分类类型</option>"+addLoseClassifyTypeOptions+"</select>";   
-     }
-  },
-  {
-     title : '器械类型',
-     align : 'center',
-     formatter:function(v,row,index){
-        return "<select style='width:auto;'  class='addLOse_instrumentSelect' id='addLOseInstrumentType_"+row.id+"'><option style='color:gray' value='请选择器械类型'>请选择器械类型</option></select>";             
-     }
-  },
-  {
-     title : '操作',
-     align : 'center',
-     formatter:function(v,row,index){
-      return "<img src='/dx-disinfectsystem/img/stop.png' class='cor' onclick='deleteLoseRow("+row.id+")'/>";
-     }
-  }
 ];
-
-
-
 function addLoseLoadTable(tableDate,columns){
   $("#addLoseTable").bootstrapTable('destroy');//销毁表格
   $("#addLoseTable").bootstrapTable(
     {   
-      data:tableDate,
-      method : 'get',
-      striped : true,// 设置为 true 会有隔行变色效果
-      undefinedText : " ",// 当数据为 undefined 时显示的字符
-      data_local : "zh-US",// 表格汉化
-      responseHandler : "",
-      sortable: true,//是否启用排序
-      sortOrder: "desc",//排序方式
-      sortName: 'appTime',//排序字段
-      //idField : "id",
-      uniqueId: "id",//对每一行指定唯一标识符。
-      formatLoadingMessage: function () {  
-        return "请稍等，正在加载中...";  
-      }, 
-      formatNoMatches:function(){ //未找到匹配记录
-      //return " ";
-      },
-      columns : columns
+        data:tableDate,
+        method : 'get',
+        striped : true,// 设置为 true 会有隔行变色效果
+        undefinedText : " ",// 当数据为 undefined 时显示的字符
+        data_local : "zh-US",// 表格汉化
+        responseHandler : "",
+        sortable: true,//是否启用排序
+        sortOrder: "desc",//排序方式
+        sortName: 'appTime',//排序字段
+        //idField : "id",
+        uniqueId: "id",//对每一行指定唯一标识符。
+        formatLoadingMessage: function () {  
+            return "请稍等，正在加载中...";  
+        }, 
+        formatNoMatches:function(){ //未找到匹配记录
+           //return " ";
+        },
+        columns : columns
     });
     
 }
@@ -2759,39 +2191,35 @@
 		var _this = $(this);
 		var departTypeName =$(_this).find("option:selected").val();
 		var brotherSelect =   $(_this).parent().next().find("select");
-		 $(brotherSelect).html("<option value='请选择器械类型'>请选择器械类型</option>");
-		 if(departTypeName != '请选择分类类型'){
-				$.ajax({   
+		$(brotherSelect).html("<option value='请选择器械类型'>请选择器械类型</option>");
+		if(departTypeName != '请选择分类类型'){
+			$.ajax({   
 		        url:WWWROOT+"/disinfectSystem/recyclingrecord/materialErrorDamageController/getMaterialTypeType.mhtml",
 		        type: "get", 
 		        async:true,
 		        data:{
 		        	departTypeName:departTypeName
 		        },
 		        success:function(result){
-		          if(result.success == true){     
-		          	var addLOseInstrumentTypeOptions = "";
-		        	  for(var i=0;i<result.rows.length;i++){
+		            if(result.success == true){     
+		          	    var addLOseInstrumentTypeOptions = "";
+		        	    for(var i=0;i<result.rows.length;i++){
 		        		 // console.log("value",result.rows[i].value);
 		        		  /*if (i == 0) {
 		        			  addLOseInstrumentTypeOptions = addLOseInstrumentTypeOptions + "<option selected='selected' value='"+result.rows[i].value+"'>"+result.rows[i].value+"</option>";
 		        		  } else {*/
-		        			  addLOseInstrumentTypeOptions = addLOseInstrumentTypeOptions + "<option value='"+result.rows[i].value+"'>"+result.rows[i].value+"</option>";
+		        			addLOseInstrumentTypeOptions = addLOseInstrumentTypeOptions + "<option value='"+result.rows[i].value+"'>"+result.rows[i].value+"</option>";
 		        		  /*}*/
-		        	  }
-		        	 $(brotherSelect).each(function(){
+		        	    }
+		        	    $(brotherSelect).each(function(){
 							$(this).append(addLOseInstrumentTypeOptions);
 						});
-		          }else{
-		            //alert(result.message);
-		          }
-		          
+		            }else{
+		                //alert(result.message);
+		            }
 		        }
-		     });
+		    });
 		}
-		 
-		 
-		
 	})
 };
 function loseOrDamageModel(type,loseOrDameage_packingTaskId){
@@ -2803,70 +2231,65 @@
     $("#addLoseBarcodeHidden").next("span").text("");
     //篮筐
 	$("#addLoseBarcode").keydown(function(e){
-	  if (e.keyCode == 13) {
-	   var barcode = $("#addLoseBarcode").val();
- 	   if(barcode != "" && barcode != null){
- 		   //补充丢失加载清洗篮筐
-     	   $.ajax({   
- 	        url:WWWROOT+"/disinfectSystem/washAndDisinfect/washAndDisinfectRecordController/loadClassifyBasket.mhtml",
- 	        type: "get", 
- 	        async:true,
- 	        data:{basketBarcode:barcode},
- 	        success:function(result){
- 	          if(result.success == true){    
- 	        	$("#addLoseBarcodeHidden").val(barcode);//条码存入隐藏域
- 	        	$("#addLoseBarcodeHidden").next("span").show();
- 	        	$("#addLoseBarcodeHidden").next("span").text("清洗篮筐名称:"+result.data.containerName);
- 	        	$("#addLoseBarcode").val("");//清空
- 	          }else{
- 	            alert(result.message);
- 	            
- 	          }
- 	          
- 	        }
- 	     });
- 	   }else{
- 		   var addNumHtml= "<div class='panel panel-primary panel-tips' style='z-index:99999999999999999;'>"
-	               + "<div class='panel-heading'>提示</div>"
-	               + "<div class='panel-body'>"
-	               + "请扫描篮筐条码！"
-	               + "</div>"
-	               + "</div>";
- 		   	$("body").append(addNumHtml);
-  	     //showResult('请扫描篮筐条码！' , null , sstsConfig.messagePauseTimeOnPackingPage);
- 	   }
- 	
-	  }  
+	    if (e.keyCode == 13) {
+	        var barcode = $("#addLoseBarcode").val();
+	 	    if(barcode != "" && barcode != null){
+	 		   //补充丢失加载清洗篮筐
+	     	   $.ajax({   
+	 	            url:WWWROOT+"/disinfectSystem/washAndDisinfect/washAndDisinfectRecordController/loadClassifyBasket.mhtml",
+	 	            type: "get", 
+	 	            async:true,
+	 	            data:{basketBarcode:barcode},
+	 	            success:function(result){
+		 	            if(result.success == true){    
+			 	        	$("#addLoseBarcodeHidden").val(barcode);//条码存入隐藏域
+			 	        	$("#addLoseBarcodeHidden").next("span").show();
+			 	        	$("#addLoseBarcodeHidden").next("span").text("清洗篮筐名称:"+result.data.containerName);
+			 	        	$("#addLoseBarcode").val("");//清空
+		 	            }else{
+		 	                alert(result.message);
+		 	            }
+	 	            }
+	 	        });
+	 	    }else{
+	 		    var addNumHtml= "<div class='panel panel-primary panel-tips' style='z-index:99999999999999999;'>"
+		               + "<div class='panel-heading'>提示</div>"
+		               + "<div class='panel-body'>"
+		               + "请扫描篮筐条码！"
+		               + "</div>"
+		               + "</div>";
+	 		   	$("body").append(addNumHtml);
+	  	     //showResult('请扫描篮筐条码！' , null , sstsConfig.messagePauseTimeOnPackingPage);
+	 	    }
+	    }  
 	});
     //丢失补充列表
     $.ajax({   
-      url:WWWROOT+"/disinfectSystem/recyclingrecord/materialErrorDamageController/loadAdditionalMaterialStore.mhtml",
-      type: "get", 
-      async:true,
-      cache:false,//解决ie
-      data:{
-        "type":type,
-        "packingTaskId":loseOrDameage_packingTaskId//这里就是传空的
-      },
-      success:function(result){
-        if(result.success == true){
-           //addLOseClassifyTypeResult = result.rows;
-          addLoseLoadTable(result.rows,addLoseModel_columns);
-          addLOseInstrumentTypeSelect("addLOse_instrument");
-          $("#addLoseTableWrapper .fixed-table-container").css({"padding-bottom":"45px"});
-        }else{
-          alert(result.message);
+        url:WWWROOT+"/disinfectSystem/recyclingrecord/materialErrorDamageController/loadAdditionalMaterialStore.mhtml",
+        type: "get", 
+        async:true,
+        cache:false,//解决ie
+	    data:{
+	        "type":type,
+	        "packingTaskId":loseOrDameage_packingTaskId//这里就是传空的
+	    },
+        success:function(result){
+	        if(result.success == true){
+	           //addLOseClassifyTypeResult = result.rows;
+	            addLoseLoadTable(result.rows,addLoseModel_columns);
+	            addLOseInstrumentTypeSelect("addLOse_instrument");
+	            $("#addLoseTableWrapper .fixed-table-container").css({"padding-bottom":"45px"});
+	        }else{
+	          alert(result.message);
+	        }
         }
-        
-      }
     });
 }
 //左上每行表格的丢失按钮
 function addLoseTopTableBtn(that){
 	loseOrDameage_packingTaskId =$(that).parent().parent().attr("topTaskId");
 	type = "丢失";
 	loseOrDamageModel("丢失",loseOrDameage_packingTaskId);
-
 }
 //左上每行表格的报损按钮
 function addDamageTopTableBtn(that){
@@ -2891,88 +2314,84 @@
 }
 //确定补充
 function registerLoseOrDamageSubmitHandler(id){
-  $("#"+id).click(function(){
-		  var addLoseTableData = $('#addLoseTable').bootstrapTable('getData');
-		  if(addLoseTableData.length == 0){
-			  //$('.addLoseModel').modal('hide');
-	        	var addNumHtml= "<div class='panel panel-primary panel-tips' style='z-index:999999999;'>"
-		               + "<div class='panel-heading'>提示</div>"
-		               + "<div class='panel-body'>"
-		               + "没有待补充的器械！"
-		               + "</div>"
-		               + "</div>";
-	     	  $("body").append(addNumHtml);
-				//showResult("没有待补充的器械！" , null , sstsConfig.messagePauseTimeOnPackingPage);
-				return false;
-			}
-		  var materialArray = [];
-		  for(var i=0;i<addLoseTableData.length;i++){
-			  //materialType 器械类型
-			  //departType 分类类型
-			  var id = addLoseTableData[i].id;
-			  var materialName =  addLoseTableData[i].materialName;
-			  var amount =  addLoseTableData[i].amount;
-			  var materialDefinitionId = addLoseTableData[i].materialDefinitionId;
-			  var packingTaskId =  addLoseTableData[i].packingTaskId;
-			  var departType = $('#addLOseClassifyType_'+id+' option:selected').val();
-			  var materialType = $('#addLOseInstrumentType_'+id+' option:selected').val();
-			  
-			  materialArray.push({
-					id : id,
-					materialName: materialName,
-					amount : amount,
-					departType:departType,
-					materialType:materialType,
-					materialDefinitionId:materialDefinitionId,
-				    packingTaskId :packingTaskId,
-			 });
-		  }
+    $("#"+id).click(function(){
+		var addLoseTableData = $('#addLoseTable').bootstrapTable('getData');
+		if(addLoseTableData.length == 0){
+		    //$('.addLoseModel').modal('hide');
+        	var addNumHtml= "<div class='panel panel-primary panel-tips' style='z-index:999999999;'>"
+	               + "<div class='panel-heading'>提示</div>"
+	               + "<div class='panel-body'>"
+	               + "没有待补充的器械！"
+	               + "</div>"
+	               + "</div>";
+     	    $("body").append(addNumHtml);
+		    //showResult("没有待补充的器械！" , null , sstsConfig.messagePauseTimeOnPackingPage);
+		    return false;
+	    }
+		var materialArray = [];
+		for(var i=0;i<addLoseTableData.length;i++){
+			//materialType 器械类型
+			//departType 分类类型
+			var id = addLoseTableData[i].id;
+			var materialName =  addLoseTableData[i].materialName;
+			var amount =  addLoseTableData[i].amount;
+			var materialDefinitionId = addLoseTableData[i].materialDefinitionId;
+			var packingTaskId =  addLoseTableData[i].packingTaskId;
+			var departType = $('#addLOseClassifyType_'+id+' option:selected').val();
+			var materialType = $('#addLOseInstrumentType_'+id+' option:selected').val();
+		    materialArray.push({
+				id : id,
+				materialName: materialName,
+				amount : amount,
+				departType:departType,
+				materialType:materialType,
+				materialDefinitionId:materialDefinitionId,
+			    packingTaskId :packingTaskId,
+			});
+		}
 		searchBarcodeHidden = $("#searchBarcodeHidden").val();
 		var basketBarcodes = [];//扫描篮筐
 		basketBarcodes.push(searchBarcodeHidden);
 		
 		var addLoseBarcodeHidden = $("#addLoseBarcodeHidden").val();//弹框上的篮筐条码隐藏域
 	    $.ajax({   
-	      url:WWWROOT+"/disinfectSystem/recyclingrecord/materialErrorDamageController/materialSupplement.mhtml",
-	      type: "post", 
-	      cache:false,//解决ie
-	      async:true,
-	      data:{
-	        "packingTaskId":loseOrDameage_packingTaskId,
-	        "suppleStr":JSON.stringify(materialArray),
-	        "type":loseOrDameage_type,
-	        "washBasketBarcode":addLoseBarcodeHidden
-	      },
-	      success:function(result){
-	      	//补充成功以后先关弹框，在提示补充成功
-	      	//点确定时要判断里面数量够不够的提示
-	      	//补充成功以后会在左下角显示
-	        if(result.success == true){//补充成功
-	        	//alert(result.message);
-	        	$('.addLoseModel').modal('hide');
-	        	var addNumHtml= "<div class='panel panel-primary panel-tips'>"
-		               + "<div class='panel-heading'>提示</div>"
-		               + "<div class='panel-body'>"
-		               + ""+result.message+""
-		               + "</div>"
-		               + "</div>";
-	     	  $("body").append(addNumHtml);
-	     	  loseAndDamageNum();//请求数字
-	     	  reloadPackingTasks();//刷新左下表格
-	     	 //当没有扫条码，上面表格不刷新
-	     	  if(!Tools.ArrayUtils.isNotEmpty(basketBarcodes) || searchBarcodeHidden !=""){
-	     		  reloadTopTableMoreborde(basketBarcodes.join(";"));//左上表格的刷新
-	     	  }
-	     	
-	        }else{
-	          alert(result.message);
+	        url:WWWROOT+"/disinfectSystem/recyclingrecord/materialErrorDamageController/materialSupplement.mhtml",
+	        type: "post", 
+	        cache:false,//解决ie
+	        async:true,
+		    data:{
+		        "packingTaskId":loseOrDameage_packingTaskId,
+		        "suppleStr":JSON.stringify(materialArray),
+		        "type":loseOrDameage_type,
+		        "washBasketBarcode":addLoseBarcodeHidden
+		    },
+	      	success:function(result){
+		      	//补充成功以后先关弹框，在提示补充成功
+		      	//点确定时要判断里面数量够不够的提示
+		      	//补充成功以后会在左下角显示
+		        if(result.success == true){//补充成功
+		        	//alert(result.message);
+		        	$('.addLoseModel').modal('hide');
+		        	var addNumHtml= "<div class='panel panel-primary panel-tips'>"
+			               + "<div class='panel-heading'>提示</div>"
+			               + "<div class='panel-body'>"
+			               + ""+result.message+""
+			               + "</div>"
+			               + "</div>";
+		     	  $("body").append(addNumHtml);
+		     	  loseAndDamageNum();//请求数字
+		     	  reloadPackingTasks();//刷新左下表格
+		     	 //当没有扫条码，上面表格不刷新
+		     	    if(!Tools.ArrayUtils.isNotEmpty(basketBarcodes) || searchBarcodeHidden !=""){
+		     		  reloadTopTableMoreborde(basketBarcodes.join(";"));//左上表格的刷新
+		     	    }
+		     	
+		        }else{
+		          alert(result.message);
+		        }
 	        }
-	        
-	      }
 	    });
-	
-  });
-
+    });
 }
 //补充丢失/报损器械弹框end
 
@@ -3039,139 +2458,138 @@
 
 
 var assemblyTaskLeftTopTable_columns=[ 
-                                      {
-                                        checkbox : true,
-                                        switchable: false
-                                      },
-                                      {
-                                        title : '物品名称',
-                                        field : 'tousseName',
-                                        align : 'center',
-                                        sortable:true, //正序,逆序
-                                        switchable: false,
-                                        cellStyle:function(value,row,index){
-                                      	  for(i=0;i<row.children.length;i++){
-                                      		  if(row.children[i].status == '待装配'){
-                                			            var supplent = true;
-                                			            for(var j = 0;j < row.children[i].errors.length ; j++) {
-                                			                if(errorTypeAdd != row.children[i].errors[j].errorType && ((row.children[i].errors[j].amount - row.children[i].errors[j].additionalAmount) != 0)) {
-                                			                    supplent = false;
-                                			                }
-                                			            }
-                                			            if(!supplent){
-                                			            	return {css:{"color":"red"}};
-                                			            }
-                                			    
-                                			            if(row.children[i].damages.length > 0){
-                                			            	return {css:{"color":"red"}};
-                                			            }
-                                			        }
-                                      		  
-                                      	  }
-                                      	  return {css:{"color":"#000"}};
-                                      	}
-
-                                      },
-                                      {
-                                        title : '数量',
-                                        field : 'amount',
-                                        align : 'center',
-                                        sortable:true,
-                                        switchable: false,
-                                        formatter:function(v,record){
-                                      	  var inputId = 'topInput_'+record.tousseID;
-                                      	  return  "<div class='input-group spinner'>"
-                                            + "<input id='"+inputId+"' type='text' class='form-control showNum_"+record.tousseID+"' value='" + v + "' tousseName='"+record.tousseName+"'  max-value='" + v +"'/>"
-                                            + "<div class='input-group-btn-vertical'>"
-                                            + "<button class='btn btn-default ' type='button' onclick='addNum(this)'><i class='fa fa-caret-up'></i></button>"
-                                            + "<button class='btn btn-default ' type='button' onclick='reduceNum(this)'><i class='fa fa-caret-down'></i></button>"
-                                            + "</div>"
-                                            + "</div>"
-                                         }
-                                      },
-                                      {
-                                        title : '加急数量',
-                                        field : 'urgentAmount',
-                                        align : 'center',
-                                         sortable:true
-                                      },
-                                      {
-                                         title : '加急等级',
-                                         field : 'urgentLevel',
-                                         align : 'center',
-                                         sortable:true
-                                      },
-                                      {
-                                         title : '清洗篮筐',
-                                         field : 'basketName',
-                                         align : 'center',
-                                         sortable:true
-                                      },
-                                      {
-                                         title : '操作',
-                                         field : 'operate',
-                                         align : 'center',
-                                         sortable:true,
-                                         width:300
-                                      },
-                                      {
-                                         title : '申请科室',
-                                         field : 'department',
-                                         align : 'center',
-                                         sortable:true
-                                      },
-                                      {
-                                         title : '清洗时间',
-                                         field : 'washTime',
-                                         align : 'center',
-                                         sortable:true
-                                      },
-                                      {
-                                         title : '状态',
-                                         field : 'status',
-                                         align : 'center',
-                                         sortable:true
-                                      },
-                                      {
-                                         title : '回收时间',
-                                         field : 'dateTime',
-                                         align : 'center',
-                                         sortable:true
-                                      }
-                                ]; 
+    {
+        checkbox : true,
+        switchable: false
+    },
+    {
+        title : '物品名称',
+        field : 'tousseName',
+        align : 'center',
+        sortable:true, //正序,逆序
+        switchable: false,
+        cellStyle:function(value,row,index){
+      	  for(i=0;i<row.children.length;i++){
+      		  if(row.children[i].status == '待装配'){
+			            var supplent = true;
+			            for(var j = 0;j < row.children[i].errors.length ; j++) {
+			                if(errorTypeAdd != row.children[i].errors[j].errorType && ((row.children[i].errors[j].amount - row.children[i].errors[j].additionalAmount) != 0)) {
+			                    supplent = false;
+			                }
+			            }
+			            if(!supplent){
+			            	return {css:{"color":"red"}};
+			            }
+			    
+			            if(row.children[i].damages.length > 0){
+			            	return {css:{"color":"red"}};
+			            }
+			        }
+      		  
+      	  }
+      	  return {css:{"color":"#000"}};
+      	}
+    },
+	{
+	    title : '数量',
+	    field : 'amount',
+	    align : 'center',
+	    sortable:true,
+	    switchable: false,
+	    formatter:function(v,record){
+	  	  var inputId = 'topInput_'+record.tousseID;
+	  	  return  "<div class='input-group spinner'>"
+	        + "<input id='"+inputId+"' type='text' class='form-control showNum_"+record.tousseID+"' value='" + v + "' tousseName='"+record.tousseName+"'  max-value='" + v +"'/>"
+	        + "<div class='input-group-btn-vertical'>"
+	        + "<button class='btn btn-default ' type='button' onclick='addNum(this)'><i class='fa fa-caret-up'></i></button>"
+	        + "<button class='btn btn-default ' type='button' onclick='reduceNum(this)'><i class='fa fa-caret-down'></i></button>"
+	        + "</div>"
+	        + "</div>"
+	    }
+	},
+    {
+        title : '加急数量',
+        field : 'urgentAmount',
+        align : 'center',
+         sortable:true
+    },
+    {
+        title : '加急等级',
+        field : 'urgentLevel',
+        align : 'center',
+        sortable:true
+    },
+    {
+        title : '清洗篮筐',
+        field : 'basketName',
+        align : 'center',
+        sortable:true
+     },
+      {
+         title : '操作',
+         field : 'operate',
+         align : 'center',
+         sortable:true,
+         width:300
+      },
+      {
+         title : '申请科室',
+         field : 'department',
+         align : 'center',
+         sortable:true
+      },
+      {
+         title : '清洗时间',
+         field : 'washTime',
+         align : 'center',
+         sortable:true
+      },
+      {
+         title : '状态',
+         field : 'status',
+         align : 'center',
+         sortable:true
+      },
+      {
+         title : '回收时间',
+         field : 'dateTime',
+         align : 'center',
+         sortable:true
+      }
+]; 
 function assemblyTaskLeftTopload(tableDate,columns){
   $("#assemblyTaskLeftTopTable").bootstrapTable('destroy');
   $("#assemblyTaskLeftTopTable").bootstrapTable(
-      {   
-          data:tableDate,
-          method : 'get',
-          dataType : "json",
-          dataField : "data",// 这是返回的json数组的key.默认好像是"rows".这里只有前后端约定好就行
-          striped : true,// 设置为 true 会有隔行变色效果
-          undefinedText : " ",// 当数据为 undefined 时显示的字符
-          data_local : "zh-US",// 表格汉化
-         // responseHandler : "",
-          detailView: true,//父子表
-          search:false,
-          toolbar:'#printClass',
-          sortable: true,//是否启用排序
-          sortOrder: "desc",//排序方式
-          sortName: 'appTime',//排序字段
-          showColumns: true,//删选列按钮
-          silent: true,  //刷新事件必须设置  
-          clickToSelect:true,//选中行时帮我选中复选框
-          formatLoadingMessage: function () {  
+    {   
+        data:tableDate,
+        method : 'get',
+        dataType : "json",
+        dataField : "data",// 这是返回的json数组的key.默认好像是"rows".这里只有前后端约定好就行
+        striped : true,// 设置为 true 会有隔行变色效果
+        undefinedText : " ",// 当数据为 undefined 时显示的字符
+        data_local : "zh-US",// 表格汉化
+        // responseHandler : "",
+        detailView: true,//父子表
+        search:false,
+        toolbar:'#printClass',
+        sortable: true,//是否启用排序
+        sortOrder: "desc",//排序方式
+        sortName: 'appTime',//排序字段
+        showColumns: true,//删选列按钮
+        silent: true,  //刷新事件必须设置  
+        clickToSelect:true,//选中行时帮我选中复选框
+        formatLoadingMessage: function () {  
             return "请稍等，正在加载中...";  
-          },  
-          formatNoMatches:function(){ //未找到匹配记录
+        },  
+        formatNoMatches:function(){ //未找到匹配记录
             //return " ";
-          },
+        },
         /*  idField : "id",*/
-          columns : columns,//表头
-          onExpandRow: function (index, row, $detail) {
+        columns : columns,//表头
+        onExpandRow: function (index, row, $detail) {
           	var thW = $("#assemblyTaskLeftTopTable").find("th");
           	var childrens = row.children;
-              var table="<table id='assemblyTaskleftTopTableSub'>";
+            var table="<table id='assemblyTaskleftTopTableSub'>";
           	for(var i=0;i<childrens.length;i++){
           		var tipsColor = "";
           		var operateHtml = "<img src='/dx-disinfectsystem/img/stop.png' class='cor' onclick='confirmDeleteTopTabel(this)'/>"; 
@@ -3180,228 +2598,221 @@
                    +"<td width='"+($(thW[0]).width()+1)+"'></td>"
                    +"<td width='"+($(thW[1]).width()+2)+"'></td>";
           		if(childrens[i].status == '待装配'){
-			            var supplent = true;
-			            for(var j = 0;j < childrens[i].errors.length ; j++) {
-			                if(errorTypeAdd != childrens[i].errors[j].errorType && ((childrens[i].errors[j].amount - childrens[i].errors[j].additionalAmount) != 0)) {
-			                    supplent = false;
-			                }
+			        var supplent = true;
+			        for(var j = 0;j < childrens[i].errors.length ; j++) {
+			            if(errorTypeAdd != childrens[i].errors[j].errorType && ((childrens[i].errors[j].amount - childrens[i].errors[j].additionalAmount) != 0)) {
+			                supplent = false;
 			            }
-			            if(!supplent){
-			            	operateHtml += "<button type='button' class='btn btn-success cor' onclick='addLoseTopTableBtn(this);'>丢失</button>";
-			            	tipsColor = "style='color:red;'"
-			            }
+			        }
+			        if(!supplent){
+			            operateHtml += "<button type='button' class='btn btn-success cor' onclick='addLoseTopTableBtn(this);'>丢失</button>";
+			            tipsColor = "style='color:red;'"
+			        }
 			    
-			            if(childrens[i].damages.length > 0){
-			            	operateHtml += "<button type='button' class='btn btn-success cor' onclick='addDamageTopTableBtn(this);'>报损</button>";
-			            	tipsColor = "style='color:red;'"
-			            }
+			        if(childrens[i].damages.length > 0){
+			            operateHtml += "<button type='button' class='btn btn-success cor' onclick='addDamageTopTableBtn(this);'>报损</button>";
+			            tipsColor = "style='color:red;'"
 			        }
+			    }
 			        	
           		table += "<td width='"+($(thW[2]).width()+2)+"' "+tipsColor+" >"+childrens[i].tousseName+"</td>"
-          		 +"<td width='"+($(thW[3]).width()+2)+"'>"+childrens[i].amount+"</td>"
-                   +"<td width='"+($(thW[4]).width()+2)+"'>"+childrens[i].urgentAmount+"</td>"
-                   +"<td width='"+($(thW[5]).width()+2)+"'>"+childrens[i].urgentLevel+"</td>"
-                   +"<td width='"+($(thW[6]).width()+2)+"'>"+childrens[i].basketName+"</td>"
-                   +"<td width='"+($(thW[7]).width()+2)+"'>"+operateHtml+"</td>"
-                   +"<td width='"+($(thW[8]).width()+2)+"'>"+childrens[i].department+"</td>"
-                   +"<td width='"+($(thW[9]).width()+2)+"'>"+childrens[i].washTime+"</td>"
-                   +"<td width='"+($(thW[10]).width()+2)+"'>"+childrens[i].status+"</td>"
-                   +"<td width='"+($(thW[11]).width()+1)+"'>"+childrens[i].dateTime+"</td>"
-                  +"</tr>"
+          		    +"<td width='"+($(thW[3]).width()+2)+"'>"+childrens[i].amount+"</td>"
+                    +"<td width='"+($(thW[4]).width()+2)+"'>"+childrens[i].urgentAmount+"</td>"
+                    +"<td width='"+($(thW[5]).width()+2)+"'>"+childrens[i].urgentLevel+"</td>"
+                    +"<td width='"+($(thW[6]).width()+2)+"'>"+childrens[i].basketName+"</td>"
+                    +"<td width='"+($(thW[7]).width()+2)+"'>"+operateHtml+"</td>"
+                    +"<td width='"+($(thW[8]).width()+2)+"'>"+childrens[i].department+"</td>"
+                    +"<td width='"+($(thW[9]).width()+2)+"'>"+childrens[i].washTime+"</td>"
+                    +"<td width='"+($(thW[10]).width()+2)+"'>"+childrens[i].status+"</td>"
+                    +"<td width='"+($(thW[11]).width()+1)+"'>"+childrens[i].dateTime+"</td>"
+                    +"</tr>"
           	}
-              table +="</table>";
-              $detail.html(table);
-              subText("assemblyTaskleftTopTableSub");
-              var topTableSubTr = $detail.find("#assemblyTaskleftTopTableSub tbody tr");
+            table +="</table>";
+            $detail.html(table);
+            subText("assemblyTaskleftTopTableSub");
+            var topTableSubTr = $detail.find("#assemblyTaskleftTopTableSub tbody tr");
       		materialListSub(topTableSubTr,row);//子级材料清单
-              metarilsFocus();//显示功能检查
-          },
-          onClickRow: function(row,element){
-    		    $("#sterilingType").val(row.sterilingMethod);
-  			    //根据灭菌程序设置灭菌方式的值
-    			  $("#sterilingType").change();
-    			  packageTypeRequest();//包裝類型
-                sterilizerNameRequest();//灭菌炉
-    		    //父材料清单
-        		materialList(row);
-          },
-          onCheck:function(row){//top
+            metarilsFocus();//显示功能检查
+        },
+        onClickRow: function(row,element){
+    		$("#sterilingType").val(row.sterilingMethod);
+  			//根据灭菌程序设置灭菌方式的值
+    	    $("#sterilingType").change();
+    	    packageTypeRequest();//包裝類型
+            sterilizerNameRequest();//灭菌炉
+    		//父材料清单
+            materialList(row);
+         },
+        onCheck:function(row){//top
        	    packPrintChange();
-          },
-          onUncheck:function(row){
-        	  packPrintChange();
-          }
+       	    //父材料清单
+            materialList(row);
+        },
+        onUncheck:function(row){
+            packPrintChange();
+        }
        /*   onCheckAll:function(row){
          	  packPrintChange();
           },
           onUncheckAll:function(row){
           	packPrintChange();
           }*/
           
-      });
+    });
 }
 /*var assemblyTaskLeftTopTable = "<table id='assemblyTaskLeftTopTable' class='table table-striped table-bordered table-hover cleanPadding' data-height='"+resultHTop+"' data-toggle data-toggle='table'></table>";                  
 $("#assemblyTaskLeftTopTableWrapp").append(assemblyTaskLeftTopTable); */
 
 function reloadPackingLeftTopTasks() {
-	  $("#assemblyTaskleftTopTable").bootstrapTable("destroy");
-	  loadPackingLetTopTasks();
+	$("#assemblyTaskleftTopTable").bootstrapTable("destroy");
+	loadPackingLetTopTasks();
 }
 window.reloadPackingLeftTopTasks = reloadPackingLeftTopTasks;
 function loadPackingLetTopTasks() {
-//		  $("#assemblyTaskLeftTopTable").bootstrapTable('destroy');//销毁表格
-		  assemblyTaskLeftTopload(assemblyTaskLeftTopTableCon,assemblyTaskLeftTopTable_columns);
-		  $("#assemblyTaskLeftTopTable").bootstrapTable("refresh");
-		  $("#assemblyTaskLeftTopTable th,#assemblyTaskLeftTopTable td").css({
-	            "padding-bottom":"2px",
-	            "padding-top":"2px"
-	      });
-      $(".fixed-table-toolbar .columns,.fixed-table-toolbar .bs-bars").css({
+	//$("#assemblyTaskLeftTopTable").bootstrapTable('destroy');//销毁表格
+	assemblyTaskLeftTopload(assemblyTaskLeftTopTableCon,assemblyTaskLeftTopTable_columns);
+	$("#assemblyTaskLeftTopTable").bootstrapTable("refresh");
+	$("#assemblyTaskLeftTopTable th,#assemblyTaskLeftTopTable td").css({
+	    "padding-bottom":"2px",
+	    "padding-top":"2px"
+	});
+    $(".fixed-table-toolbar .columns,.fixed-table-toolbar .bs-bars").css({
         "line-height":"0",
         "margin-top":"4px",
         "margin-bottom":"4px"
-      });
-      $("#assemblyTaskLeftTopTableWrapp .fixed-table-container").css({"padding-bottom":"29px"});
-      subText("assemblyTaskLeftTopTable");
+    });
+    $("#assemblyTaskLeftTopTableWrapp .fixed-table-container").css({"padding-bottom":"29px"});
+    subText("assemblyTaskLeftTopTable");
 }
 /*left top table end*/
 var materials_columns=[ 
-                       {
-                         checkbox : true,
-                       },
-                       {
-                         title : '材料名称',
-                         field : 'name',
-                         align : 'center',
-                         sortable:true, //正序,逆序
-                         width:500,
-                         formatter:function(v,record){
-                       	  return "<span washQualityCheckPoint='"+record.washQualityCheckPoint+"' washQualityCheckMethod='"+record.washQualityCheckMethod+"' functionCheck='"+record.functionCheck+"'>"+v+"</span>";
-                         }
-                       },
-                       {
-                         title : '数量',
-                         field : 'count',
-                         align : 'center',
-                         sortable:true //正序,逆序
-                       },
-                       {
-                         title : '是否可拆',
-                         field : 'detachable',
-                         align : 'center',
-                         sortable:true //正序,逆序
-                       }
-                 ];
+    {
+        checkbox : true,
+    },
+    {
+        title : '材料名称',
+        field : 'name',
+        align : 'center',
+        sortable:true, //正序,逆序
+        width:500,
+        formatter:function(v,record){
+   	        return "<span washQualityCheckPoint='"+record.washQualityCheckPoint+"' washQualityCheckMethod='"+record.washQualityCheckMethod+"' functionCheck='"+record.functionCheck+"'>"+v+"</span>";
+        }
+    },
+    {
+        title : '数量',
+        field : 'count',
+        align : 'center',
+        sortable:true //正序,逆序
+    },
+    {
+        title : '是否可拆',
+        field : 'detachable',
+        align : 'center',
+        sortable:true //正序,逆序
+    }
+];
 //父级材料清单
 function materialList(rows){
-  $.ajax({
-    url:WWWROOT+"/disinfectSystem/baseData/tousseDefinitionController/getMaterialDefinitionByTousseName.mhtml",
-    dataType: "json", 
-    async: true, 
-    data: {"tousseName":rows.tousseName,"tousseDefinitionId":rows.tousseID}, 
-    type: "post", 
-    success: function(result) {
-      if(result.success == true){
-        //器械总数
-        $("#materialTotalAmount").text(result.materialTotalAmount);
-        //一次性物品总数
-        $("#diposableGoodsTotalAmount").text(result.diposableGoodsTotalAmount);                       
-        $("#materialsTable").bootstrapTable('destroy');
-          materialsLoadTable(result.rows,materials_columns);
-          metarilsFocus();//显示功能检查
-      }else{
-        alert(result.message);
-      }
-    }
-    
-  })
+    $.ajax({
+	    url:WWWROOT+"/disinfectSystem/baseData/tousseDefinitionController/getMaterialDefinitionByTousseName.mhtml",
+	    dataType: "json", 
+	    async: true, 
+	    data: {"tousseName":rows.tousseName,"tousseDefinitionId":rows.tousseID}, 
+	    type: "post", 
+	    success: function(result) {
+	        if(result.success == true){
+		        //器械总数
+		        $("#materialTotalAmount").text(result.materialTotalAmount);
+		        //一次性物品总数
+		        $("#diposableGoodsTotalAmount").text(result.diposableGoodsTotalAmount);                       
+		        $("#materialsTable").bootstrapTable('destroy');
+	            materialsLoadTable(result.rows,materials_columns);
+	            metarilsFocus();//显示功能检查
+		    }else{
+		        alert(result.message);
+		    }
+        }
+    })
 }
 //子级材料清单
 function materialListSub(subTr,rows){
-  for(var i=0;i<subTr.length;i++){
-    $(subTr[i]).click(function(){
-      $.ajax({
-            url:WWWROOT+"/disinfectSystem/baseData/tousseDefinitionController/getMaterialDefinitionByTousseName.mhtml",
-            dataType: "json", 
-            async: true, 
-            data: {"tousseName":rows.tousseName,"tousseDefinitionId":rows.tousseID}, 
-            type: "post", 
-            success: function(result) {
-              if(result.success == true){
-              $("#materialTotalAmount").text(result.materialTotalAmount);
-              $("#diposableGoodsTotalAmount").text(result.diposableGoodsTotalAmount);
-              $("#materialsTable").bootstrapTable('destroy');
-                  materialsLoadTable(result.rows,materials_columns);
-                  metarilsFocus();//显示功能检查
-              }else{
-                alert(result.message);
-              }
-              
-            }
-            
-      });
-    })
-  }
+    for(var i=0;i<subTr.length;i++){
+        $(subTr[i]).click(function(){
+	        $.ajax({
+	            url:WWWROOT+"/disinfectSystem/baseData/tousseDefinitionController/getMaterialDefinitionByTousseName.mhtml",
+	            dataType: "json", 
+	            async: true, 
+	            data: {"tousseName":rows.tousseName,"tousseDefinitionId":rows.tousseID}, 
+	            type: "post", 
+	            success: function(result) {
+	              if(result.success == true){
+	              $("#materialTotalAmount").text(result.materialTotalAmount);
+	              $("#diposableGoodsTotalAmount").text(result.diposableGoodsTotalAmount);
+	              $("#materialsTable").bootstrapTable('destroy');
+	                  materialsLoadTable(result.rows,materials_columns);
+	                  metarilsFocus();//显示功能检查
+	              }else{
+	                alert(result.message);
+	              }
+	              
+	            }
+	        });
+        })
+    }
 }
 
 //判断按钮显示
 function packPrintChange(){
-	 var selectionsTop = $("#assemblyTaskLeftTopTable").bootstrapTable('getSelections');
-	 if(selectionsTop.length>0){
-		 $("#packPrint").show();
-		 return;
-	 }
-	 var selections = $("#assemblyTaskleftFootTable").bootstrapTable('getSelections');
-	  var show = false;
-	  for(var i=0;i<selections.length;i++){
-		  var selectionsNode = selections[i].children;
-		  for(var j=0;j<selectionsNode.length;j++){
+	var selectionsTop = $("#assemblyTaskLeftTopTable").bootstrapTable('getSelections');
+	if(selectionsTop.length>0){
+		$("#packPrint").show();
+		return;
+	}
+    var selections = $("#assemblyTaskleftFootTable").bootstrapTable('getSelections');
+	var show = false;
+	for(var i=0;i<selections.length;i++){
+		var selectionsNode = selections[i].children;
+		for(var j=0;j<selectionsNode.length;j++){
 			//不为回收任务时,不显示装配与打印按钮,只有任务类型为回收任务时才显示
-	       		if(selectionsNode[j].taskType != taskType_recyclingRecord){
-	       			show = true;
-	       			break;
-	       		}
-		  }
-		  if(show){
-			  break;
-		  }
-	  }
-	  if(show){
-		  $("#packPrint").show();
-	  }else{
-		  $("#packPrint").hide();
-	  }
+       		if(selectionsNode[j].taskType != taskType_recyclingRecord){
+       			show = true;
+       			break;
+       		}
+		}
+		if(show){
+			break;
+		}
+	}
+	if(show){
+		$("#packPrint").show();
+	}else{
+		$("#packPrint").hide();
+	}
 }
 /*材料清单table start*/
 function materialsLoadTable(tableDate,columns){//detailView树形菜单
-	    $("#materialsTable").bootstrapTable(
-      {   
-        data:tableDate,
-        method : 'get',
-        striped : true,// 设置为 true 会有隔行变色效果
-        undefinedText : " ",// 当数据为 undefined 时显示的字符
-        data_local : "zh-US",// 表格汉化
-        responseHandler : "",
-        sortable: true,//是否启用排序
-        sortOrder: "desc",//排序方式
-        sortName: 'appTime',//排序字段
-        formatLoadingMessage: function () {  
-        return "请稍等，正在加载中...";  
-        }, 
-        formatNoMatches:function(){ //未找到匹配记录
-        //return " ";
-        },
-        columns : columns
-      });
-	}
+	$("#materialsTable").bootstrapTable(
+        {   
+	        data:tableDate,
+	        method : 'get',
+	        striped : true,// 设置为 true 会有隔行变色效果
+	        undefinedText : " ",// 当数据为 undefined 时显示的字符
+	        data_local : "zh-US",// 表格汉化
+	        responseHandler : "",
+	        sortable: true,//是否启用排序
+	        sortOrder: "desc",//排序方式
+	        sortName: 'appTime',//排序字段
+	        formatLoadingMessage: function () {  
+	        return "请稍等，正在加载中...";  
+	        }, 
+	        formatNoMatches:function(){ //未找到匹配记录
+	        //return " ";
+	        },
+	        columns : columns
+    });
+}
 
 
-$(function(){
-	   setInterval(function(){
-	    var  boxW = $(".assembly-task-middlefoot").width();
-	    var jgw  = (boxW-220)/2;
-	    $(".setInputH").css({"width":jgw+"px"});
-	   },350);
-})
 
 
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/directPacking.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/directPacking.js	(revision 0)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/directPacking.js	(revision 24698)
@@ -0,0 +1,173 @@
+$(function(){
+	//左上高度
+	$(".directPacking-left-top").css("height",$(window).height()-$(".directPacking-left-foot").height()-22);
+	//材料列表的表格start
+    var directPackingLeftListTable_colums=[ 
+	    {
+	      title : '材料名称',
+	      field : 'deparent',
+	      align : 'center',
+	    },
+	    {
+	      title : '数量',
+	      field : 'amount',
+	      align : 'center'
+    }]
+    var directPackingLeftListTableData =new Array();
+	for(var i=0; i<=100;i++){
+	  directPackingLeftListTableData.push({
+	    'deparent':"麻醉科",
+	    'amount':100
+	  });
+	}
+	var directPackingLeftListTableH =$(window).height()-$(".directPacking-left-foot").height()-56-22;
+	var tables = "<table id='directPackingLeftListTable' class='table table-striped table-bordered table-hover' data-height='"+directPackingLeftListTableH+"' data-toggle data-toggle='table'></table>";
+	
+	$(".directPacking-left-listTableWrapp").append(tables);
+	directPackingLeftListTableLoad(directPackingLeftListTableData,directPackingLeftListTable_colums);
+    //加载table
+	function directPackingLeftListTableLoad(tableDate,columns){//detailView树形菜单
+		$('#directPackingLeftListTable').bootstrapTable("destroy");
+	    $("#directPackingLeftListTable").bootstrapTable(
+	        {   
+	            data:tableDate,
+	            method : 'get',
+	            dataType : "json",
+	            dataField : "data",// 这是返回的json数组的key.默认好像是"rows".这里只有前后端约定好就行
+	            striped : true,// 设置为 true 会有隔行变色效果
+	            undefinedText : " ",// 当数据为 undefined 时显示的字符
+	            data_local : "zh-US",// 表格汉化
+	          //  height:h,
+	            minimumCountColumns: 1,     //最少允许的列数
+	            clickToSelect: true,            //是否启用点击选中行
+	            uniqueId: "ID",                     //每一行的唯一标识，一般为主键列
+	            cardView: false,          //是否显示详细视图
+	            detailView: false,              //是否显示父子表
+	            showExport: true,
+	            paginationLoop: false,      //是否无限循环
+	            formatLoadingMessage: function () {  
+	              return "请稍等，正在加载中...";  
+	            },  
+	            queryParams : function(params) {
+	                return {
+	                    start : params.offset,
+	                    limit : params.limit,
+	                    keyword : params.search
+	                };
+	            },
+	            idField : "id",
+	            columns : columns
+	    });
+	}
+    //材料列表的表格end
+    //装配记录格start
+    var directPackingTodayRecordTable_colums=[ 
+	    {
+	      title : '配包时间',
+	      field : 'time',
+	      align : 'center',
+	    },
+	    {
+	      title : '器械包',
+	      field : 'bag',
+	      align : 'center'
+        },
+        {
+	      title : 'name',
+	      field : 'names',
+	      align : 'center'
+        },
+        {
+	      title : '数量',
+	      field : 'amount',
+	      align : 'center'
+        },
+        {
+	      title : '配包人',
+	      field : 'packer',
+	      align : 'center'
+        }
+    ]
+    var directPackingTodayRecordTableData =new Array();
+	for(var i=0; i<=100;i++){
+	  directPackingTodayRecordTableData.push({
+	  	"time":"2018-12-31",
+	    'bag':"麻醉",
+	    'names':"手术衣",
+	    'amount':"1111111",
+	    'packer':"张三"
+	  });
+	}
+	var directPackingTodayRecordTableH =$(window).height()-26;
+	var directPackingTodayRecordTable = "<table id='directPackingTodayRecordTable' class='table table-striped table-bordered table-hover' data-height='"+directPackingTodayRecordTableH+"' data-toggle data-toggle='table'></table>";
+	$(".directPackingTodayRecordTableWrapp").append(directPackingTodayRecordTable);
+	directPackingTodayRecordTableLoad(directPackingTodayRecordTableData,directPackingTodayRecordTable_colums);
+    //加载table
+	function directPackingTodayRecordTableLoad(tableDate,columns){//detailView树形菜单
+		$('#directPackingTodayRecordTable').bootstrapTable("destroy");
+	    $("#directPackingTodayRecordTable").bootstrapTable(
+	        {   
+	            data:tableDate,
+	            method : 'get',
+	            dataType : "json",
+	            dataField : "data",// 这是返回的json数组的key.默认好像是"rows".这里只有前后端约定好就行
+	            striped : true,// 设置为 true 会有隔行变色效果
+	            undefinedText : " ",// 当数据为 undefined 时显示的字符
+	            data_local : "zh-US",// 表格汉化
+	            pagination: true,   //是否分页
+	            pageSize:10,
+	            pageList: [5, 10, 20, 50],//分页步进值
+	            minimumCountColumns: 1,     //最少允许的列数
+	            clickToSelect: true,            //是否启用点击选中行
+	            showColumns: true,              //列选择按钮
+	            uniqueId: "ID",                     //每一行的唯一标识，一般为主键列
+	            cardView: false,          //是否显示详细视图
+	            detailView: false,              //是否显示父子表
+	            showExport: true,
+	            paginationLoop: false,      //是否无限循环
+	            formatLoadingMessage: function () {  
+	              return "请稍等，正在加载中...";  
+	            },  
+	            queryParams : function(params) {
+	                return {
+	                    start : params.offset,
+	                    limit : params.limit,
+	                    keyword : params.search
+	                };
+	            },
+	            idField : "id",
+	            columns : columns
+	    });
+	}
+	$(".directPackingTodayRecordTableWrapp").find(".fixed-table-pagination").css({
+			"position":"static",
+			"width":"auto"
+	})
+ 	setInterval(function(){
+	    var  boxW = $(".directPacking-left-foot").width();
+	    var jgw  = (boxW-320)/3;
+	    $(".setInputH").css({"width":jgw+"px"});
+	},350);
+    
+   
+})
+//日期插件
+function datePick(dateId,format,direction,aa){
+    $("#"+dateId).datetimepicker({//选择年月日
+	　　format: format,
+	　　language: 'zh-CN',
+	　　weekStart: 1,
+	　　todayBtn: 1,//显示‘今日’按钮
+	　　autoclose: 1,
+	　　todayHighlight: 1,
+	　　startView: 2,//Number, String. 默认值：0, 'hour'，日期时间选择器所能够提供的最精确的时间选择视图。
+	　　minView: 0,  //设置为0，表示可以选择小时和分钟
+	　　//clearBtn:true,//清除按钮
+	　　forceParse: 0,
+	    pickerPosition:direction,
+        minuteStep:1 //选择分钟时显示的时间间隔，此处设置为1分钟
+　  });
+}
+datePick("directPackingDate","yyyy-mm-dd hh:ii","top-right");
+//默认显示当前时间
+$('#directPackingDate').datetimepicker('setDate', new Date());
Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/directPacking.jsp
===================================================================
diff -u
--- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/directPacking.jsp	(revision 0)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/directPacking.jsp	(revision 24698)
@@ -0,0 +1,195 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%@ include file="/common/taglibs.jsp"%>    
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <%@ include file="../commons/tagLibsPath.jsp"%>
+    <title>JSP模板</title>
+    <!-- bootstrap -->
+    <link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/bootstrap-3.3.7-dist/css/bootstrap.min.css">
+    <!-- IE兼容性插件 -->	
+    <link rel="stylesheet" type="text/css" href="${basePath}/dx-disinfectsystem/plugins/ie-6/ddouble-bsie-fe3a04a/bootstrap/css/bootstrap-ie6.min.css">
+    <link rel="stylesheet" type="text/css" href="${basePath}/dx-disinfectsystem/plugins/ie-6/ddouble-bsie-fe3a04a/bootstrap/css/ie.css">
+    <!-- bootstrap table -->
+    <link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/bootstrap-table/css/bootstrap-table.css">
+	<!-- bootstrap 固定表头  -->
+	<link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/bootstrap-table-fixed-columns-master/bootstrap-table-fixed-columns.css">
+	<%-- bootstrap-datetimepicker --%>
+	<link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/bootstrap-datetimepicker/branch/css/bootstrap-datetimepicker.min.css">
+    <!--自定义栅格系统-->
+    <link rel="stylesheet" type="text/css" href="${basePath}/dx-disinfectsystem/css/common/bootstrap-s-gridSystem.css">
+    <!--SSTS公共CSS文件-->
+    <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/index/font-awesome/css/font-awesome.min.css">
+    <!-- bootstrap 多选select  -->
+	<link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/bootstrap-select-master/dist/css/bootstrap-select.min.css">
+    <!-- 自身CSS -->											
+    <link rel="stylesheet" type="text/css" href="${basePath}/dx-disinfectsystem/css/index/index.css">
+    <!--[if lt IE 9]>
+	<![endif]-->
+	<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>
+	<style>
+		body{
+			background:#fff;
+			overflow:hidden;
+		}
+	</style>
+</head>
+<body>
+	<div class="directPacking-wrapp">
+		<div class="container-fluid">
+			<div class="row">
+			    <div class="col-md-8 directPacking-left">
+			    	<div class="row directPacking-left-top ">
+			    		<div class="col-md-9 directPacking-left-img">
+			    			<h3 class="comon-title">器械包图片</h3>
+			    			<div></div>
+			    		</div>
+			    		<div class="col-md-3 directPacking-left-list">
+			    			<h3 class="comon-title">材料列表</h3>
+			    			<div class="task-middletop-showList">
+			    				<a href="javascript:void(0);" class="btn" role="button">查看器械包图片</a>
+			    			</div>
+			    			<div class="directPacking-left-listTableWrapp">
+			    			</div>
+			    		</div>
+			    	</div>
+			    	<div class="directPacking-left-foot">
+			    		<form class="form-inline">
+							<div class="directPacking-left-foot-formlist">
+								<div class="form-group pull-left assembly-task-middlefoot-form">
+								    <label>装配模式:</label>
+								    <div class="setInputH">
+								    	<select name="" id="">
+								    		<option value="">自定义装配</option>
+								    		<option value="">重新装配</option>
+								    	</select>
+								    </div>
+								</div>
+								<div class="form-group pull-right assembly-task-middlefoot-form">
+								    <label>器械包条码:</label>
+								    <div class="setInputH">
+								    	<input type="text" class="form-control" placeholder="器械包条码" id="inspectorInput">
+								    </div>
+								</div>
+								<div class="form-group pull-left assembly-task-middlefoot-form">
+								    <label>配包人条码:</label>
+								    <div class="setInputH">
+								    	<input type="text" class="form-control" placeholder="配包人条码"  id="operatorCode">
+								    </div>
+								</div>
+							</div>
+							<div class="directPacking-left-foot-formlist">
+								<div class="form-group pull-left assembly-task-middlefoot-form">
+								    <label>配包人:</label>
+								    <div class="setInputH">
+								    	<input id="inspectorCodeInput" type="text" class="form-control" placeholder="配包人"  value="" />
+								    </div>
+								</div>
+								<div class="form-group pull-right assembly-task-middlefoot-form">
+								    <label>灭菌程序:</label>
+								    <div class="setInputH">
+								    	<select name="" id="">
+								    		<option value="">1111</option>
+								    		<option value="">33333</option>
+								    	</select>
+								    </div>
+								</div>
+								<div class="form-group pull-left assembly-task-middlefoot-form">
+								    <label>审核人条码:</label>
+								    <div class="setInputH">
+								    	<input type="text" class="form-control" placeholder="审核人条码"  id="operatorCode">
+								    </div>
+								</div>
+							</div>
+							<div class="directPacking-left-foot-formlist">
+								<div class="form-group pull-left assembly-task-middlefoot-form">
+								    <label>审核人:</label>
+								    <div class="setInputH">
+								    	<input id="inspectorCodeInput" type="text" class="form-control" placeholder="审核人"  value="" />
+								    </div>
+								</div>
+								<div class="form-group pull-right assembly-task-middlefoot-form">
+								    <label>包装类型:</label>
+								    <div class="setInputH">
+								    	<select name="" id="">
+								    		<option value="">1111</option>
+								    		<option value="">33333</option>
+								    	</select>
+								    </div>
+								</div>
+								<div class="form-group pull-left assembly-task-middlefoot-form">
+								    <label>器械包:</label>
+								    <div class="setInputH">
+								    	<input type="text" class="form-control" placeholder="审核人条码"  id="operatorCode">
+								    </div>
+								</div>
+							</div>
+							<div class="directPacking-left-foot-formlist">
+								<div class="form-group pull-left assembly-task-middlefoot-form">
+								    <label>装配数量:</label>
+								    <div class="setInputH">
+								    	<input id="inspectorCodeInput" type="text" class="form-control" placeholder="装配数量"  value="" />
+								    </div>
+								</div>
+								<div class="form-group pull-right assembly-task-middlefoot-form">
+								    <label>打印张数:</label>
+								    <div class="setInputH">
+								    	<input type="text" class="form-control">
+								    </div>
+								</div>
+								<div class="form-group pull-left assembly-task-middlefoot-form">
+								    <label>灭菌日期:</label>
+								    <div class="setInputH" style="position:relative;">
+										<input id="directPackingDate" type="text" name="" class="form-control">
+										<span class="glyphicon glyphicon-calendar form-control-feedback" style="top: -3px;right: -5px;"></span>
+									</div>
+								</div>
+							</div>
+						</form>
+						<div class="text-center" style="margin-top:20px;margin-bottom:50px;">
+		    				<button type="button" class="dx-btn-primary dx-btn-sm center-block">
+		    					<span class="glyphicon glyphicon-print"></span>
+		    					装配并打印标签
+		    				</button>
+    					</div>
+			    	</div>
+			    </div>
+  				<div class="col-md-4 directPacking-right">
+  					<h3 class="comon-title">今天的装配记录</h3>
+  					<div class="directPackingTodayRecordTableWrapp">
+			    	</div>
+  				</div>	
+			</div>
+		</div>
+	</div>
+</body>
+</html>
+<!-- jquery 1.9.1 -->
+<script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/jquery-1.9.1/js/jquery-1.9.1.js"></script>
+<script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/ie-6/ddouble-bsie-fe3a04a/js/bootstrap-ie.js"></script>
+<!-- bootstrap -->
+<script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/bootstrap-3.3.7-dist/js/bootstrap.min.js"></script>
+
+<!-- bootstrap table -->
+<script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/bootstrap-table/js/bootstrap-table.js"></script>
+<script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/bootstrap-table/js/bootstrap-table-zh-CN.js"></script>
+
+<!-- bootstrap 固定表头  -->
+<script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/bootstrap-table-fixed-columns-master/bootstrap-table-fixed-columns.js"></script>
+<!-- bootstrap 多选select  -->
+<script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/bootstrap-select-master/dist/js/bootstrap-select.min.js"></script>
+<script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/bootstrap-select-master/dist/js/defaults-zh_CN.js"></script> 
+<!-- x-editable-develop -->
+<%-- <script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/bootstrap-x-editable-develop/dist/bootstrap3-editable/js/bootstrap-editable.min.js"></script>
+<script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/bootstrap-table/extensions/editable/bootstrap-table-editable.min.js"></script> --%>
+  
+<%-- bootstrap-datetimepicker --%>
+<script language="javascript" type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/bootstrap-datetimepicker/branch/js/bootstrap-datetimepicker.js"></script>
+<!-- 引入自身js -->
+<script type="text/javascript" src="${basePath}/dx-disinfectsystem/js/assemblyManagement/directPacking.js"></script> 
\ No newline at end of file
Index: ssts-web/src/main/webapp/dx-disinfectsystem/css/index/index.css
===================================================================
diff -u -r24653 -r24698
--- ssts-web/src/main/webapp/dx-disinfectsystem/css/index/index.css	(.../index.css)	(revision 24653)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/css/index/index.css	(.../index.css)	(revision 24698)
@@ -1,14 +1,13 @@
 body{
     background:url("../../img/bg.jpg");
-   
     background-repeat: no-repeat;
     background-position: top right;
     font-size:15px;
 }
 .modal-footer{text-align:center;}
 .modal-content-addwidth{width:880px;left:50%;margin-left:-440px;}
 /* html { overflow-x: scroll;} */
-html { overflow: hidden;}
+/* html { overflow: hidden;} */
 .cor{cursor:pointer;}
 .w148{width:183px !important;}
 .w86{width:88px;}
@@ -497,7 +496,7 @@
 }
 .task-middletop-showList a{
     color:#000;
-    font-size: 14px;
+    font-size: 12px;
     background:none;
     border:none;
     font-family: "宋体";
@@ -743,4 +742,147 @@
 	top:0px;
 	left:50%;
 	margin-left:-10%;
+}
+/* 历史装配记录start */
+.assembly-record-wrapp{
+    width:100%;
+    border:1px solid #a8d2ad;
+}
+.assembly-record-head{
+    width:100%;
+    height:186px;
+    background:#f1faf0;
+    position:relative;
+    border-bottom: 1px solid #a8d2ad;
+}
+.assembly-record-title{
+    height:26px;
+    line-height: 26px;
+    background: #c5e2c9;
+    border-top:1px solid #a8d2ad;
+    border-bottom:1px solid #a8d2ad;
+}
+.assembly-record-title h3{
+    color: #367f21;
+    margin-top: 3px ;
+    margin-bottom: 0 ;
+    margin-left: 8px;
+    font: bold 14px tahoma,arial,verdana,sans-serif;
+}
+.assembly-record-title span{
+    margin-top:3px;
+    cursor:pointer;
+}
+.ssembly-record-inputWrapp{
+     margin-top:10px;
+}
+.assembly-record-input{
+    margin-bottom: 4px;
+}
+.assembly-record-input label{    
+    width:88px;
+    text-align:right;
+    font-family: "宋体";
+    font-size: 12px;
+}
+.assembly-record-input input{
+    height:26px;
+    width:133px;
+    font-family: "宋体";
+    font-size: 12px;
+}
+.bootstrap-select{
+    width:151px !important;
+}
+.record-start-time,.record-start-end{
+    position:relative;
+    margin-left:5px;
+}
+.record-start-end{
+    margin-left:3px;
+}
+.record-start-time span,.record-start-end span{
+   top: -3px;
+   right: -5px;
+}
+.ssembly-record-submit input{
+    width:auto;
+}
+.assembly-record-wrapp-con{
+    position:relative;
+    margin-top: 20px;
+}
+.assembly-record-head-toggole{
+    text-align: center;
+    margin-top: 10px;
+    cursor:pointer;
+    position: absolute;
+    width:30px;
+    height:30px;
+    left:50%;
+    margin-left: -15px;
+    top:-22px;
+}
+.assembly-record-conExcel{
+    background:#f1faf0;
+    height:26px;
+    line-height: 26px;
+    background: #c5e2c9;
+    padding-left: 8px;
+    border-bottom: 1px solid #a8d2ad;
+    margin-top: 0;
+    margin-bottom: 0;
+    cursor:pointer;
+}
+/* 自定义装配start */
+.comon-title{
+    color: #367f21;
+    font: bold 11px tahoma,arial,verdana,sans-serif;
+    border: 1px solid #afd7af;
+    height:26px;
+    line-height: 23px;
+    background: #cce6cf;
+    margin-top:0px;
+    margin-bottom:0;
+    padding-left: 10px;
+      font-family: "宋体";
+    font-size: 12px;
+}
+.directPacking-wrapp{
+    width:100%;
+   
+}
+.directPacking-wrapp .row{
+     margin-left: -15px;
+}
+.directPacking-left{
+    border:4px solid #afd7af;
+    padding-left: 0px;
+    padding-right:0;
+}
+.directPacking-left-img{
+    height:100%;
+     border-right:4px solid #afd7af;
+     padding-right:0;
+}
+.directPacking-left-list{
+    padding-left:0;
+}
+.directPacking-left-foot{
+    height:204px;
+    border-bottom:4px solid #afd7af;
+    border-top:4px solid #afd7af;
+    background:#f1faf0;
+    padding-top:10px;
+}
+.directPacking-left-foot-formlist{
+    width: 100%;
+    height: 34px;
+}
+.directPacking-left-foot-formlist .form-group{
+    width:33%;
+}
+.directPacking-right{
+    padding-left:0;
+    padding-right:0
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/historyAssemblyRecord.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/historyAssemblyRecord.js	(revision 0)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/historyAssemblyRecord.js	(revision 24698)
@@ -0,0 +1,213 @@
+$(function(){
+	//父级标签
+	var historyAssemblyRecordTable_Height;
+  var parentHead = window.parent.$(".head-index");
+  var navbar =  window.parent.$(".content-index");
+  var parentHeadIf = window.parent.$(".content-index-toggle-off");
+  historyAssemblyRecordTable_Height = $(window).height() - parentHead.height() - navbar.height() - 250;
+  console.log("高度。。",historyAssemblyRecordTable_Height);
+    
+
+
+
+
+  var historyAssemblyRecordTableData_colums=[ 
+      {
+        title : '科室',
+        field : 'deparent',
+        align : 'center',
+        sortable:true,
+        switchable: false
+      },
+      {
+        title : '供应商',
+        field : 'supplyRoom',
+        align : 'center',
+         sortable:true
+      },
+      {
+         title : '器械包',
+         field : 'instrumentBag',
+         align : 'center',
+         sortable:true
+      },
+      {
+         title : '拆包名称',
+         field : 'openBag',
+         align : 'center',
+         sortable:true
+      },
+      {
+         title : '数量',
+         field : 'openNum',
+         align : 'center',
+         sortable:true,
+         width:300
+      },
+      {
+         title : '配包人',
+         field : 'openBagPeo',
+         align : 'center',
+         sortable:true
+      },
+      {
+         title : '审核人',
+         field : 'auditPeo',
+         align : 'center',
+         sortable:true
+      },
+      {
+         title : '装配时间',
+         field : 'bagDate',
+         align : 'center',
+         sortable:true
+      },
+      {
+         title : '材料汇总',
+         field : 'metarilesAll',
+         align : 'center',
+         sortable:true
+      },
+      {
+         title : '医生',
+         field : 'doctor',
+         align : 'center',
+         sortable:true
+      }
+  ];
+	var todayAssemblyRecordTableData =new Array();
+	for(var i=0; i<=100;i++){
+	  todayAssemblyRecordTableData.push({
+	    'deparent':"麻醉科",
+	    'supplyRoom':"其他供应商",
+	    "instrumentBag":"手术包",
+	    "openBag":"手术包",
+	    "openNum":1,
+	    "openBagPeo":"张安",
+	    "auditPeo":"张安",
+	    "bagDate":"2018-9-4",
+	    "metarilesAll":"22",
+	    "doctor":"李四"
+	  });
+	}
+
+    //加载table
+	function histroyAssemblyRecordConTableLoad(tableDate,columns){//detailView树形菜单
+		$('#todayAssemblyRecordTable').bootstrapTable("destroy");
+	    $("#histroyAssemblyRecordConTable").bootstrapTable(
+	        {   
+	            data:tableDate,
+	            method : 'get',
+	            dataType : "json",
+	            dataField : "data",// 这是返回的json数组的key.默认好像是"rows".这里只有前后端约定好就行
+	            striped : true,// 设置为 true 会有隔行变色效果
+	            undefinedText : " ",// 当数据为 undefined 时显示的字符
+	            data_local : "zh-US",// 表格汉化
+	            height:historyAssemblyRecordTable_Height,
+	            pagination: true,   //是否分页
+	            pageSize:5,
+	            pageList: [5, 10, 20, 50],//分页步进值
+	            //sidePagination: "server",   //服务端分页
+	            queryParamsType: "limit",   //查询参数组织方式
+	            //onColumnSwitch:onColumnSwitch,
+	            //queryParams : queryParams, 
+	            searchOnEnterKey: "true",      //回车搜索
+	            showColumns: true,              //列选择按钮
+	            minimumCountColumns: 1,     //最少允许的列数
+	            clickToSelect: true,            //是否启用点击选中行
+	            uniqueId: "ID",                     //每一行的唯一标识，一般为主键列
+	            cardView: false,          //是否显示详细视图
+	            detailView: false,              //是否显示父子表
+	            showExport: true,
+	            exportDataType: "selected",//导出checkbox选中的行数
+	            paginationLoop: false,      //是否无限循环
+	            formatLoadingMessage: function () {  
+	              return "请稍等，正在加载中...";  
+	            },  
+	            queryParams : function(params) {
+	                return {
+	                    start : params.offset,
+	                    limit : params.limit,
+	                    keyword : params.search
+	                };
+	            },
+	            onClickRow: function (row) {
+	                $("#historyAssemblyRecordModel").modal("show");
+	            },
+	            idField : "id",
+	            columns : columns
+	    });
+	}
+	histroyAssemblyRecordConTableLoad(todayAssemblyRecordTableData,historyAssemblyRecordTableData_colums);
+	$(".assembly-record-head-toggole span").click(function(){
+    	var recordHeadHeight= $(".assembly-record-head").height();
+    	if(recordHeadHeight == 185 || recordHeadHeight == 184){
+    		$(".assembly-record-head").css("height","0px");
+    		$(".assembly-record-head").slideUp();
+	    	$(this).removeClass("glyphicon-triangle-top");
+	    	$(this).addClass("glyphicon-triangle-bottom");
+	    	$(this).parent().css("top","-35px");
+	    	historyAssemblyRecordTable_Height = $(window).height() - parentHead.height() - navbar.height() -70;
+	    	console.log("高度。。",historyAssemblyRecordTable_Height);
+
+    	}else{
+    		$(".assembly-record-head").css("height","185px");
+    		$(".assembly-record-head").slideDown();
+	    	$(this).removeClass("glyphicon-triangle-bottom");
+	    	$(this).addClass("glyphicon-triangle-top");
+	    	$(this).parent().css("top","-22px");
+	    	historyAssemblyRecordTable_Height = $(window).height() - parentHead.height() - navbar.height() - 250;
+	    	console.log("高度。。",historyAssemblyRecordTable_Height);
+    	}
+      $("#histroyAssemblyRecordConTable").bootstrapTable('resetView', { 
+        height :  historyAssemblyRecordTable_Height
+      }); 
+    	
+  })
+	$(window).resize(function () {
+    $("#histroyAssemblyRecordConTable").bootstrapTable('resetView', { 
+        height :  historyAssemblyRecordTable_Height
+    }); 
+ });
+
+    //修改
+  $("#historyAssemblyAmend").click(function(){
+    $("#historyAssemblyAmendModel").modal("show");
+  })
+    //废弃
+	$("#historyAssemblyDiscard").click(function(){
+    $("#historyAssemblyDiscardModel").modal("show");
+  })
+  //加急
+	$("#historyAssemblyUrgent").click(function(){
+    $("#historyAssemblyUrgentModel").modal("show");
+  })
+})
+/*加载end*/
+
+//废弃点是以后
+function historyAssemblyYesDiscard(){
+	$("#historyAssemblyDiscardReason").modal("show");
+}
+//日期插件
+function datePick(dateId,format,direction){
+    $("#"+dateId).datetimepicker({//选择年月日
+	　　format: format,
+	　　language: 'zh-CN',
+	　　weekStart: 1,
+	　　todayBtn: 1,//显示‘今日’按钮
+	　　autoclose: 1,
+	　　todayHighlight: 1,
+	　　startView: 2,//Number, String. 默认值：0, 'hour'，日期时间选择器所能够提供的最精确的时间选择视图。
+	　　minView: 0,  //设置为0，表示可以选择小时和分钟
+	　　//clearBtn:true,//清除按钮
+	　　forceParse: 0,
+	    pickerPosition:direction,
+      minuteStep:1 //选择分钟时显示的时间间隔，此处设置为1分钟
+　  });
+}
+datePick("historyRecordStartTime","yyyy-mm-dd hh:ii","bottom-right");
+datePick("historyRecordEndTime","yyyy-mm-dd hh:ii","bottom-right");
+//默认显示当前时间
+$('#historyRecordStartTime').datetimepicker('setDate', new Date());
+$('#historyRecordEndTime').datetimepicker('setDate', new Date());
\ No newline at end of file
Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/index.jsp
===================================================================
diff -u -r24653 -r24698
--- ssts-web/src/main/webapp/dx-disinfectsystem/pages/index.jsp	(.../index.jsp)	(revision 24653)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/index.jsp	(.../index.jsp)	(revision 24698)
@@ -33,7 +33,7 @@
 <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>
 <style type="text/css">
-    
+     html { overflow-y: auto;}
 	 body{ background-color: #337b47;}
 	*{padding: 0px;margin: 0px;}
 	.caret{border-top: 4px solid #fff !important;}
Index: ssts-web/src/main/webapp/dx-disinfectsystem/plugins/bootstrap-table/js/bootstrap-table.js
===================================================================
diff -u -r24187 -r24698
--- ssts-web/src/main/webapp/dx-disinfectsystem/plugins/bootstrap-table/js/bootstrap-table.js	(.../bootstrap-table.js)	(revision 24187)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/plugins/bootstrap-table/js/bootstrap-table.js	(.../bootstrap-table.js)	(revision 24698)
@@ -1715,7 +1715,7 @@
             }
             cellStyle = calculateObjectValue(that.header,
                 that.header.cellStyles[j], [value_, item, i, field], cellStyle);
-            if (cellStyle.classes) {
+            if (cellStyle.classes != undefined && cellStyle.classes) {
                 class_ = sprintf(' class="%s"', cellStyle.classes);
             }
             if (cellStyle.css) {
Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/historyAssemblyRecord.jsp
===================================================================
diff -u
--- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/historyAssemblyRecord.jsp	(revision 0)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/historyAssemblyRecord.jsp	(revision 24698)
@@ -0,0 +1,356 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%@ include file="/common/taglibs.jsp"%>    
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <%@ include file="../commons/tagLibsPath.jsp"%>
+    <title>JSP模板</title>
+    <!-- bootstrap -->
+    <link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/bootstrap-3.3.7-dist/css/bootstrap.min.css">
+    <!-- IE兼容性插件 -->	
+    <link rel="stylesheet" type="text/css" href="${basePath}/dx-disinfectsystem/plugins/ie-6/ddouble-bsie-fe3a04a/bootstrap/css/bootstrap-ie6.min.css">
+    <link rel="stylesheet" type="text/css" href="${basePath}/dx-disinfectsystem/plugins/ie-6/ddouble-bsie-fe3a04a/bootstrap/css/ie.css">
+    <!-- bootstrap table -->
+    <link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/bootstrap-table/css/bootstrap-table.css">
+	<!-- bootstrap 固定表头  -->
+	<link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/bootstrap-table-fixed-columns-master/bootstrap-table-fixed-columns.css">
+	<%-- bootstrap-datetimepicker --%>
+	<link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/bootstrap-datetimepicker/branch/css/bootstrap-datetimepicker.min.css">
+    <!--自定义栅格系统-->
+    <link rel="stylesheet" type="text/css" href="${basePath}/dx-disinfectsystem/css/common/bootstrap-s-gridSystem.css">
+    <!--SSTS公共CSS文件-->
+    <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/index/font-awesome/css/font-awesome.min.css">
+    <!-- bootstrap 多选select  -->
+	<link rel="stylesheet" href="${basePath}/dx-disinfectsystem/plugins/bootstrap-select-master/dist/css/bootstrap-select.min.css">
+    <!-- 自身CSS -->											
+    <link rel="stylesheet" type="text/css" href="${basePath}/dx-disinfectsystem/css/index/index.css">
+    <!--[if lt IE 9]>
+	<![endif]-->
+	<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>
+	<style>
+		body{
+			background:#fff;
+			overflow:hidden;
+		}
+	</style>
+</head>
+<body>
+	<div class="assembly-record-wrapp">
+		<div class="assembly-record-head">
+			<div class="assembly-record-title">
+				<h3 class="pull-left">历史装配记录</h3>
+				<span class="pull-right glyphicon glyphicon-chevron-up"></span>
+			</div>
+			<form class="form-inline">
+				<div class="ssembly-record-inputWrapp">
+					<div class="assembly-record-input">
+						<div class="form-group">
+						    <label>开始时间:</label>
+						    <div class="pull-right record-start-time">
+								<input id="historyRecordStartTime" type="text" name="" class="form-control" placeholder="开始时间"/>
+								<span class="glyphicon glyphicon-calendar form-control-feedback"></span>
+							</div>
+						</div>
+						<div class="form-group">
+						    <label>结束时间:</label>
+						    <div class="pull-right record-start-end">
+								<input id="historyRecordEndTime" type="text" name="" class="form-control" placeholder="结束时间"/>
+								<span class="glyphicon glyphicon-calendar form-control-feedback"></span>
+							</div>
+						</div>
+						<div class="form-group">
+						    <label for="exampleInputName2">科室:</label>
+						    <input type="text" class="form-control" placeholder="科室"/>
+						</div>
+						<div class="form-group">
+						    <label for="exampleInputName2">灭菌篮筐条码:</label>
+						    <input type="text" class="form-control"  placeholder="灭菌篮筐条码"/>
+						</div>
+					</div>
+					<div class="assembly-record-input">
+						<div class="form-group">
+						    <label for="exampleInputName2">器械包分组:</label>
+						    <input type="text" class="form-control"  placeholder="器械包分组"/>
+						</div>
+						<div class="form-group">
+						    <label for="exampleInputName2">器械包类型:</label>
+						    <select id="lunch" class="selectpicker show-tick" data-live-search="true" multiple>
+						        <option>1</option>
+						        <option>2</option>
+						        <option>3</option>
+						        <option>4</option>
+						        <option>5</option>
+						    </select>
+						</div>
+						<div class="form-group">
+						    <label for="exampleInputName2">器械包名称:</label>
+						    <input type="text" class="form-control"  placeholder="器械包名称"/>
+						</div>
+						<div class="form-group">
+						    <label for="exampleInputName2">器械包条码:</label>
+						    <input type="text" class="form-control"  placeholder="器械包条码"/>
+						</div>
+	                </div>
+	                <div class="assembly-record-input">
+						<div class="form-group">
+						    <label for="exampleInputName2">装配任务组:</label>
+						    <input type="text" class="form-control"  placeholder="装配任务组"/>
+						</div>
+						<div class="form-group">
+						    <label for="exampleInputName2">配包人:</label>
+						    <input type="text" class="form-control"  placeholder="配包人"/>
+						</div>
+						<div class="form-group">
+						    <label for="exampleInputName2">工号:</label>
+						    <input type="text" class="form-control"  placeholder="工号"/>
+						</div>
+				    </div>
+				</div>
+				<div class="text-center ssembly-record-submit">
+					<input type="button" class="btn  btn-success btn-sm" value="查询"/>
+				    <input type="reset"  class="btn  btn-success btn-sm" value="重置">
+				</div>
+		    </form>
+		</div>
+		<div class="assembly-record-wrapp-con">
+			<p class="assembly-record-head-toggole"><span class="glyphicon glyphicon-triangle-top"></span></p>
+			<p class="assembly-record-conExcel">导出excel</p>
+			<div class="assembly-record-conTableWrapp">
+				<table id='histroyAssemblyRecordConTable' class='table table-striped table-bordered table-hover' data-toggle data-toggle='table'></table>
+			</div>
+		</div>
+	</div>
+
+
+	<!-- 历史装配记录点击表格每一行模态框 -->
+    <div class="modal fade" id="historyAssemblyRecordModel" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+        <div class="modal-dialog" role="document" >
+	       <div class="modal-content modal-content-addwidth" >
+	           <div class="modal-header">
+	               <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+	               <h4 class="modal-title title-font">重新打印标签</h4>
+	           </div>
+	           <div class="modal-body" >
+	           		<div>
+	          			<h5 class="title-font">条形码扫描登记</h5>
+	          			<form action="" class="form-inline">    
+			                <div class="form-group basketry">
+							    <label>输入条形码:</label>
+							    <input type="text" class="form-control" placeholder="输入条形码">
+							</div>
+				    	</form>
+	          		</div>
+	          		<div id="printAmend">
+		      			<button type="button" class="dx-btn-primary dx-btn-sm" style="margin-left:0;" id="historyAssemblyAmend">
+	    			   		<span class="glyphicon glyphicon-pencil"></span>&nbsp;修改
+	    			   	</button>
+	    			   	<button type="button" class="dx-btn-primary dx-btn-sm" >
+	    			   		<span class="glyphicon glyphicon-print"></span>&nbsp;打印
+	    			   	</button>
+	    			   	<button type="button" class="dx-btn-primary dx-btn-sm" id="historyAssemblyDiscard">
+	    			   		<span class="glyphicon glyphicon-trash"></span>&nbsp;废弃
+	    			   	</button>
+	    			   	<button type="button" class="dx-btn-primary dx-btn-sm" id="historyAssemblyUrgent">
+	    			   		<span class="glyphicon glyphicon-random"></span>&nbsp;加急
+	    			   	</button>
+	          		</div>
+	          		<div id="printAmendtableWrapp">
+	          			<table id='printAmendtable' class='table table-striped table-bordered table-hover' data-height='230' data-toggle data-toggle='table'></table>
+	          		</div>
+	           </div>
+	           <div class="modal-footer text-center">
+	               <button type="button" class="dx-btn-primary dx-btn-lg" data-dismiss="modal">取消</button>
+	           </div>
+	       </div>
+        </div>
+    </div>
+
+
+    <!-- 历史装配记录点击表格每一行模态框中的修改按钮模态框 -->
+    <div class="modal fade" id="historyAssemblyAmendModel" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+        <div class="modal-dialog" role="document">
+	       <div class="modal-content">
+	           <div class="modal-header">
+	               <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+	               <h4 class="modal-title title-font">修改器械包信息</h4>
+	           </div>
+	           <div class="modal-body" >
+	           		<form class="form-inline">
+		           		<div class="breakage-msg-modeltoplist">
+	          				<div class="pull-left w50">
+							    <div class="form-group pull-left text-right w86" >
+							      <label class="control-label">配包人:</label>
+							    </div>
+							    <div class="pull-left ml12">
+									<input  type="text" name="" class="form-control w148">
+								</div>
+	          				</div>
+	          				<div class="pull-right w50"> 
+	          					<div class="form-group pull-left text-right w86">
+	          						<label for="dateFrom_breakage" class="control-label">审核人:</label>
+	          					</div>
+								<div class="pull-left ml12">
+									<input  type="text" name="" class="form-control w148">
+								</div>
+	          				</div>
+		          		</div>
+		          		<div class="breakage-msg-modeltoplist">
+	          				<div class="pull-left w50" >
+	          					<div class="form-group pull-left text-right w86">
+							      <label class=" control-label">灭菌程序:</label>
+							    </div>
+							    <div class="pull-left ml12">
+								    <select  name="parentid" class="w148">
+					    				<option selected="selected" value="666">无</option>
+					    				<option selected="selected" value="666">低温离子器械包</option>
+					    				<option selected="selected" value="666">低温</option>
+					    				<option selected="selected" value="666">器械包</option>
+									</select>
+								</div>
+	          				</div>
+	          				<div class="pull-right w50">
+							    <div class="form-group pull-left text-right w86">
+							      <label class=" control-label" for="breakageDeparent">包装类型:</label>
+							    </div>
+							    <div class="pull-left ml12">
+								    <select  name="parentid"  class="w148">
+					    				<option selected="selected" value="666">棉布</option>
+					    				<option selected="selected" value="666">塑料</option>
+					    				<option selected="selected" value="666">灭菌盒</option>
+									</select>
+								</div>
+	          				</div>
+	          			</div>
+	          			<div class="breakage-msg-modeltoplist">
+	          				<div class="pull-left w50">
+							    <div class="form-group pull-left text-right w86" >
+							      <label class="control-label" for="dateFrom_Amend">灭菌开始时间:</label>
+							    </div>
+							    <div class="pull-left ml12 sterilization-dateinput" >
+									<input id="dateFrom_Amend" type="text" name="" class="form-control" data-date="2018-01-12 10:19:12" data-date-format="hh:ii" >
+									<span class="glyphicon glyphicon-calendar form-control-feedback"></span>
+								</div>
+	          				</div>
+	          				<div class="pull-right w50"> 
+	          					<div class="form-group pull-left text-right w86">
+	          						<label for="dateFrom_breakage" class="control-label">炉次:</label>
+	          					</div>
+								<div class="pull-left ml12">
+									<input  type="text" name="" class="form-control w148">
+								</div>
+	          				</div>
+		          		</div>
+	          		<form class="form-inline">
+	           </div>
+	           <div class="modal-footer text-center">
+	               <button type="button" class="btn" data-dismiss="modal">确定</button>
+	           </div>
+	       </div>
+        </div>
+    </div>
+     <!-- 装配记录废弃模态框 -->
+    <div class="modal fade" id="historyAssemblyDiscardModel" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+        <div class="modal-dialog" role="document">
+	       <div class="modal-content">
+	           <div class="modal-header">
+	               <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+	               	 <span aria-hidden="true">&times;</span>
+	                </button>
+	               <h4 class="modal-title title-font">请确认</h4>
+	           </div> 
+	          <div class="modal-body text-center" > 
+	          		<p class="text-danger"><span class='glyphicon glyphicon-exclamation-sign'></span>&nbsp;确定要废弃选中的器械包吗？</p>
+	           </div>
+	           <div class="modal-footer text-center">
+	               <button type="button" class="btn btn-default" onclick="historyAssemblyYesDiscard()">是</button>
+	               <button type="button" class="dx-btn-primary dx-btn-lg" data-dismiss="modal">否</button>
+	           </div> 
+	       </div>
+        </div>
+    </div> 
+    <!-- 装配记录表格废弃点是以后的弹框 -->
+  	<div class="modal fade discardReason" id="historyAssemblyDiscardReason" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+	    <div class="modal-dialog" role="document">
+	       <div class="modal-content modal-content-addwidth">
+	           <div class="modal-header">
+	               <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+	               <h4 class="modal-title title-font">填写器械包废弃原因(必须填写)</h4>
+	           </div>
+	           <div class="modal-body" >
+	          		<div class="radio">
+					  <label>
+					    <input type="radio" name="optionsRadios" id="optionsRadios2" value="option2">
+					    	填写错误
+					  </label>
+					</div>
+					<div class="radio">
+					  <label>
+					    <input type="radio" name="optionsRadios" id="optionsRadios2" value="option2">
+					    	测试数据
+					  </label>
+					</div>
+					<div class="radio">
+					  <label>
+					    <input type="radio" name="optionsRadios" id="optionsRadios2" value="option2">
+					    	其他
+					  </label>
+					</div>
+					<textarea name=""></textarea>
+	           </div>
+	           <div class="modal-footer text-center">
+	               <button type="button" class="dx-btn-primary dx-btn-lg">确定</button>
+	           </div>
+	       </div>
+	    </div>
+	</div>
+    <!-- 历史装配记录加急模态框 -->
+    <div class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" id="historyAssemblyUrgentModel"> 
+        <div class="modal-dialog" role="document">
+	       <div class="modal-content">
+	           <div class="modal-header">
+	               <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+	               	 <span aria-hidden="true">&times;</span>
+	                </button>
+	               <h4 class="modal-title title-font">请确认</h4>
+	           </div> 
+	          <div class="modal-body text-center" > 
+	          		<p class="text-danger"><span class='glyphicon glyphicon-exclamation-sign'></span>&nbsp;确定要加急选中的器械包吗？</p>
+	           </div>
+	           <div class="modal-footer text-center">
+	               <button type="button" class="btn btn-default">是</button>
+	               <button type="button" class="dx-btn-primary dx-btn-lg" data-dismiss="modal">否</button>
+	           </div> 
+	       </div>
+        </div>
+    </div>
+</body>
+</html>
+<!-- jquery 1.9.1 -->
+<script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/jquery-1.9.1/js/jquery-1.9.1.js"></script>
+<script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/ie-6/ddouble-bsie-fe3a04a/js/bootstrap-ie.js"></script>
+<!-- bootstrap -->
+<script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/bootstrap-3.3.7-dist/js/bootstrap.min.js"></script>
+
+<!-- bootstrap table -->
+<script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/bootstrap-table/js/bootstrap-table.js"></script>
+<script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/bootstrap-table/js/bootstrap-table-zh-CN.js"></script>
+
+<!-- bootstrap 固定表头  -->
+<script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/bootstrap-table-fixed-columns-master/bootstrap-table-fixed-columns.js"></script>
+<!-- bootstrap 多选select  -->
+<script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/bootstrap-select-master/dist/js/bootstrap-select.min.js"></script>
+<script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/bootstrap-select-master/dist/js/defaults-zh_CN.js"></script> 
+<!-- x-editable-develop -->
+<%-- <script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/bootstrap-x-editable-develop/dist/bootstrap3-editable/js/bootstrap-editable.min.js"></script>
+<script type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/bootstrap-table/extensions/editable/bootstrap-table-editable.min.js"></script> --%>
+  
+<%-- bootstrap-datetimepicker --%>
+<script language="javascript" type="text/javascript" src="${basePath}/dx-disinfectsystem/plugins/bootstrap-datetimepicker/branch/js/bootstrap-datetimepicker.js"></script>
+<!-- 引入自身js -->
+<script type="text/javascript" src="${basePath}/dx-disinfectsystem/js/assemblyManagement/historyAssemblyRecord.js"></script> 
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/todayAssemblyManagementRecord.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/todayAssemblyManagementRecord.js	(revision 0)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/todayAssemblyManagementRecord.js	(revision 24698)
@@ -0,0 +1,644 @@
+$(function(){
+    //今天本组装配记录start
+    //父级标签
+    var parentHead = window.parent.$(".head-index");
+    var navbar =  window.parent.$(".content-index");
+    var parentHeadIf = window.parent.$(".content-index-toggle-off");
+    var todayTableHeight = $(window).height() - parentHead.height() - navbar.height() - 124;
+    var todayAssemblyRecord_columns=[ 
+        {
+          checkbox : true,
+        },
+        {
+          title : "科室",
+          field : 'depart',
+          align : 'center',
+          sortable:true //正序,逆序
+        },
+        {
+           title : '供应商',
+           field : 'supplierName',
+           align : 'center',
+          sortable:true //正序,逆序
+        },
+        {
+           title : '器械包',
+           field : 'tousseName',
+           align : 'center',
+           sortable:true //正序,逆序
+        },
+        {
+           title : '拆包名称',
+           field : 'splitTousseName',
+           align : 'center',
+           sortable:true //正序,逆序
+        },
+         {
+           title : '数量',
+           field : 'amount',
+           align : 'center',
+           sortable:true //正序,逆序
+        },
+         {
+           title : '配包人',
+           field : 'packer',
+           align : 'center',
+           sortable:true //正序,逆序
+        }, {
+           title : '审核人',
+           field : 'reviewer',
+           align : 'center',
+           sortable:true //正序,逆序
+        }, {
+           title : '装配时间',
+           field : 'packTimeStr',
+           align : 'center',
+           sortable:true //正序,逆序
+        }
+        , {
+           title : '材料汇总',
+           field : 'foreignMaterialsAmount',
+           align : 'center',
+           sortable:true //正序,逆序
+        }
+        , {
+           title : '医生',
+           field : 'doctor',
+           align : 'center',
+           sortable:true //正序,逆序
+        }
+    ];
+   // var todayAssemblyRecordTable = "";                   
+    //$("#todayAssemblyRecordTableWrapp").append(todayAssemblyRecordTable);
+    var InitTable =function(url){
+        //先销毁表格
+        $('#todayAssemblyRecordTable').bootstrapTable("destroy");
+        //添加表格
+        $('#todayAssemblyRecordTable').bootstrapTable({
+            url:url,
+            method:'post',      //请求方式
+            contentType: "application/x-www-form-urlencoded",//请求数据内容格式 默认是 application/json 自己根据格式自行服务端处理
+            height: todayTableHeight,
+            search: true,           //是否搜索
+            pagination: true,   //是否分页
+            pageSize:5,
+            pageList: [5, 10, 20, 50],//分页步进值
+            sidePagination: "server",   //服务端分页
+            queryParamsType: "limit",   //查询参数组织方式
+            onColumnSwitch:onColumnSwitch,
+            toolbar:'#exportExcel',
+            queryParams : queryParams, 
+            searchOnEnterKey: "true",   //回车搜索
+            //showRefresh: "true",            //刷新按钮
+            showColumns: true,              //列选择按钮
+            minimumCountColumns: 1,     //最少允许的列数
+            clickToSelect: true,            //是否启用点击选中行
+            uniqueId: "ID",                     //每一行的唯一标识，一般为主键列
+            cardView: false,          //是否显示详细视图
+            detailView: false,              //是否显示父子表
+            showExport: true,
+            exportDataType: "selected",//导出checkbox选中的行数
+            paginationLoop: false,      //是否无限循环
+            columns: todayAssemblyRecord_columns,
+        });
+        return InitTable;
+    }
+    InitTable(WWWROOT+"/disinfectSystem/grid/gridController/getGrid.mhtml");
+    $("#todayAssemblyRecordTableWrapp .fixed-table-pagination").css("top",$(".wrapp").height()-47);
+    //jq过滤事件
+    var addArray= new Array();
+    var array=[];
+    
+    for (var i = 0; i < todayAssemblyRecord_columns.length; i++) { 
+        if(!todayAssemblyRecord_columns[i].field)
+        {
+            //console.log("no create field:"+todayAssemblyRecord_columns[i].field);
+        }
+        if(todayAssemblyRecord_columns[i].field==null)
+        { 
+            //console.log("null field:"+todayAssemblyRecord_columns[i].field);
+        }
+        else
+        {
+            array.push(todayAssemblyRecord_columns[i].field);
+        }
+    }
+    $('#todayHistoryHidden').val(JSON.stringify(array));
+    //列筛选
+    function onColumnSwitch(field,checked){
+        var str ={'Name':field,'states':checked}
+        addArray.push(str);
+        Array.prototype.indexOf = function(val) {
+                for (var i = 0; i < this.length; i++) {
+                        if (this[i] == val) return i;
+                }
+                return -1;
+        };
+        Array.prototype.remove = function(val) {
+                var index = this.indexOf(val);
+                if (index > -1) {
+                        this.splice(index, 1);
+                }
+        };
+        for(var i=0;i<addArray.length;i++){
+                if(addArray[i].states===false){
+                        array.remove(addArray[i].Name);
+                }
+                if(addArray[i].states===true){
+                        array.push(addArray[i].Name);
+                }
+        }
+        $('#todayHistoryHidden').val(JSON.stringify(array));
+    }
+    //var outparams =params;
+    function queryParams(params,searchName) {
+        var beginSelect = $("#beginSelect option:selected").val();
+        var endSelect = $("#endSelect option:selected").val();
+        var instrumentSetSelect = $("#instrumentSetSelect option:selected").text();
+        var departmentsSelect = $("#departmentsSelect option:selected").text();
+        var instrumentCode = $("#instrumentCode").val();
+        var packagePeople = $("#packagePeople").val();
+        if(beginSelect > endSelect){
+          alert("开始时间不能大于结束时间");
+          return;
+        }
+        var requestParamsObj = {
+          "offset": params.offset, //页码
+          "limit": params.limit,   //每页的条数
+          "logicalOperator": " AND ",
+          "gridId": "com.forgon.disinfectsystem.packing.findPackingRecordList",
+
+        };
+       
+        var requestSortsClounms = [//排序
+              {
+              "columnLabel": "id",
+              "propFullName": "",
+              "direction": "desc"
+              }
+        ];
+        //查询
+        var requestFilters = [
+        ];
+        
+        var packTime ={
+            "columnLabel": "packTime", 
+            "type": "DATETIME",
+            "dateFormat":"yyyy-MM-dd HH:mm",
+            "minValue": beginSelect,
+            "maxValue": endSelect,
+            "operator": "BETWEEN"
+        }
+        requestFilters.push(packTime);
+
+        if(instrumentSetSelect !=""){//器械包名称
+            var tousseName ={
+              "columnLabel": "tousseName", 
+              "type": "STRING",
+              "value": instrumentSetSelect,
+              "operator": "like"
+            }
+          requestFilters.push(tousseName);
+        }
+        //器械组
+        var taskGroupParam= {
+          "columnLabel": "taskGroup", 
+          "type": "STRING",
+          "value": taskGroup,
+          "operator": "="
+        }
+        requestFilters.push(taskGroupParam);
+        if(departmentsSelect !=""){//科室
+          var depart= {
+              "columnLabel": "depart", 
+              "type": "STRING",
+              "value": departmentsSelect,
+              "operator": "="
+            }
+          requestFilters.push(depart);
+        }
+        if(packagePeople !=""){
+            var packagePeople =  {
+              "columnLabel": "packer", //配包者
+              "type": "STRING",
+              "value": packagePeople,
+              "operator": "like"
+            }
+            requestFilters.push(packagePeople);
+        }
+        //右边搜索
+        var searchFilters = {
+            "logicalOperator": " OR ",
+            "filters": [
+            ] 
+        };
+        if (params.search != undefined && params.search != "") {
+          var todayHistoryHiddenVals = JSON.parse($("#todayHistoryHidden").val());
+          for (var i = 0; i < todayAssemblyRecord_columns.length; i++) {
+              for (var j = 0; j < todayHistoryHiddenVals.length; j++) {
+                if (todayAssemblyRecord_columns[i].field == todayHistoryHiddenVals[j]) {
+                  var tempObj = {
+                    "columnLabel": todayHistoryHiddenVals[j],
+                    "value": params.search
+                  };
+                  if (todayHistoryHiddenVals[j] == "amount") {
+                    tempObj.type = "NUMBER";
+                    tempObj.operator = "=";
+                  } else if(todayHistoryHiddenVals[j] == "packTimeStr"){
+
+                  }else {
+                    tempObj.type = "STRING";
+                    tempObj.operator = "like";
+                    searchFilters.filters.push(tempObj);
+                  }
+                  break;  
+                }
+              }
+          } 
+          // 将右边搜索放进filters里面
+          requestFilters.push(searchFilters);
+          // 将filters数组放入最外层
+          requestParamsObj.filters = requestFilters;
+
+        }        
+        // 将排序参数放入最外层
+        requestParamsObj.sorters = requestSortsClounms;
+        requestParamsObj.filters = requestFilters;
+        return {gridParams:JSON.stringify(requestParamsObj)};
+    } 
+ 
+    //今天分组装配记录
+    $("#todayAssemblyRecordTableWrapp .fixed-table-container").css("padding-bottom","43px");
+    $(window).resize(function () {
+        $("#todayAssemblyRecordTable").bootstrapTable('resetView', { 
+            height : $(window).height()  - parentHead.height() - navbar.height() - 124
+
+        });
+        $("#todayAssemblyRecordTableWrapp .fixed-table-pagination").css("top",$(".wrapp").height());
+    });
+   
+    //点击查询按钮
+    $("#queryTodayPackingRecord").click(function(){
+      InitTable(WWWROOT+"/disinfectSystem/grid/gridController/getGrid.mhtml");        
+    })
+
+    
+    modelCenter("#discardModel"); //废弃模态框、
+    modelCenter("#discardReason"); //废弃 点是
+    modelCenter("#urgentModel"); //加急模态框
+    modelCenter("#urgent"); //装配记录点击表格加急按钮
+
+   var printAmendtable_columns=[ 
+     {
+       checkbox : true,
+     },
+     {
+       title : "条形码",
+       field : 'barCode',
+       align : 'center',
+       sortable:true //正序,逆序
+     },
+     {
+        title : '器械包',
+        field : 'instrument',
+        align : 'center',
+       sortable:true //正序,逆序
+     },
+     {
+        title : '科室',
+        field : 'deparent',
+        align : 'center',
+        sortable:true //正序,逆序
+     },
+     {
+        title : '配包员',
+        field : 'bagpeo',
+        align : 'center',
+        sortable:true //正序,逆序
+     },
+      {
+        title : '审核人',
+        field : 'auditor',
+        align : 'center',
+        sortable:true //正序,逆序
+     },
+      {
+        title : '包装人',
+        field : 'openBagPeo',
+        align : 'center',
+        sortable:true //正序,逆序
+     }, {
+        title : '清洗时间',
+        field : 'cleanDate',
+        align : 'center',
+        sortable:true //正序,逆序
+     }, {
+        title : '装配时间',
+        field : 'bagDate',
+        align : 'center',
+        sortable:true //正序,逆序
+     }
+     , {
+        title : '包装类型',
+        field : 'bagClass',
+        align : 'center',
+        sortable:true //正序,逆序
+     }
+     , {
+        title : '灭菌程序',
+        field : 'sterilizeProcedure',
+        align : 'center',
+        sortable:true //正序,逆序
+     }
+      , {
+        title : '失效日期',
+        field : 'expiryDate',
+        align : 'center',
+        sortable:true //正序,逆序
+     }
+      , {
+        title : '灭菌炉',
+        field : 'sterilizeBox',
+        align : 'center',
+        sortable:true //正序,逆序
+     }
+      , {
+        title : '炉次',
+        field : 'boxNum',
+        align : 'center',
+        sortable:true //正序,逆序
+     }
+      , {
+        title : '状态',
+        field : 'sterilizeSatatus',
+        align : 'center',
+        sortable:true //正序,逆序
+         }
+
+   ];
+    //今天本组装配记录点击表格每一行出现的弹框表格
+    $("#printAmendtable").bootstrapTable(
+      {  
+          striped : true,// 设置为 true 会有隔行变色效果
+          undefinedText : " ",// 当数据为 undefined 时显示的字符
+          pageNumber : 1,// 如果设置了分页，首页页码
+          data_local : "zh-US",// 表格汉化
+          responseHandler : "",
+          toolbar:'#printAmend',
+          sortable: true,//是否启用排序
+          sortOrder: "desc",//排序方式
+          sortName: 'appTime',//排序字段
+          showColumns: true,//删选列按钮
+          showRefresh: false,//刷新按钮
+          silent: true,  //刷新事件必须设置  
+          //data:printAmendtableData,
+          formatLoadingMessage: function () {  
+            return "请稍等，正在加载中...";  
+          },  
+          queryParams : function(params) {
+              return {
+                  start : params.offset,
+                  limit : params.limit,
+                  keyword : params.search
+              };
+          },
+          onClickRow: function (row) {//点击每一行
+            $("#todayAssemblyRecordModel").modal('show');
+          },
+          idField : "id",
+          columns : printAmendtable_columns 
+    });
+
+    //装配记录点击表格废弃按钮弹框
+    $("#deleteInstrumentBag").click(function(){
+        $('#discardModel').modal('show');
+    })
+
+    //装配记录点击表格修改按钮弹框
+    $("#amendClick").click(function(){
+        $('#amendClickModel').modal('show');
+        $("#amendClickModel .modal-title").text("修改器械包信息");
+    })
+
+    //装配记录点击表格加急按钮弹框
+    $("#urgent").click(function(){
+        $('#urgentModel').modal('show');
+    })
+
+    
+    function selectPull(selId,allData){
+       return $("#"+selId).select2({
+          data:allData,
+          language: "zh-CN",
+          placeholder:'关键词搜素',
+          allowClear:true,
+          minimumInputLength: 1,
+         // maximumSelectionLength:1,
+         /* tags: true,
+          tokenSeparators: [',', ' ']*/
+        })
+
+    }
+    var allBagName = [
+        {"id": 1, text: '专用小手术包' },
+        {"id": 2, text: '小麻醉包' },
+        {"id": 3, text: '小麻醉骨科包'},
+        {"id": 4, text: '大麻醉包' },
+        {"id": 5, text: '小器械包' },
+        {"id": 6, text: '大器械包' },
+        {"id": 7, text: '大器械骨科包'}
+    ]
+    //var data = [{ id: 0, text: 'enhancement' }, { id: 1, text: 'bug' }, { id: 2, text: 'duplicate' }, { id: 3, text: 'invalid' }, { id: 4, text: 'wontfix' }];
+   //var sele = selectPull("instrumentSetSelect",allBagName);//器械包名称
+  selectPull("instrumentSetSelect",allBagName);//器械包名称
+
+    $("#in").on('search',function(){
+       var inputVal = $("#in").val();
+       //触发select2的搜索下拉
+       $("#instrumentSetSelect").select2("weining",$.trim(inputVal));
+    });
+    
+    var t1;
+    $("#in").keydown(function(e){
+
+    		if(e.keyCode == 13){	
+    		   t1=window.setTimeout(search, 500);
+    		   $("#in").focus();
+    		}
+        if ($(this).val() == "" || $(this).val().length <= 1) {
+          $("#instrumentSetSelect").select2("val", " ");
+        }
+    });
+
+    /*$("#in").change(function(e){
+		   var inVal =  $("#in").val();
+		   console.log("inVal",inVal);
+	        if(inVal == ""){
+	        	 var old = $("#instrumentSetSelect").next().find('.select2-selection__choice').text("");
+	        	 $("#instrumentSetSelect").next().find('.select2-selection__choice').attr("title","");
+	        	 $("#instrumentSetSelect").next().find('.select2-selection__choice').remove();
+	        	 $("#instrumentSetSelect").next().find('.select2-selection__choice').children(".select2-selection__clear").remove();
+	           
+            $("#instrumentSetSelect").select2("val", " ");
+          }
+    });*/
+    function search(){
+      $("#in").trigger("search");
+    }
+    
+	$("#instrumentSetSelect").on("select2:select",function(){
+	  var selText = $("#instrumentSetSelect").next().find('.select2-selection__choice').attr("title");
+	  $("#in").val(selText);
+	  t1=window.setTimeout( function(){$("#in").focus()}, 200);
+	    
+	})
+     
+     
+     
+      $("#instrumentSetSelect").on("select2:opening",function(){
+        $("#in").focus();
+     })
+      $("#instrumentSetSelect").on("select2:open",function(){
+        $("#in").focus();
+     })
+    
+    
+    /*$("#setFocus").click(function(){
+    	$("#in").focus();
+    });*/ 
+    
+    //科室
+    /*Mock.mock(
+          'http://mockjsdepartmentame', 
+          {
+            'totalCount': 60,
+              'list|10':[
+                {"id|1-100": 1, text: '骨科1' }
+             ]
+          }
+    );*/
+    $("#departmentsSelect").select2({
+      /* ajax: {
+      url: "http://mockjsdepartmentame",
+      contentType:'application/json;charset=utf-8',
+      dataType: 'json',
+      type: 'POST',
+      delay: 1000,
+      cache: true,
+      data: function (params) {
+        return {
+          ksmc: params.term, // 此时搜索框中的内容
+              page: params.page || 1//当有结果分页时有此参数，指出当前分页
+        };
+      },
+      processResults: function (data, params) {
+              params.page = params.page || 1;
+              return {
+                  results: data.list,
+                  pagination: {
+                      more: (params.page * 10) < data.totalCount
+                  }
+              };
+          },
+          cache: true
+      },*/
+        language: "zh-CN",
+        placeholder:'关键词搜素',
+        allowClear:true,
+        minimumInputLength: 1,
+        maximumSelectionLength:1
+       
+    })
+  
+})//$(function()) end
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+//今天本组装配记录
+/*function todayAssemblyRecordTableload(todayId,tableHead,tableConData){
+  $("#"+todayId).bootstrapTable(
+    {  
+        striped : true,// 设置为 true 会有隔行变色效果
+        undefinedText : " ",// 当数据为 undefined 时显示的字符
+        pagination : true, // 分页
+        pageNumber : 1,// 如果设置了分页，首页页码
+        data_local : "zh-US",// 表格汉化
+        responseHandler : "",
+        search:true,
+        toolbar:'#exportExcel',
+        pageSize : 30,// 如果设置了分页，页面数据条数
+        pageList : [ 10,20,30], // 如果设置了分页，设置可供选择的页面数据条数。设置为All则显示所有记录。
+        paginationPreText: "上一页",
+        paginationNextText: "下一页",
+        paginationFirstText: "首页",
+        paginationLastText: "尾页",
+        height:recoredTableH,
+       // detailView:detailView,//树形菜单
+        sortable: true,//是否启用排序
+        sortOrder: "desc",//排序方式
+        sortName: 'appTime',//排序字段
+        showColumns: true,//删选列按钮
+        showRefresh: false,//刷新按钮
+        silent: true,  //刷新事件必须设置  
+        data:tableConData,
+        formatLoadingMessage: function () {  
+          return "请稍等，正在加载中...";  
+        },  
+        queryParams : function(params) {
+            return {
+                start : params.offset,
+                limit : params.limit,
+                keyword : params.search
+            };
+        },
+        onClickRow: function (row) {//点击每一行
+          $("#todayAssemblyRecordModel").modal('show');
+          $("#todayAssemblyRecordModel .fixed-table-container").css("padding-bottom","40px");
+        },
+        idField : "id",
+        columns : tableHead
+  });
+}*/
+//今天本组装配记录开始时间和结束时间
+function initSelectDate(selectId) {
+  var date = new Date();
+  var Y = date.getFullYear();
+  var M = (date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1) : date.getMonth()+1);
+  var D = (date.getDate() < 10 ? '0'+(date.getDate()) : date.getDate());
+  var todayTime =  Y+"-"+M+"-"+D;
+  var dataMiss =["00", "15", "30", "45"];
+  var optionHtml = "<option value='$optionValue'>$optionText</option>";
+  for (var i = 0; i < 24; i++) {
+    for (var j = 0; j < dataMiss.length; j++) {
+      var temp = "";
+      var todayTimeAll = "";
+      if (i < 10) {
+        temp = "0" + i + ":" + dataMiss[j];
+      
+      } else {
+        temp = i + ":" + dataMiss[j];
+        
+      }
+      todayTimeAll = todayTime+" "+temp;
+      $("#" + selectId).append(optionHtml.replace("$optionValue", todayTimeAll)
+          .replace("$optionText", temp));
+    }
+  }
+  if ("endSelect" == selectId) {
+    $("#endSelect").append("<option value='" + todayTime + " "+ "23:59' selected='selected'>23:59</option>");
+  } 
+}
+initSelectDate("beginSelect");
+initSelectDate("endSelect");