Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r41641 -r41648
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 41641)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 41648)
@@ -1965,13 +1965,13 @@
 			{ name: 'packageType' },
 			{ name: 'packageSize' },
 			{ name: 'sterilingMethod' },
-			{ name: 'washTime', type: 'date'},
+			{ name: 'washTime'},
 			{ name: 'basketName' },
 			{ name: 'expectUseTime' },
 			{ name: 'urgentAdditionalInfo' },
 			{ name: 'basketBarcode' },
 			{ name: 'status' },
-			{ name: 'dateTime', type: 'date'},
+			{ name: 'dateTime'},
 			{ name: 'recyclingUser' },
 			{ name: 'errors' },
 			{ name: 'damages' },
@@ -2400,14 +2400,7 @@
 				width: 110,
 				align: 'center',
 				sortable: true,
-				dataIndex: 'washTime',
-				renderer: Ext.util.Format.dateRenderer('Y-m-d h:m'),
-				filter: {
-					type: 'date',
-					beforeText: '之前', 
-    				afterText: '之后',  
-					menuItems: ['before', 'after']
-				}
+				dataIndex: 'washTime'
 			}
 			return obj;
 		} else if (headerName == '回收人') {
@@ -2426,14 +2419,7 @@
 				width: 110,
 				align: 'center',
 				sortable: true,
-				dataIndex: 'dateTime',
-				renderer: Ext.util.Format.dateRenderer('Y-m-d h:m'),
-				filter: {
-					type: 'date',
-					beforeText: '之前', 
-    				afterText: '之后',  
-					menuItems: ['before', 'after']
-				}
+				dataIndex: 'dateTime'
 			}
 			return obj;
 		} else if (headerName == '状态') {
@@ -4786,6 +4772,7 @@
 			triggerCls: 'x-form-clear-trigger',
 			trigger2Cls: 'x-form-search-trigger',
 			height:23,
+			width:150,
 			listeners: {
 				render: function (c) {
 					c.getEl().on('keypress', function (e) {
@@ -4836,6 +4823,74 @@
 		})
 	}
 
+	if(sstsConfig.enableTimeFilteringInPackingTasksList){
+		waitPackingTbar2.push({
+			text: '时间类型:'
+		},
+		{
+			xtype: 'combo',
+			id: 'dateType',
+			name: 'dateType',
+			editable: false,
+			width:80,
+			valueField: 'value',
+			displayField: 'value',
+			store: new Ext4.data.ArrayStore({
+				fields: ['value'],
+				data: [['　'], ['回收时间'], ['清洗时间']]
+			}),
+			value: '　',
+			forceSelection: true,
+			mode: 'local',
+			triggerAction: 'all',
+			anchor: '100%'
+		},{
+			text: '时间范围:'
+		},
+		{
+			xtype: 'combo',
+			id: 'dateRange',
+			name: 'dateRange',
+			editable: false,
+			width:80,
+			valueField: 'value',
+			displayField: 'value',
+			store: new Ext4.data.ArrayStore({
+				fields: ['value'],
+				data: [['　'], ['之前'], ['之后']]
+			}),
+			value: '　',
+			forceSelection: true,
+			mode: 'local',
+			triggerAction: 'all',
+			anchor: '100%'
+		},{
+			xtype: 'datefield',
+			id: 'dateValue',
+			name: 'dateValue',
+			editable: true,
+			width:130,
+			altFormats: 'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
+			format: 'Y-m-d H:i',
+			allowBlank: true,
+			anchor: '90%'
+		},{
+			xtype: 'button',
+			text: '查询',
+			handler: function(){
+				waitPackingTaskStore.load();
+			}
+		},{
+			xtype: 'button',
+			text: '重置',
+			handler: function(){
+				Ext4.getCmp('dateType').setValue('　');
+				Ext4.getCmp('dateRange').setValue('　');
+				Ext4.getCmp('dateValue').setValue('');
+			}
+		})
+	}
+
 	var basketPackingTbar = [{
 		text: "扫描篮筐条码:"
 	}, {
@@ -5047,18 +5102,39 @@
 					filterRecyclingTime:'',
 					isBeforeModeForRecyclingTime:''
 				};
-				if(Ext4.getCmp('filterWashTime') && Ext4.getCmp('filterWashTime').getValue() !== ''){
-					params.filterWashTime = Ext4.getCmp('filterWashTime').getValue();
+				if(sstsConfig.enableTimeFilteringInPackingTasksList){
+					var dateType = Ext4.getCmp('dateType').getValue();
+					var dateRange = Ext4.getCmp('dateRange').getValue();
+					var dateValue = Ext4.getCmp('dateValue').getRawValue();
+					if(dateType == '回收时间'){
+						if(dateRange == '之前'){
+							params.isBeforeModeForRecyclingTime = true;
+							params.filterRecyclingTime = dateValue;
+						}else if(dateRange == '之后'){
+							params.isBeforeModeForRecyclingTime = false;
+							params.filterRecyclingTime = dateValue;
+						}else {
+							params.isBeforeModeForRecyclingTime = '';
+							params.filterRecyclingTime = '';
+						}
+					}else if(dateType == '清洗时间'){
+						if(dateRange == '之前'){
+							params.isBeforeModeForWashTime = true;
+							params.filterWashTime = dateValue;
+						}else if(dateRange == '之后'){
+							params.isBeforeModeForWashTime = false;
+							params.filterWashTime = dateValue;
+						}else {
+							params.isBeforeModeForWashTime = '';
+							params.filterWashTime = '';
+						}
+					}else {
+						params.isBeforeModeForRecyclingTime = '';
+						params.filterRecyclingTime = '';
+						params.isBeforeModeForWashTime = '';
+						params.filterWashTime = '';
+					}
 				}
-				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) {
@@ -5103,18 +5179,39 @@
 				}
 				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(sstsConfig.enableTimeFilteringInPackingTasksList){
+					var dateType = Ext4.getCmp('dateType').getValue();
+					var dateRange = Ext4.getCmp('dateRange').getValue();
+					var dateValue = Ext4.getCmp('dateValue').getRawValue();
+					if(dateType == '回收时间'){
+						if(dateRange == '之前'){
+							params.isBeforeModeForRecyclingTime = true;
+							params.filterRecyclingTime = dateValue;
+						}else if(dateRange == '之后'){
+							params.isBeforeModeForRecyclingTime = false;
+							params.filterRecyclingTime = dateValue;
+						}else {
+							params.isBeforeModeForRecyclingTime = '';
+							params.filterRecyclingTime = '';
+						}
+					}else if(dateType == '清洗时间'){
+						if(dateRange == '之前'){
+							params.isBeforeModeForWashTime = true;
+							params.filterWashTime = dateValue;
+						}else if(dateRange == '之后'){
+							params.isBeforeModeForWashTime = false;
+							params.filterWashTime = dateValue;
+						}else {
+							params.isBeforeModeForWashTime = '';
+							params.filterWashTime = '';
+						}
+					}else {
+						params.isBeforeModeForRecyclingTime = '';
+						params.filterRecyclingTime = '';
+						params.isBeforeModeForWashTime = '';
+						params.filterWashTime = '';
+					}
 				}
-				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: params,
@@ -8720,92 +8817,11 @@
 					})
 				});
 			},
-			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: "第一页",