Index: ssts-web/src/main/webapp/forgon4/ext-4.2.5/ux/grid/filter/DateFilter.js
===================================================================
diff -u -r17181 -r41641
--- ssts-web/src/main/webapp/forgon4/ext-4.2.5/ux/grid/filter/DateFilter.js	(.../DateFilter.js)	(revision 17181)
+++ ssts-web/src/main/webapp/forgon4/ext-4.2.5/ux/grid/filter/DateFilter.js	(.../DateFilter.js)	(revision 41641)
@@ -177,15 +177,18 @@
             field = this.fields[picker.itemId];
 
         field.setChecked(true);
-
         if (field == fields.on) {
             fields.before.setChecked(false, true);
             fields.after.setChecked(false, true);
         } else {
-            fields.on.setChecked(false, true);
-            if (field == fields.after && this.getFieldValue('before') < date) {
+            if(fields.on){
+                 fields.on.setChecked(false, true);
+            }
+            if (field == fields.after) {
+                this.setFieldValue('before', null);
                 fields.before.setChecked(false, true);
-            } else if (field == fields.before && this.getFieldValue('after') > date) {
+            } else if (field == fields.before) {
+                this.setFieldValue('after', null);
                 fields.after.setChecked(false, true);
             }
         }
Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r41608 -r41641
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 41608)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 41641)
@@ -1965,13 +1965,13 @@
 			{ name: 'packageType' },
 			{ name: 'packageSize' },
 			{ name: 'sterilingMethod' },
-			{ name: 'washTime' },
+			{ name: 'washTime', type: 'date'},
 			{ name: 'basketName' },
 			{ name: 'expectUseTime' },
 			{ name: 'urgentAdditionalInfo' },
 			{ name: 'basketBarcode' },
 			{ name: 'status' },
-			{ name: 'dateTime' },
+			{ name: 'dateTime', type: 'date'},
 			{ name: 'recyclingUser' },
 			{ name: 'errors' },
 			{ name: 'damages' },
@@ -2400,7 +2400,14 @@
 				width: 110,
 				align: 'center',
 				sortable: true,
-				dataIndex: 'washTime'
+				dataIndex: 'washTime',
+				renderer: Ext.util.Format.dateRenderer('Y-m-d h:m'),
+				filter: {
+					type: 'date',
+					beforeText: '之前', 
+    				afterText: '之后',  
+					menuItems: ['before', 'after']
+				}
 			}
 			return obj;
 		} else if (headerName == '回收人') {
@@ -2419,7 +2426,14 @@
 				width: 110,
 				align: 'center',
 				sortable: true,
-				dataIndex: 'dateTime'
+				dataIndex: 'dateTime',
+				renderer: Ext.util.Format.dateRenderer('Y-m-d h:m'),
+				filter: {
+					type: 'date',
+					beforeText: '之前', 
+    				afterText: '之后',  
+					menuItems: ['before', 'after']
+				}
 			}
 			return obj;
 		} else if (headerName == '状态') {
@@ -2449,9 +2463,15 @@
 		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));
+				var name = '';
+				if(typeof columnConfigOfpackingTaskList[i] == 'string'){
+					name = columnConfigOfpackingTaskList[i];
+				}else {
+					name = columnConfigOfpackingTaskList[i].name;
 				}
