Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r28138 -r28139
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 28138)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 28139)
@@ -795,58 +795,58 @@
 	});
 
 }
-
-Ext4.define('cModel',{
-	extend : 'Ext4.data.Model',
-	idProperty: 'nodeId',
-	fields: [
-	{name : 'taskId'},
-	{name : 'tousseName'},
-	{name : 'tousseID'},
-	{name : 'invoicePlanId'},
-	{name : 'unPackingAmount'},
-	{name : 'amount'},
-	{name : 'urgentAmount'},
-	{name : 'tousseType'},
-	{name : 'packageType'},
-	{name : 'packageSize'},
-	{name : 'sterilingMethod'},
-	{name : 'washTime'},
-	{name : 'basketName'},
-	{name : 'basketBarcode'},
-	{name : 'status'},
-	{name : 'dateTime'},
-	{name : 'errors'},
-	{name : 'damages'},
-	{name : 'supplierName'},
-	{name : 'taskType'},
-	{name : 'department'},
-	{name : 'isTraceable'},
-	{name : 'isPrint'},
-	{name : 'isReview'},
-	{name : 'replenishMaterils'},
-	{name : 'haveIDCard'},
-	{name : 'uuid_vedioNames'},
-	{name : 'isTimeout'},
-	{name : 'allowModifyPackageType'},
-	{name : 'errorRemark'},
-	{name : 'recyclingItemRemark'},
-	{name : 'damageRemark'},
-	{name : 'urgentLevel'},
-	{name : 'idCardBarcode'},
-	{name : 'customSplitBasketAmount'},
-	{name : 'serialNumber'},
-	{name : 'cleaned'},
-	{name : 'note'},
-	{name : 'urgentLevelObj'},
-	{name : 'colorCode'}
+
+Ext4.define('cModel',{
+	extend : 'Ext4.data.Model',
+	idProperty: 'nodeId',
+	fields: [
+	{name : 'taskId'},
+	{name : 'tousseName'},
+	{name : 'tousseID'},
+	{name : 'invoicePlanId'},
+	{name : 'unPackingAmount'},
+	{name : 'amount'},
+	{name : 'urgentAmount'},
+	{name : 'tousseType'},
+	{name : 'packageType'},
+	{name : 'packageSize'},
+	{name : 'sterilingMethod'},
+	{name : 'washTime'},
+	{name : 'basketName'},
+	{name : 'basketBarcode'},
+	{name : 'status'},
+	{name : 'dateTime'},
+	{name : 'errors'},
+	{name : 'damages'},
+	{name : 'supplierName'},
+	{name : 'taskType'},
+	{name : 'department'},
+	{name : 'isTraceable'},
+	{name : 'isPrint'},
+	{name : 'isReview'},
+	{name : 'replenishMaterils'},
+	{name : 'haveIDCard'},
+	{name : 'uuid_vedioNames'},
+	{name : 'isTimeout'},
+	{name : 'allowModifyPackageType'},
+	{name : 'errorRemark'},
+	{name : 'recyclingItemRemark'},
+	{name : 'damageRemark'},
+	{name : 'urgentLevel'},
+	{name : 'idCardBarcode'},
+	{name : 'customSplitBasketAmount'},
+	{name : 'serialNumber'},
+	{name : 'cleaned'},
+	{name : 'note'},
+	{name : 'urgentLevelObj'},
+	{name : 'colorCode'}
 ]});
 
 function buildColumnTreeColumns(treeId){
 	var columns = [
 		{
 			header: '物品名称',
-			width : 250,
+			width : 160,
 		    sortable: true,
 		    xtype : 'treecolumn',
 		    dataIndex: 'tousseName',
@@ -916,7 +916,7 @@
 		    }
 		},{
 			header: '加急数量',
-			width : 60,
+			width : 80,
 			align:'center',
 		    sortable: true,
 		    dataIndex: 'urgentAmount',
@@ -945,7 +945,7 @@
 		    }
 		},{
 			header: '加急级别',
-			width: 60,
+			width: 80,
 			align: 'center',
 			sortable: true,
 			hidden:!sstsConfig.enableUrgentFunction,
@@ -975,7 +975,7 @@
 			}
 		},{
 			header: '清洗篮筐',
-			width : 110,
+			width : 80,
 			align:'center',
 		    sortable: true,
 		    dataIndex: 'basketName',
@@ -984,6 +984,30 @@
 		        return value;  
 		      } 
 		},{
+			header: '申请科室',
+			width : 80,
+			align:'center',
+		    sortable: true,
+		    dataIndex: 'department'
+		},{
+			header: '清洗时间',
+			width : 110,
+			align:'center',
+		    sortable: true,
+		    dataIndex: 'washTime'
+		},{
+			header: '状态',
+			width : 60,
+			align:'center',
+		    sortable: true,
+		    dataIndex: 'status'
+		},{
+			header: '回收时间',
+			width : 110,
+			align:'center',
+		    sortable: true,
+		    dataIndex: 'dateTime'
+		},{
 			header: '操作',
 			width : 120,
 			align:'center',
@@ -1037,30 +1061,6 @@
 				str += '</div>';
 		        return str;
 			}
-		},{
-			header: '申请科室',
-			width : 105,
-			align:'center',
-		    sortable: true,
-		    dataIndex: 'department'
-		},{
-			header: '清洗时间',
-			width : 105,
-			align:'center',
-		    sortable: true,
-		    dataIndex: 'washTime'
-		},{
-			header: '状态',
-			width : 60,
-			align:'center',
-		    sortable: true,
-		    dataIndex: 'status'
-		},{
-			header: '回收时间',
-			width : 105,
-			align:'center',
-		    sortable: true,
-		    dataIndex: 'dateTime'
 		}
 	];
 	if(sstsConfig.enablePackingSerialNum){
@@ -2500,62 +2500,62 @@
     }
 } */];
 
