Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/slickWash.js
===================================================================
diff -u -r24884 -r24891
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/slickWash.js	(.../slickWash.js)	(revision 24884)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/slickWash.js	(.../slickWash.js)	(revision 24891)
@@ -155,7 +155,12 @@
 			field : 'handle',
 			id : 'handle',
 			formatter: function(value,row,index,columnDef,dataContext){
-				return "<a  id='bc"+dataContext.barcode+"' onclick='addCleanRowDelete(\""+dataContext.barcode+"\" )'><span class='glyphicon glyphicon-trash'></span></a>";
+				if(dataContext.indent==0){
+						return "<a  id='bc"+dataContext.barcode+"' onclick='addCleanRowDelete(\""+dataContext.barcode+"\" )'><span class='glyphicon glyphicon-trash'></span></a>";
+				}
+				else{
+					return "";
+				}
 			},
 		},
 		{
@@ -307,9 +312,9 @@
 	}
 
 	function TaskNameFormatter(row, cell, value, columnDef, dataContext){
-		//console.log("dc:"+dataContext._collapsed);
+		
 		if(value == null || value == undefined || dataContext === undefined){
-			return "<span class='toggle'></span>";
+			return "";
 		}
 		value = value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 		var spacer = "<span style='display:inline-block;height:1px;width:" + (15 * dataContext["indent"]) + "px'></span>";
@@ -326,11 +331,17 @@
 // 			console.log(value);
 // 			return spacer + " <span class='toggle collapse'>+</span>" + value;
 // 		}
-			if(dataContext._collapsed==true){
-				return spacer + " <span class='toggle'>-</span>" + value;
+			console.log("value:"+value+";"+"indent:"+dataContext.indent);
+			if(dataContext.indent==0){
+				if(dataContext._collapsed==true){
+					return spacer + " <span class='toggle'></span>" + value;
+				}
+				else{
+					return spacer + " <span class='toggle collapse'></span>" + value;
+				}
 			}
 			else{
-				return spacer + " <span class='toggle collapse'>+</span>" + value;
+				return value;
 			}
 		
 	}
@@ -521,8 +532,9 @@
 					k["indent"] = 1;
 					k["parent"] = parentId;
 					
-					k["name"]=childrens[j].tousseName;
+					k["name"]=childrens[j].name;
 					k["amount"]=childrens[j].amount;
+					
 					k["recyclingTime"]=childrens[j].recyclingTime;
 					k["recyclingDept"]=childrens[j].recyclingDept;
 					tempId ++;