Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r32384 -r32403
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 32384)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 32403)
@@ -879,9 +879,9 @@
 	basketWidth += 72;
 }
 
-function buildColumnTreeColumns(treeId){
-	var columns = [
-		{
+function getGridColumns(headerName,treeId){
+	if(headerName == '物品名称'){
+		var obj = {
 			header: '物品名称',
 			minWidth:200,
 		    sortable: true,
@@ -938,7 +938,10 @@
 					return resultName;
 				}
 		    }
-		},{
+		}
+		return obj;
+	}else if(headerName == '数量'){
+		var obj = {
 			header: '数量',
 			width : 50,
 			align:'center',
@@ -993,7 +996,10 @@
 		            }  
 		        }  
 		    }
-		},{
+		}
+		return obj;
+	}else if(headerName == '操作'){
+		var obj = {
 			header: '操作',
 			width : 120,
 			align:'center',
@@ -1055,7 +1061,10 @@
 				str += '</div>';
 		        return str;
 			}
-		},{
+		}
+		return obj;
+	}else if(headerName == '加急数量'){
+		var obj = {
 			header: '加急数量',
 			width : 80,
 			align:'center',
@@ -1084,7 +1093,10 @@
 		    		return null;
 		    	}
 		    }
-		},{
+		}
+		return obj;
+	}else if(headerName == '加急级别'){
+		var obj = {
 			header: '加急级别',
 			width: 80,
 			align: 'center',
@@ -1114,7 +1126,10 @@
 					return null;
 				}
 			}
-		},{
+		}
+		return obj;
+	}else if(headerName == '清洗篮筐'){
+		var obj = {
 			header: '清洗篮筐',
 			width : basketWidth,
 			align:'center',
@@ -1143,48 +1158,92 @@
 					return value;
 				}
 		      } 
-		},{
+		}
+		return obj;
+	}else if(headerName == '申请科室'){
+		var obj = {
 			header: '申请科室',
 			width : 80,
 			align:'center',
 		    sortable: true,
 		    dataIndex: 'department'
-		},{
+		}
+		return obj;
+	}else if(headerName == '清洗时间'){
+		var obj = {
 			header: '清洗时间',
 			width : 110,
 			align:'center',
 		    sortable: true,
 		    dataIndex: 'washTime'
-		},{
+		}
+		return obj;
+	}else if(headerName == '回收人'){
+		var obj = {
 			header: '回收人',
 			width : 80,
 			align:'center',
 		    sortable: true,
 			hidden:!sstsConfig.showRecyclingPeopleColumnInPackingTasksList,
 		    dataIndex: 'recyclingUser'
-		},{
+		}
+		return obj;
+	}else if(headerName == '回收时间'){
+		var obj = {
 			header: '回收时间',
 			width : 110,
 			align:'center',
 		    sortable: true,
 		    dataIndex: 'dateTime'
-		},{
+		}
+		return obj;
+	}else if(headerName == '状态'){
+		var obj = {
 			header: '状态',
 			width : 60,
 			align:'center',
 		    sortable: true,
 		    dataIndex: 'status'
 		}
-	];
-	if(sstsConfig.enablePackingSerialNum){
-		columns.splice(2, 0, {
+		return obj;
+	}else if(headerName == '序号'){
+		var obj = {
 			header: '序号',
 			width : 40,
 			align:'center',
 		    sortable: true,
+			hidden:!sstsConfig.enablePackingSerialNu,
 		    dataIndex: 'serialNumber'
-		});
+		}
+		return obj;
 	}
+}
+
+function buildColumnTreeColumns(treeId){
+	var columns = [];
+	if(sstsConfig.columnConfigOfpackingTaskList && sstsConfig.columnConfigOfpackingTaskList.length > 0){
+		var columnConfigOfpackingTaskList = sstsConfig.columnConfigOfpackingTaskList;
+		for(var i=0;i<columnConfigOfpackingTaskList.length;i++){
+			if(getGridColumns(columnConfigOfpackingTaskList[i],treeId)){
+				columns.push(getGridColumns(columnConfigOfpackingTaskList[i],treeId));
+			}
+		}
+	}else {
+		columns = [
+			getGridColumns('物品名称',treeId),
+			getGridColumns('数量',treeId),
+			getGridColumns('操作',treeId),
+			getGridColumns('序号',treeId),
+			getGridColumns('加急数量',treeId),
+			getGridColumns('加急级别',treeId),
+			getGridColumns('清洗篮筐',treeId),
+			getGridColumns('申请科室',treeId),
+			getGridColumns('清洗时间',treeId),
+			getGridColumns('回收人',treeId),
+			getGridColumns('回收时间',treeId),
+			getGridColumns('状态',treeId)
+		];
+	}
 	return columns;
 }
 
@@ -5953,24 +6012,31 @@
 	if(isHasSplitForeignTousseBtn){
 		handleTdWidth += 40;
 	}
-	grid.headerCt.getGridColumns()[2].setWidth(handleTdWidth);
-	//设置物品名称列的宽度
-	if(tousseNameMaxLenArray.length > 0){
-		var tousseNameMaxLenght = Math.max.apply(null,tousseNameMaxLenArray);
-		grid.headerCt.getGridColumns()[0].setWidth(tousseNameMaxLenght+90);
-	}
-	//设置清洗篮筐列最大的宽度
-	if(basketNameMaxLenArray.length > 0){
-		var basketNameMaxLenght = Math.max.apply(null,basketNameMaxLenArray);
-		if(basketNameMaxLenght !== 0){
-			var index = 3;
-			if(sstsConfig.enableUrgentFunction){
-				index = 5;
+
+	var gridColumns = grid.headerCt.getGridColumns();
+	for(var i=0;i<gridColumns.length;i++){
+		if(gridColumns[i].text == '物品名称'){
+			//设置物品名称列的宽度
+			if(tousseNameMaxLenArray.length > 0){
+				var tousseNameMaxLenght = Math.max.apply(null,tousseNameMaxLenArray);
+				gridColumns[i].setWidth(tousseNameMaxLenght+90);
 			}
-			if(basketNameMaxLenght < 216){
-				grid.headerCt.getGridColumns()[index].setWidth(basketNameMaxLenght+30);
-			}else {
-				grid.headerCt.getGridColumns()[index].setWidth(210);
+		}
+		if(gridColumns[i].text == '操作'){
+			//设置操作列最大的宽度
+			gridColumns[i].setWidth(handleTdWidth);
+		}
+		if(gridColumns[i].text == '清洗篮筐'){
+			//设置清洗篮筐列最大的宽度
+			if(basketNameMaxLenArray.length > 0){
+				var basketNameMaxLenght = Math.max.apply(null,basketNameMaxLenArray);
+				if(basketNameMaxLenght !== 0){
+					if(basketNameMaxLenght < 216){
+						gridColumns[i].setWidth(basketNameMaxLenght+30);
+					}else {
+						gridColumns[i].setWidth(210);
+					}
+				}
 			}
 		}
 	}