Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
===================================================================
diff -u -r14540 -r14554
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 14540)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 14554)
@@ -3110,6 +3110,62 @@
 			{type: 'string',  dataIndex: 'remark'}
 		]
 	});
+
+	/**
+	 * 设置自定义过滤条件,用于快速条件筛选,
+	 * 里面通过重写getGridParameterMap,来自定义添加过滤的参数
+	 * @param mapVal 要设定的值,里面是一个数组
+	 * @param field 对应的参数名字
+	 */
+	function reloadFilterPara(mapVal,field) {
+		Ext.ux.ForgonPageGrid.prototype.getGridParameterMap = function() {
+			var gridParameterMap = new Object();
+			if (field == 'all'){
+				return gridParameterMap;
+			}
+			if ("grid_filter_deliverStatus_list_" == field){
+				gridParameterMap.grid_filter_deliverStatus_list_ = mapVal;
+			}
+			else if ("grid_filter_recyclingStatus_list_" == field){
+				gridParameterMap.grid_filter_recyclingStatus_list_ = mapVal;
+			}
+			return gridParameterMap;
+		};
+		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();
+			}
+		}]
+	});
+
 	var isSupplyRoomUser = validateIsSupplyRoomUser();
 	var tbar = [{
 			text : '申请物品',
@@ -3294,6 +3350,10 @@
 			handler : function(){
 				updatePrintState(grid);
 			}
+		},{
+			text : '快速筛选',
+			iconCls : 'btn_ext_application_edit',
+			menu: quickScreenMenu
 		},'->',{
 			//加->表示往右居中
 			text : '显示全部申请单',