Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/slickWash.js
===================================================================
diff -u -r24934 -r24937
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/slickWash.js	(.../slickWash.js)	(revision 24934)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/slickWash.js	(.../slickWash.js)	(revision 24937)
@@ -359,10 +359,10 @@
 		var idx = dataView.getIdxById(dataContext.id);
 		if(dataContext.indent==0){
 			if(dataContext._collapsed==true){
-				return spacer + " <span class='toggle collapse'></span><span class='glyphicon glyphicon-paste'></span>" + value;
+				return spacer + " <span class='toggle'></span><span class='glyphicon glyphicon-paste'></span>" + value;
 			}
 			else{
-				return spacer + " <span class='toggle'></span><span class='glyphicon glyphicon-paste'></span>" + value;
+				return spacer + " <span class='toggle collapse'></span><span class='glyphicon glyphicon-paste'></span>" + value;
 			}
 		}
 		else{
@@ -373,7 +373,8 @@
 		if(item.parent != null){
 			var parent = loadData[item.parent];
 			while(parent){
-				if(parent._collapsed){
+				//初始渲染父子表时，若存在collpased则为打开子表，反之为关闭
+				if(!parent._collapsed){
 					return false;
 				}
 				parent = data[parent.parent];
@@ -417,7 +418,6 @@
 				cssClass: "slick-cell-checkboxsel"
 			});
 			cd.unshift(checkboxSelector.getColumnDefinition());
-			//
 			mainViewGrid.setColumns(cd);
 		});
 	}
@@ -465,7 +465,6 @@
 					}
 				}
 				
-				
 				//头部列筛选
 				var columnpicker = new Slick.Controls.ColumnPicker(mainTableColumns, mainViewGrid, mainViewOptions);
 				//复选框
@@ -651,7 +650,6 @@
 			d["containerName"] = updateBasketData[i].containerName;
 			d["amount"] = updateBasketData[i].amount;
 			d["containerBarcode"] = updateBasketData[i].containerBarcode;
-			// d["handle"] = addBasketData.handle;
 			d["personInCharge"] = updateBasketData[i].personInCharge; 
 			d["items"]=updateBasketData[i].items;
 			tempId ++;
@@ -665,7 +663,6 @@
 					
 					k["containerName"]=childrens[j].name;
 					k["amount"]=childrens[j].amount;
-					
 					k["recyclingTime"]=childrens[j].recyclingTime;
 					k["recyclingDept"]=childrens[j].recyclingDept;
 					tempId ++;
@@ -843,7 +840,6 @@
 					endDateStr 							:$("#addCleanOrgWashEndTime").val(),	
 					id :0,
 					materialData: "[]",
-					//materialData:		$('#addCleanGetCodeArr').val(),
 					operator 								:$("#addCleanOperator").val(),
 					personInCharge:null,
 					personInChargeCode:null,