-var basketStore = new Ext4.data.TreeStore({
-     model: cModel,
-     proxy: {
-         type: 'memory',
-         reader : {
-			  type : 'json'
-		   }
-     },
-     listeners : {
-         beforeload : function(store, operation) {  
-             var params = {//参数  
-             	taskGroup : taskGroup
-             };
-             Ext4.apply(store.proxy.extraParams, params);  
-         }  
-     },
-     folderSort: true
- });
-var waitPackingTaskStore = new Ext4.data.TreeStore({
-    model: cModel,
-    proxy: {
-        type: 'ajax',
-        url: WWWROOT + '/disinfectSystem/packingAction!loadWaitPackingTaskJson.do'
-    },
-    listeners : {
-        beforeload : function(store, operation) {  
-            var params = {//参数  
-            	taskGroup : taskGroup 
-            };
-            Ext4.apply(store.proxy.extraParams, params);  
-        },
-        load : function(treeStore, node, records, successful, eOpts){
-        	Ext4.Ajax.request({
-    			url :  WWWROOT + '/system/timeoutAction!getTimeoutSetting.do',
-    			params : {procedure : 'washToPacking'},
-    			success : function(response, options) {
-    				var result = Ext4.decode(response.responseText);
-    				if(result.success && result.showMessageBox){
-    					var timeoutCount = 0;
-                		for(var i = 0; i < records.length;++i){
-                			for(var j = 0; j < records[i].data.children.length;++j){
-                				var task = records[i].data.children[j];
-                    			if(task.isTimeout){
-                    				timeoutCount++;
-                    			}
-                			}
-                		}
-                		if(timeoutCount > 0){
-                			showResult('有'+timeoutCount+'个超时未装配的装配任务,请及时处理红色标注的装配任务' , null , sstsConfig.messagePauseTimeOnPackingPage);
-                		}
-    				}
-    			}
-    		});
-        }
-    },
-    folderSort: true
+var basketStore = new Ext4.data.TreeStore({
+     model: cModel,
+     proxy: {
+         type: 'memory',
+         reader : {
+			  type : 'json'
+		   }
+     },
+     listeners : {
+         beforeload : function(store, operation) {  
+             var params = {//参数  
+             	taskGroup : taskGroup
+             };
+             Ext4.apply(store.proxy.extraParams, params);  
+         }  
+     },
+     folderSort: true
+ });
+var waitPackingTaskStore = new Ext4.data.TreeStore({
+    model: cModel,
+    proxy: {
+        type: 'ajax',
+        url: WWWROOT + '/disinfectSystem/packingAction!loadWaitPackingTaskJson.do'
+    },
+    listeners : {
+        beforeload : function(store, operation) {  
+            var params = {//参数  
+            	taskGroup : taskGroup 
+            };
+            Ext4.apply(store.proxy.extraParams, params);  
+        },
+        load : function(treeStore, node, records, successful, eOpts){
+        	Ext4.Ajax.request({
+    			url :  WWWROOT + '/system/timeoutAction!getTimeoutSetting.do',
+    			params : {procedure : 'washToPacking'},
+    			success : function(response, options) {
+    				var result = Ext4.decode(response.responseText);
+    				if(result.success && result.showMessageBox){
+    					var timeoutCount = 0;
+                		for(var i = 0; i < records.length;++i){
+                			for(var j = 0; j < records[i].data.children.length;++j){
+                				var task = records[i].data.children[j];
+                    			if(task.isTimeout){
+                    				timeoutCount++;
+                    			}
+                			}
+                		}
+                		if(timeoutCount > 0){
+                			showResult('有'+timeoutCount+'个超时未装配的装配任务,请及时处理红色标注的装配任务' , null , sstsConfig.messagePauseTimeOnPackingPage);
+                		}
+    				}
+    			}
+    		});
+        }
+    },
+    folderSort: true
 })
 function getErrorOrDamageRemark(type,taskId){
 	function findNode(rootNode,taskId){