Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r33166 -r33170
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 33166)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 33170)
@@ -442,22 +442,22 @@
 	DWREngine.setAsync(true);
    	
    var	columns =[
-			{header: '科室', dataIndex: 'depart',width: 200}, 
-			{header: '供应商', dataIndex: 'supplierName',width: 150},
-			{header: '器械包', dataIndex: 'tousseName', width: 200,renderer:filterUnderScoreName},
-			{header: '拆包名称', dataIndex: 'splitTousseName',width: 200},
-			{header: '数量', dataIndex: 'amount'},
-			{header: '配包人', dataIndex: 'packer'},
-			{header: ''+reviewViewText+'人', dataIndex: 'reviewer',width: 100,hidden:sstsConfig.hideReviewerField},
-			{header: '包装人', dataIndex: 'wrapper',width: 100,hidden:!sstsConfig.showWrapperField},
-			{header: inspectorName, dataIndex: 'inspector',hidden:!sstsConfig.showInspectorField},
-			{header: '灭菌人', dataIndex: 'sterileUser',hidden:!sstsConfig.showSterileField},
-			{header: '包装类型', dataIndex: 'packageType'},
+			{header: '科室', dataIndex: 'depart',width: 200,sortable:false}, 
+			{header: '供应商', dataIndex: 'supplierName',width: 150,sortable:false},
+			{header: '器械包', dataIndex: 'tousseName', width: 200,renderer:filterUnderScoreName,sortable:false},
+			{header: '拆包名称', dataIndex: 'splitTousseName',width: 200,sortable:false},
+			{header: '数量', dataIndex: 'amount',sortable:false},
+			{header: '配包人', dataIndex: 'packer',sortable:false},
+			{header: ''+reviewViewText+'人', dataIndex: 'reviewer',width: 100,hidden:sstsConfig.hideReviewerField,sortable:false},
+			{header: '包装人', dataIndex: 'wrapper',width: 100,hidden:!sstsConfig.showWrapperField,sortable:false},
+			{header: inspectorName, dataIndex: 'inspector',hidden:!sstsConfig.showInspectorField,sortable:false},
+			{header: '灭菌人', dataIndex: 'sterileUser',hidden:!sstsConfig.showSterileField,sortable:false},
+			{header: '包装类型', dataIndex: 'packageType',sortable:false},
 			{header: '装配时间', dataIndex: 'packTimeStr',width: 150},
-			{header: '灭菌方式', dataIndex: 'sterilingMode',width: 120,hidden:!(sstsConfig.generateProxySterilizationFormFunctionInHistoricalAssemblyRecords && !isFirstRoomPeople)},
-			{header: '已生成代理灭菌单', dataIndex: 'isTran',width: 120,hidden:!(sstsConfig.generateProxySterilizationFormFunctionInHistoricalAssemblyRecords && !isFirstRoomPeople)},
-			{header: '材料汇总', dataIndex: 'foreignMaterialsAmount',width: 200},
-			{header: '医生', dataIndex: 'doctor',width: 100}
+			{header: '灭菌方式', dataIndex: 'sterilingMode',width: 120,hidden:!(sstsConfig.generateProxySterilizationFormFunctionInHistoricalAssemblyRecords && !isFirstRoomPeople),sortable:false},
+			{header: '已生成代理灭菌单', dataIndex: 'isTran',width: 120,hidden:!(sstsConfig.generateProxySterilizationFormFunctionInHistoricalAssemblyRecords && !isFirstRoomPeople),sortable:false},
+			{header: '材料汇总', dataIndex: 'foreignMaterialsAmount',width: 200,sortable:false},
+			{header: '医生', dataIndex: 'doctor',width: 100,sortable:false}
 			]
 	
     var packingRecordStore = Ext4.create('Ext4.data.Store', {
@@ -487,14 +487,16 @@
 		var q_packer = Ext4.getCmp('q_packer').getValue();
 		var startTimeSearch = Ext4.getCmp('startTimeSearch').getRawValue();
     	var endTimeSearch = Ext4.getCmp('endTimeSearch').getRawValue();
+		var direction = Ext4.getCmp('direction').getValue();
     	
 		var params = {
 			tousseName: tousseName,
 			orgUnit: orgUnit,
 			tousseBarcode: barcode,
 			packer: q_packer,
 			startTimeSearch: startTimeSearch,
-			endTimeSearch: endTimeSearch
+			endTimeSearch: endTimeSearch,
+			direction:direction
 		}
 		if(exports){
 			params.taskGroups = taskGroup;
@@ -5799,6 +5801,18 @@
 					}
 			}
 			rePrintBarcodeWinForPacking2(cfg);
+		},
+		sortchange: function (ct, column, direction, eOpts) {
+			var title = column.textEl.getHTML();
+			var dataIndex = column.dataIndex;
+			if (title == "装配时间") {
+				var sortType = Ext4.util.Format.uppercase(direction);//获取排序方式“DESC”或“ASC”
+				var oldDirection = Ext4.getCmp('direction').getValue();
+				if(oldDirection !== sortType){
+					Ext4.getCmp('direction').setValue(sortType);
+					listStore.loadPage(1);
+				}
+			}
 		}
 	},
 	selModel: new Ext4.selection.CheckboxModel()
@@ -5913,6 +5927,10 @@
 					height : 60,
 //					width : 800,
 					items : [{
+						xtype:'hidden',
+						id:'direction',
+						name:'direction'
+					},{
 //						width : 140,
 						columnWidth : 0.2,
 						layout : 'form',