+				if (getGridColumns(name, treeId)) {
+					columns.push(getGridColumns(name, treeId));
+				}
 			}
 		} else {
 			columns = [
@@ -2475,6 +2495,13 @@
 		return columns;
 	}
 
+	Ext4.require([
+		'Ext.data.*',
+		'Ext.grid.*',
+		'Ext.tree.*',
+		'Ext.ux.grid.FiltersFeature'
+	]);
+
 	Ext4.define('columnTreeGrid', {
 		extend: 'Ext4.tree.Panel',
 		xtype: 'tree-grid',
@@ -5014,8 +5041,24 @@
 					node: 'root',
 					pageIndex: pageNow,
 					tousseOrDepart: tousseOrDepart,
-					pageSize: waitPackingPageSize
+					pageSize: waitPackingPageSize,
+					filterWashTime:'',
+					isBeforeModeForWashTime:'',
+					filterRecyclingTime:'',
+					isBeforeModeForRecyclingTime:''
 				};
+				if(Ext4.getCmp('filterWashTime') && Ext4.getCmp('filterWashTime').getValue() !== ''){
+					params.filterWashTime = Ext4.getCmp('filterWashTime').getValue();
+				}
+				if(Ext4.getCmp('isBeforeModeForWashTime') && Ext4.getCmp('isBeforeModeForWashTime').getValue() !== ''){
+					params.isBeforeModeForWashTime = Ext4.getCmp('isBeforeModeForWashTime').getValue();
+				}
+				if(Ext4.getCmp('filterRecyclingTime') && Ext4.getCmp('filterRecyclingTime').getValue() !== ''){
+					params.filterRecyclingTime = Ext4.getCmp('filterRecyclingTime').getValue();
+				}
+				if(Ext4.getCmp('isBeforeModeForRecyclingTime') && Ext4.getCmp('isBeforeModeForRecyclingTime').getValue() !== ''){
+					params.isBeforeModeForRecyclingTime = Ext4.getCmp('isBeforeModeForRecyclingTime').getValue();
+				}
 				Ext4.apply(store.proxy.extraParams, params);
 			},
 			load: function (treeStore, node, records, successful, eOpts) {
@@ -5059,9 +5102,22 @@
 					tousseOrDepart = Ext4.getCmp('tousseOrDepart').getValue();
 				}
 				var settleAccountsDepartCoding = treeStore.proxy.extraParams.settleAccountsDepartCoding || '';
+				var params = { taskGroup: taskGroup, pageSize: waitPackingPageSize, tousseOrDepart: tousseOrDepart, settleAccountsDepartCoding: settleAccountsDepartCoding };
+				if(Ext4.getCmp('filterWashTime') && Ext4.getCmp('filterWashTime').getValue() !== ''){
+					params.filterWashTime = Ext4.getCmp('filterWashTime').getValue();
+				}
+				if(Ext4.getCmp('isBeforeModeForWashTime') && Ext4.getCmp('isBeforeModeForWashTime').getValue() !== ''){
+					params.isBeforeModeForWashTime = Ext4.getCmp('isBeforeModeForWashTime').getValue();
+				}
+				if(Ext4.getCmp('filterRecyclingTime') && Ext4.getCmp('filterRecyclingTime').getValue() !== ''){
+					params.filterRecyclingTime = Ext4.getCmp('filterRecyclingTime').getValue();
+				}
+				if(Ext4.getCmp('isBeforeModeForRecyclingTime') && Ext4.getCmp('isBeforeModeForRecyclingTime').getValue() !== ''){
+					params.isBeforeModeForRecyclingTime = Ext4.getCmp('isBeforeModeForRecyclingTime').getValue();
+				}
 				Ext4.Ajax.request({
 					url: WWWROOT + '/disinfectSystem/packingAction!loadWaitPackingTaskPageJson.do',
-					params: { taskGroup: taskGroup, pageSize: waitPackingPageSize, tousseOrDepart: tousseOrDepart, settleAccountsDepartCoding: settleAccountsDepartCoding },
+					params: params,
 					success: function (response, options) {
 						var result = Ext4.decode(response.responseText);
 						if (result.success) {
@@ -8573,11 +8629,22 @@
 
 	});
 	
+	var filters = {
+        ftype: 'filters',
+        encode: true, // 是否将过滤条件编码为查询参数
+        local: false ,
+		filtersText: '过滤',
+        updateBuffer: 500, 
+		menuFilterText: '过滤'
+    };
+
+	var filterDate = false;
 	var waitPackColumnTreeGrid = Ext4.create('columnTreeGrid', {
 		id: 'waitPackingTreeGrid',
 		border: false,
 		columns: buildColumnTreeColumns('waitPackingTreeGrid'),
 		height: (document.body.clientHeight - 22) / 2,
+		features: [filters], 
 		listeners: {
 			// cellclick事件改为select事件，便于selenium进行测试
 			itemclick: function (view, record, item, index, e, eOpts) {
@@ -8611,6 +8678,9 @@
 					}
 				}, 200);
 			},
+			headerclick: function(grid, column, e) {
+				console.log(grid)
+			},
 			load: {
 				fn: function (store) {
 					var root = waitPackingTaskStore.getRootNode();
@@ -8650,11 +8720,92 @@
 					})
 				});
 			},
