Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
===================================================================
diff -u -r19994 -r20103
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 19994)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 20103)
@@ -2100,6 +2100,10 @@
         tbar2.push({text: '按器械包分组:'});
         tbar2.push(searchComboConfig.tousseGroupCombo);
 	}
+	if (sstsConfig.accordingToApplyTypeFilter){
+		tbar2.push({text: '按申请单类型:'});
+		tbar2.push(searchComboConfig.applyTypeCombo);
+	}
 	if (sstsConfig.showPrintFilter){
         tbar2.push({text: '是否已打印过滤:'});
         tbar2.push(searchComboConfig.printCombo);
@@ -2315,14 +2319,53 @@
         forceSelection : false,
 	    listeners: {
 		   select: function (combo, record, index) {
-			   // var tousseGroupId = record.get('id');
+			   if (record.get('tousseGroupName') == '全部') {
+					if (record.get('checked')) {
+						combo.selectAll()
+					} else {
+						combo.deselectAll()
+					}
+			   }
 			   reloadConditionPara(combo.getValue(), 'parm_s_tousseGroupId');
 		   }
 	    }
 	});
 }
 
 /**
+ * 创建按申请单类型的下拉选项
+ * @returns
+ */
+function createApplyTypeCombo() {
+	var applyTypeStoreConfig = {
+		url : WWWROOT + '/disinfectSystem/invoicePlanAction!getAllApplyType.do',
+		model : [{name: 'applyType', mapping: 'applyType'}]
+	}
+	return createCombo({
+		xtype: 'multiSelect',
+		storeConfig : applyTypeStoreConfig,
+		fieldLabel: '按申请单类型',
+		displayField: 'applyType',
+		valueField: 'applyType',
+		listWidth: 200,
+		//这个要设置成false,不然多选鼠标离开之后,combo上面的值不会显示
+		forceSelection : false,
+		listeners: {
+			select: function (combo, record, index) {
+				if (record.get('applyType') == '全部') {
+					if (record.get('checked')) {
+						combo.selectAll()
+					} else {
+						combo.deselectAll()
+					}
+				}
+				reloadConditionPara(combo.getValue(), 'parm_s_applyType');
+			}
+		}
+	});
+}
+
+/**
  * 创建打印状态过滤的下拉选项
  */
 function createPrintCombo() {
@@ -2389,6 +2432,7 @@
         width: comboConfig.width || 150,
         mode: comboConfig.mode || 'remote',
         triggerAction: 'all',
+        listWidth: comboConfig.listWidth || 150,
         displayField: comboConfig.displayField,
         valueField: comboConfig.valueField,
         forceSelection: Ext.isEmpty(comboConfig.forceSelection) ? true : comboConfig.forceSelection,
@@ -2695,6 +2739,7 @@
         quickScreenCombo : quickScreenCombo,
         departmentGroupCombo : createDeptGroupCombo(),
         tousseGroupCombo : createTousseGroupCombo(),
+        applyTypeCombo : createApplyTypeCombo(),
 	    printCombo : createPrintCombo()
     });