Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
===================================================================
diff -u -r29144 -r29575
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 29144)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 29575)
@@ -2333,11 +2333,44 @@
 		addSearchTbar(goodsSearchTbarArr, 200);
 	}
 
-	//6、按器械包类型(width=235)
+	//6、按物品类型(width=235)
 	if(!sstsConfig.notShowTousseTypeSearchTbar){
 		var tousseTypeSearchTbarArr = [];
-		tousseTypeSearchTbarArr.push({text: '按器械包类型:'});
-		tousseTypeSearchTbarArr.push(createTousseTypeCombo());
+		tousseTypeSearchTbarArr.push({text: '按物品类型:'});
+		tousseTypeSearchTbarArr.push({
+			xtype : 'multiSelect',
+			id : 'touseType',
+			name : 'touseType',
+			valueField : 'value',
+			displayField : 'key',
+			allowBlank : true,
+			editable : false,
+			fieldLabel:'类型',
+			width : 150,
+			emptyText:'请选择物品类型',
+			mode:'local',
+			store : new Ext.data.SimpleStore({
+				data:tousseTypeDataArray,
+				fields:['key','value']
+			}),
+	//		forceSelection : true,
+			triggerAction : 'all',
+			listeners : {
+				select : function(combo, record, index){
+					//1、如果选中“全部”的项，则把所有的项选中，反之全部取消选择
+					if (record.get('value') == '全部') {
+						if (record.get('checked')) {
+							combo.selectAll()
+						} else {
+							combo.deselectAll()
+						}
+					}
+					
+					combo.setValue(combo.getCheckedValue());
+					reloadConditionPara(combo.getValue(), 'parm_s_selectedTousseType');
+				}
+			}
+		});
 		addSearchTbar(tousseTypeSearchTbarArr, 235);
 	}