+			filterupdate:function(event){
+				var filter = event.filters;
+				if(filter.items && filter.items.length > 0){
+					var filterWashTime = '';
+					var isBeforeModeForWashTime = '';
+					var filterRecyclingTime = ''
+					var isBeforeModeForRecyclingTime = ''
+					for(var i=0;i<filter.items.length;i++){
+						var active = filter.items[i].active;
+						var dataIndex = filter.items[i].dataIndex;
+						var values = filter.items[i].values;
+						if(active){
+							if(dataIndex == 'washTime'){
+								if(values.before){
+									var value = values.before;
+									var time = new Date(value).getTime();
+									var dateStr = Ext.util.Format.date(new Date(time), 'Y-m-d')
+									filterWashTime = dateStr +' 23:59';
+									isBeforeModeForWashTime = true;
+								}else if(values.after){
+									var value = values.after;
+									var time = new Date(value).getTime();
+									var dateStr = Ext.util.Format.date(new Date(time), 'Y-m-d')
+									filterWashTime = dateStr +' 00:00';
+									isBeforeModeForWashTime = false;
+								}else {
+									filterWashTime = '';
+									isBeforeModeForWashTime = '';
+								}
+							}
+							if(dataIndex == 'dateTime'){
+								if(values.before){
+									var value = values.before;
+									var time = new Date(value).getTime();
+									var dateStr = Ext.util.Format.date(new Date(time), 'Y-m-d')
+									filterRecyclingTime = dateStr +' 23:59';
+									isBeforeModeForRecyclingTime = true;
+								}else if(values.after){
+									var value = values.after;
+									var time = new Date(value).getTime();
+									var dateStr = Ext.util.Format.date(new Date(time), 'Y-m-d')
+									filterRecyclingTime = dateStr +' 00:00';
+									isBeforeModeForRecyclingTime = false;
+								}else {
+									filterRecyclingTime = '';
+									isBeforeModeForRecyclingTime = '';
+								}
+							}
+						}
+					}
+					Ext4.getCmp('filterWashTime').setValue(filterWashTime);
+					Ext4.getCmp('isBeforeModeForWashTime').setValue(isBeforeModeForWashTime);
+					Ext4.getCmp('filterRecyclingTime').setValue(filterRecyclingTime);
+					Ext4.getCmp('isBeforeModeForRecyclingTime').setValue(isBeforeModeForRecyclingTime);
+					setTimeout(function(){
+						if(!filterDate){
+							waitPackingTaskStore.load();
+							filterDate = true;
+						}
+					}, 500);
+					setTimeout(function(){
+						filterDate = false;
+					}, 1000);
+				}
+			},
 			itemcontextmenu: taskItemMenu
 		},
 		store: waitPackingTaskStore,
 		dockedItems: waitPackingDockedItems,
 		bbar: [{
+			xtype:'hidden',
+			id:'filterWashTime',
+			name:'filterWashTime'
+		},{
+			xtype:'hidden',
+			id:'isBeforeModeForWashTime',
+			name:'isBeforeModeForWashTime'
+		},{
+			xtype:'hidden',
+			id:'filterRecyclingTime',
+			name:'filterRecyclingTime'
+		},{
+			xtype:'hidden',
+			id:'isBeforeModeForRecyclingTime',
+			name:'isBeforeModeForRecyclingTime'
+		},{
 			xtype: 'button',
 			text: '',
 			tooltip: "第一页",
@@ -9713,28 +9864,86 @@
 
 	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 (sstsConfig.columnConfigOfpackingTaskList && sstsConfig.columnConfigOfpackingTaskList.length > 0) {
+			var columnConfigOfpackingTaskList = sstsConfig.columnConfigOfpackingTaskList;
+			for (var j = 0; j < columnConfigOfpackingTaskList.length; j++) {
+				var name = '';
+				var width = 0;
+				if(typeof columnConfigOfpackingTaskList[j] == 'string'){
+					name = columnConfigOfpackingTaskList[j];
+				}else {
+					name = columnConfigOfpackingTaskList[j].name;
+					width = columnConfigOfpackingTaskList[j].width;
+				}
+				if(name == '物品名称' || name == '操作' || name == '清洗篮筐'){
+					if (gridColumns[i].text == '物品名称') {
+						//设置物品名称列的宽度
+						if(width > 0){
+							gridColumns[i].setWidth(width);
+						}else {
+							if (tousseNameMaxLenArray.length > 0) {
+								var tousseNameMaxLenght = Math.max.apply(null, tousseNameMaxLenArray);
+								gridColumns[i].setWidth(tousseNameMaxLenght + 90);
+							}
+						}
+					}
+					if(gridColumns[i].text == '操作'){
+						//设置操作列最大的宽度
+						if(width > 0){
+							gridColumns[i].setWidth(width);
+						}else {
+							gridColumns[i].setWidth(handleTdWidth);
+						}
+					}
+					if(gridColumns[i].text == '清洗篮筐'){
+						//设置清洗篮筐列最大的宽度
+						if(width > 0){
+							gridColumns[i].setWidth(width);
+						}else {
+							if (basketNameMaxLenArray.length > 0) {
+								var basketNameMaxLenght = Math.max.apply(null, basketNameMaxLenArray);
+								if (basketNameMaxLenght !== 0) {
+									if (basketNameMaxLenght < 216 && basketNameMaxLenght >= 75) {
+										gridColumns[i].setWidth(basketNameMaxLenght + 30);
+									} else if (basketNameMaxLenght < 75 && basketNameMaxLenght > 0) {
+										gridColumns[i].setWidth(105);
+									} else {
+										gridColumns[i].setWidth(210);
+									}
+								}
+							}
+						}
+					}
+				}else {
+					if(width > 0){
+						gridColumns[i].setWidth(width);
+					}
+				}
 			}
-		}
-		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 && basketNameMaxLenght >= 75) {
-						gridColumns[i].setWidth(basketNameMaxLenght + 30);
-					} else if (basketNameMaxLenght < 75 && basketNameMaxLenght > 0) {
-						gridColumns[i].setWidth(105);
-					} else {
-						gridColumns[i].setWidth(210);
+		}else {
+			if (gridColumns[i].text == '物品名称') {
+				//设置物品名称列的宽度
+				if (tousseNameMaxLenArray.length > 0) {
+					var tousseNameMaxLenght = Math.max.apply(null, tousseNameMaxLenArray);
+					gridColumns[i].setWidth(tousseNameMaxLenght + 90);
+				}
+			}
+			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 && basketNameMaxLenght >= 75) {
+							gridColumns[i].setWidth(basketNameMaxLenght + 30);
+						} else if (basketNameMaxLenght < 75 && basketNameMaxLenght > 0) {
+							gridColumns[i].setWidth(105);
+						} else {
+							gridColumns[i].setWidth(210);
+						}
 					}
 				}
 			}