Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagementSlick3.js
===================================================================
diff -u -r25004 -r25012
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagementSlick3.js	(.../assemblyManagementSlick3.js)	(revision 25004)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagementSlick3.js	(.../assemblyManagementSlick3.js)	(revision 25012)
@@ -1379,7 +1379,6 @@
     	data: {"taskGroup":taskGroup}, 
     	success:function(data){
     		footTableLastestSelects = [];
-
     		var datas =data.data;
     		loadData = [];
     		var filterFootTable = new Slick.Controls.ColumnPicker(visibleColumns, grid, options);
@@ -1459,12 +1458,6 @@
 
     	}else if(dataView.getItem(args.row).parent != null){
     		var childData = dataView.getItem(args.row);
-    		//$("#sterilingType").val(childData.sterilingMethod);
-	        //$("#sterilingType").change();
-
-	        //sterilizerNameRequest();//灭菌炉
-       		//packageTypeRequest();//包裝類型
-       		//$("#packageType").val(childData.packageType);
        		//子级材料清单
        		requestMaterialsDataChild(childData.tousseName,childData.tousseID);
 
@@ -1532,47 +1525,95 @@
 	      
 	    }
     });
-	
+/*	grid.onMouseEnter.subscribe(function (e, args){
+		return "height-bg";
+		grid.addCellCssStyles("height-bg",1);
+
+		console.log("111");
+		console.log("e",e);
+		console.log("args",args);
+	})*/
  	//修改样式
  	grid.onBeforeAppendCell.subscribe(function (e, args) {
  		if (grid.getColumns()[args.cell].id !== 'tousseName') return null;
  		var argData = dataView.getItem(args.row);
-	 	if(argData.parent != null){
-	 		if(argData.status == '待装配'){
-		        var supplent = true;
+	 	if(argData.parent != null){//父级
+	 		//过期
+	 		if (argData.isTimeout) {
+	 		 	if(argData.status == '待装配'){
+			        var supplent = true;
 			        for(var m = 0;m< argData.errors.length; m++) {
 			            if(errorTypeAdd !=argData.errors[m].errorType && ((argData.errors[m].amount - argData.errors[m].additionalAmount) != 0)) {
 			                supplent = false;
 			            }
 			        }
 			        if(!supplent){
-			        	return "tousse-name-color";
+			        	return "out-of-data";
 			        }
 
 			        if(argData.damages.length > 0){
-			            return "tousse-name-color";
+			            return "out-of-data";
 			        }
-
-			}
-	 	}else if(argData.parent == null){
-	 		var children = argData.children;
-	 		for(var i=0;i<children.length;i++){
-	 			if(children[i].status == '待装配'){
-		        var supplent = true;
-			        for(var m = 0;m< children[i].errors.length; m++) {
-			            if(errorTypeAdd !=children[i].errors[m].errorType && ((children[i].errors[m].amount - children[i].errors[m].additionalAmount) != 0)) {
+				}
+				return "out-of-data-default";
+	 		}else{
+	 			if(argData.status == '待装配'){
+			        var supplent = true;
+			        for(var m = 0;m< argData.errors.length; m++) {
+			            if(errorTypeAdd !=argData.errors[m].errorType && ((argData.errors[m].amount - argData.errors[m].additionalAmount) != 0)) {
 			                supplent = false;
 			            }
 			        }
 			        if(!supplent){
 			        	return "tousse-name-color";
 			        }
 
-			        if(children[i].damages.length > 0){
+			        if(argData.damages.length > 0){
 			            return "tousse-name-color";
 			        }
+				}
+				return "tousse-name-defaultColor";
+	 		}
+	 	}else if(argData.parent == null){//子级
+	 		var children = argData.children;
+	 		for(var i=0;i<children.length;i++){
+	 			//过期
+	 			if (argData.isTimeout) {
+		 			if(children[i].status == '待装配'){
+			        	var supplent = true;
+				        for(var m = 0;m< children[i].errors.length; m++) {
+				            if(errorTypeAdd !=children[i].errors[m].errorType && ((children[i].errors[m].amount - children[i].errors[m].additionalAmount) != 0)) {
+				                supplent = false;
+				            }
+				        }
+				        if(!supplent){
+				        	return "out-of-data";
+				        }
 
+				        if(children[i].damages.length > 0){
+				            return "out-of-data";
+				        }
+				    }
+				    return "out-of-data-default";				   
+			    }else{
+			    	if(children[i].status == '待装配'){
+			        	var supplent = true;
+				        for(var m = 0;m< children[i].errors.length; m++) {
+				            if(errorTypeAdd !=children[i].errors[m].errorType && ((children[i].errors[m].amount - children[i].errors[m].additionalAmount) != 0)) {
+				                supplent = false;
+				            }
+				        }
+				        if(!supplent){
+				        	return "tousse-name-color";
+				        }
+
+				        if(children[i].damages.length > 0){
+				            return "tousse-name-color";
+				        }
+				    }
+				    return "tousse-name-defaultColor";
 			    }
+			   
 	 		}
 	 	}
 	 	return "tousse-name-defaultColor";
@@ -1664,6 +1705,8 @@
 		d["sterilingMethod"]=data[i].sterilingMethod;
 		d["packageType"]=data[i].packageType;
 		d["tousseID"]=data[i].tousseID;
+		d["isTimeout"]=data[i].isTimeout;
+		d["_collapsed"] = true;
 		tempId ++;
 
 		var childrens = data[i].children;
@@ -1691,6 +1734,7 @@
 				k["packageType"]=childrens[j].packageType;
 				k["tousseID"]=childrens[j].tousseID;
 				k["taskId"]=childrens[j].taskId;
+				k["isTimeout"]=childrens[j].isTimeout;
 
 				tempId ++;
 			}
@@ -2595,3 +2639,13 @@
 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");//打印回收清单结束时间
+/*window.onload=function(){
+	alert();
+	var $collapseArray = $("span.collapse");
+	for (var i = $collapseArray.length - 1; i >= 0; i--) {
+	  $($collapseArray[i]).trigger("click");
+	}
+}
+function init(){
+	
+}*/
\ No newline at end of file
Index: ssts-web/src/main/webapp/dx-disinfectsystem/css/index/index.css
===================================================================
diff -u -r24987 -r25012
--- ssts-web/src/main/webapp/dx-disinfectsystem/css/index/index.css	(.../index.css)	(revision 24987)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/css/index/index.css	(.../index.css)	(revision 25012)
@@ -136,7 +136,7 @@
     float: left;
     margin-right: 70px;
     height:40px;
-    line-height:20px;
+    line-height: 43px;
 }
 .head-index-user span{
     width: 31px;
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/todayAssemblyManagementRecord2.js
===================================================================
diff -u -r24995 -r25012
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/todayAssemblyManagementRecord2.js	(.../todayAssemblyManagementRecord2.js)	(revision 24995)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/todayAssemblyManagementRecord2.js	(.../todayAssemblyManagementRecord2.js)	(revision 25012)
@@ -243,7 +243,7 @@
     "maxValue": endSelect, 
     "operator": "BETWEEN"
   }
-  //setFilters.push(packTime);
+  setFilters.push(packTime);
   
 
   //默认传值