Index: ssts-web/src/main/webapp/homepage/supplyRoomOperate.js
===================================================================
diff -u -r16768 -r17472
--- ssts-web/src/main/webapp/homepage/supplyRoomOperate.js	(.../supplyRoomOperate.js)	(revision 16768)
+++ ssts-web/src/main/webapp/homepage/supplyRoomOperate.js	(.../supplyRoomOperate.js)	(revision 17472)
@@ -72,6 +72,7 @@
 	var endDate= $Id('endDate' + IDS).value || $Id('endDate').value;
 	//任务组的displayName
     var taskGroup = Ext.getCmp('taskGroup').getRawValue();
+    var comboTousseType = Ext.getCmp('comboTousseType').getValue();
 
 	if(startDate ==  null || startDate == ''
 		|| endDate == null || endDate == ''){
@@ -92,14 +93,16 @@
         startDate : startDate,
         endDate : endDate,
         taskGroup : taskGroup,
-        department : department
+        department : department,
+		comboTousseType : comboTousseType
 	};
 	var queryParam2 = {
         tousseName : goodName,
         tousseType : tousseType,
         startDate : startDate,
         endDate : endDate,
-        taskGroup : taskGroup
+        taskGroup : taskGroup,
+		comboTousseType : comboTousseType
 	};
     loadStoreByParams(applicationStore, queryParam1);
     loadStoreByParams(washStore, queryParam2);
@@ -239,7 +242,24 @@
 		)
 	});
 
+	//物品类型
+	var tousseTypeStore = new Ext.data.SimpleStore( {
+		fields : ['key', 'value'],
+		data : [
+			 ['all','全部']
+			,['allTousse','全部器械包']
+			,['tousse','器械包']
+			,['dressing','敷料包']
+			,['disinfection','消毒物品']
+			,['foreign','外来器械包']
+			,['custom','自定义器械包']
+			,['foreignProxy','外部代理灭菌包']
+			,['disposableGood','一次性物品']
+		]
+	});
 
+
+
 	var startDate = new Date();
 	startDate.setHours(0,0,0);
 
@@ -348,6 +368,29 @@
                             }
                         }]
                     },{
+						columnWidth : .15,
+						layout : 'form',
+						labelWidth : 60,
+						items : [{
+							xtype : 'combo',
+							fieldLabel : '物品类型',
+							id : 'comboTousseType',
+							name : 'comboTousseType',
+							valueField : 'key',
+							displayField : 'value',
+							store : tousseTypeStore,
+							forceSelection : true,
+							value:'全部',
+							editable : false,
+							mode : 'local',
+							triggerAction : 'all',
+							anchor : '95%',
+							listeners : {
+								select : function(store, record){
+								}
+							}
+						}]
+				}, {
 					columnWidth : .18,
 					layout : 'form',
 					labelWidth : 60,