Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r30690 -r30760
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 30690)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 30760)
@@ -1017,59 +1017,6 @@
 		        return str;
 			}
 		},{
-			header: '清洗篮筐',
-			width : basketWidth,
-			align:'center',
-		    sortable: true,
-			dataIndex: 'basketName',
-		    renderer:function (value, metaData, record, rowIdx, colIdx, store){
-				var html = value;
-				var classifiedItemAmountInfo = record.get('classifiedItemAmountInfo') || '';
-				if(classifiedItemAmountInfo !== '' && record.get('tousseType') == '外来器械包'){
-					html = classifiedItemAmountInfo;
-				}
-				metaData.style='white-space: normal !important;';
-				metaData.tdAttr = 'data-qtip="' + Ext4.String.htmlEncode(html) + '"'; //在tips中展示列的全部内容.  
-				if(value !== '' && record.get('basketBarcode') !== '' && sstsConfig.showBarcodeOfWashBasketInPackingTaskList){
-					if(value.split(';').length > 1){
-						var resultValue = []
-						var basketBarcodes = record.get('basketBarcode');
-						for(var i=0;i<value.split(';').length;i++){
-							resultValue[i] =  value.split(';')[i] + '('+basketBarcodes.split(';')[i]+')';  
-						}
-						return resultValue.join(';');
-					}else {
-						return value+'('+record.get('basketBarcode')+')';  
-					}
-				}else {
-					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 : 80,
 			align:'center',
@@ -1128,6 +1075,59 @@
 					return null;
 				}
 			}
+		},{
+			header: '清洗篮筐',
+			width : basketWidth,
+			align:'center',
+		    sortable: true,
+			dataIndex: 'basketName',
+		    renderer:function (value, metaData, record, rowIdx, colIdx, store){
+				var html = value;
+				var classifiedItemAmountInfo = record.get('classifiedItemAmountInfo') || '';
+				if(classifiedItemAmountInfo !== '' && record.get('tousseType') == '外来器械包'){
+					html = classifiedItemAmountInfo;
+				}
+				metaData.style='white-space: normal !important;';
+				metaData.tdAttr = 'data-qtip="' + Ext4.String.htmlEncode(html) + '"'; //在tips中展示列的全部内容.  
+				if(value !== '' && record.get('basketBarcode') !== '' && sstsConfig.showBarcodeOfWashBasketInPackingTaskList){
+					if(value.split(';').length > 1){
+						var resultValue = []
+						var basketBarcodes = record.get('basketBarcode');
+						for(var i=0;i<value.split(';').length;i++){
+							resultValue[i] =  value.split(';')[i] + '('+basketBarcodes.split(';')[i]+')';  
+						}
+						return resultValue.join(';');
+					}else {
+						return value+'('+record.get('basketBarcode')+')';  
+					}
+				}else {
+					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'
 		}
 	];
 	if(sstsConfig.enablePackingSerialNum){
@@ -4623,10 +4623,14 @@
 			if(basketNameMaxLenArray.length > 0){
 				var basketNameMaxLenght = Math.max.apply(null,basketNameMaxLenArray);
 				if(basketNameMaxLenght !== 0){
+					var index = 3;
+					if(sstsConfig.enableUrgentFunction){
+						index = 5;
+					}
 					if(basketNameMaxLenght < 216){
-						basketColumnTreeGrid.headerCt.getGridColumns()[3].setWidth(basketNameMaxLenght+30);
+						basketColumnTreeGrid.headerCt.getGridColumns()[index].setWidth(basketNameMaxLenght+30);
 					}else {
-						basketColumnTreeGrid.headerCt.getGridColumns()[3].setWidth(210);
+						basketColumnTreeGrid.headerCt.getGridColumns()[index].setWidth(210);
 					}
 				}
 			}
@@ -4766,10 +4770,14 @@
 			if(basketNameMaxLenArray.length > 0){
 				var basketNameMaxLenght = Math.max.apply(null,basketNameMaxLenArray);
 				if(basketNameMaxLenght !== 0){
+					var index = 3;
+					if(sstsConfig.enableUrgentFunction){
+						index = 5;
+					}
 					if(basketNameMaxLenght < 216){
-						this.headerCt.getGridColumns()[3].setWidth(basketNameMaxLenght+30);
+						this.headerCt.getGridColumns()[index].setWidth(basketNameMaxLenght+30);
 					}else {
-						this.headerCt.getGridColumns()[3].setWidth(210);
+						this.headerCt.getGridColumns()[index].setWidth(210);
 					}
 				}
 			}
@@ -4996,10 +5004,14 @@
 				if(basketNameMaxLenArray.length > 0){
 					var basketNameMaxLenght = Math.max.apply(null,basketNameMaxLenArray);
 					if(basketNameMaxLenght !== 0){
+						var index = 3;
+						if(sstsConfig.enableUrgentFunction){
+							index = 5;
+						}
 						if(basketNameMaxLenght < 216){
-							waitPackingTreeGrid.headerCt.getGridColumns()[3].setWidth(basketNameMaxLenght+30);
+							waitPackingTreeGrid.headerCt.getGridColumns()[index].setWidth(basketNameMaxLenght+30);
 						}else {
-							waitPackingTreeGrid.headerCt.getGridColumns()[3].setWidth(210);
+							waitPackingTreeGrid.headerCt.getGridColumns()[index].setWidth(210);
 						}
 					}
 				}