Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
===================================================================
diff -u -r14615 -r14619
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 14615)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 14619)
@@ -3126,18 +3126,19 @@
 	 */
 	function reloadFilterPara(mapVal,field) {
 		Ext.ux.ForgonPageGrid.prototype.getGridParameterMap = function() {
-			var gridParameterMap = new Object();
+			var gridParameterMap = {};
 			if (field == 'all'){
 				return gridParameterMap;
 			}
-			if ("grid_filter_deliverStatus_list_" == field){
+			if (field.indexOf("deliver") != -1 ){
 				gridParameterMap.grid_filter_deliverStatus_list_ = mapVal;
 			}
-			else if ("grid_filter_recyclingStatus_list_" == field){
+			else if (field.indexOf("recycling") != -1){
 				gridParameterMap.grid_filter_recyclingStatus_list_ = mapVal;
 			}
 			return gridParameterMap;
 		};
+        // grid.getStore().reload();
 		grid.dwrReload();
 	}
 
@@ -3151,42 +3152,41 @@
         grid.dwrReload();
     }
 
-	//快速筛选按钮
-	var quickScreenMenu = new Ext.menu.Menu({
-		items: [{
-			text: '全部',
-			handler: function () {
-				reloadFilterPara('','all');
-			}
-		}, {
-			text: '待回收',
-			handler: function() {
-				reloadFilterPara(["待回收"],'grid_filter_recyclingStatus_list_');
-			}
-		}, {
-			text: '部分回收',
-			handler: function() {
-				reloadFilterPara(["部分回收"],'grid_filter_recyclingStatus_list_');
-			}
-		}, {
-			text: '待发货',
-			handler: function() {
-				reloadFilterPara(["待发货"],'grid_filter_deliverStatus_list_');
-			}
-		}, {
-			text: '部分发货',
-			handler: function() {
-				reloadFilterPara(["部分发货"],'grid_filter_deliverStatus_list_');
-				// grid.getStore().reload();
-			}
-		}, {
-			text: '已发货',
-			handler: function() {
-				reloadFilterPara(["已发货"],'grid_filter_deliverStatus_list_');
-			}
-		}]
-	});
+    //快速筛选combo Store
+    var quickScreenStatus = new Ext.data.SimpleStore({
+        fields: ['key', 'val'],
+        data: [
+            ['all', '全部'],
+            ['recycling_awaitRecycle', '待回收'],
+            ['recycling_partRecycle','部分回收'],
+            ['deliver_awaitDeliver','待发货'],
+            ['deliver_partDelivered','部分发货']
+        ]
+    });
 
+    //快速筛选combo
+    var quickScreenCombo = {
+        xtype: 'combo',
+        fieldLabel: '快速筛选',
+        store: quickScreenStatus,
+        width: 80,
+        mode: 'local',
+        triggerAction: 'all',
+        displayField: 'val',
+        forceSelection: true,
+        value: '全部',
+        editable: false,
+        listeners : {
+            select : function(combo, record, index){
+                var key = record.get('key');
+                var val = record.get('val');
+                var array = [val];
+                reloadFilterPara(array,key);
+            }
+        }
+    };
+
+
 	//时间筛选combo Store
 	var submitTimeStatus = new Ext.data.SimpleStore({
 		fields: ['key', 'val'],
@@ -3400,10 +3400,9 @@
 				updatePrintState(grid);
 			}
 		},{
-			text : '快速筛选',
-			iconCls : 'btn_ext_application_edit',
-			menu: quickScreenMenu
-		},{
+			text : '快速筛选:'
+		},
+        quickScreenCombo,{
 			text : '时间筛选:'
 		},submitTimeCombo,
 		'->',{