Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js
===================================================================
diff -u -r36975 -r37027
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js	(.../washAndDisinfectView.js)	(revision 36975)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js	(.../washAndDisinfectView.js)	(revision 37027)
@@ -356,6 +356,23 @@
 		{ name: 'hasPicture' }
 	];
 
+	var tousseDefinitionStore = new Ext.data.Store({
+		proxy: new Ext.data.HttpProxy({
+			url: WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getTousseAndDiposableGoodsData.do',
+			method: 'POST'
+		}),
+		reader: new Ext.data.JsonReader({
+			totalProperty: 'totalCount',
+			root: 'data'
+		}, [
+			{ name: 'id', mapping: 'id' },
+			{ name: 'spelling', mapping: 'spelling' },
+			{ name: 'name', mapping: 'name' },
+			{ name: 'displayName', mapping: 'displayName' },
+			{ name: 'amount', mapping: 'amount' }]
+		)
+	});
+
 	var tbar = new Array();
 
 	if (!SSTS_WashRecord_Create) {
@@ -494,17 +511,34 @@
 		text: '器械包名称:'
 	});
 	tbar.push({
-		xtype: 'textfield',
-		id: "selectTousseName"
-	});
-	tbar.push({
-		xtype: 'button',
-		text: '查询',
-		iconCls: 'icon_search',
-		handler: function () {
-			var selectTousseName = Ext.getCmp('selectTousseName').getValue();
-			$Id('parm_s_tousseName').value = selectTousseName;
-			grid.dwrReload();
+		xtype : 'combo',
+		id : 'selectTousseName',
+		name : 'selectTousseName',
+		queryParam : 'spell',
+		minChars : 0,
+		valueField : 'name',
+		displayField : 'name',
+		store : tousseDefinitionStore,
+		forceSelection : true,
+		lazyInit : true,
+		anchor : '95%',
+		triggerAction : 'all',
+		hideTrigger : false,
+		typeAhead : false,
+		allowBlank : true,
+		listeners:{
+			select: function (combo, record, index) {
+				var value = combo.value;
+				$Id('parm_s_tousseName').value = value;
+				grid.dwrReload();
+			},
+			blur:function(field, event, eOpts){
+				var value = Ext.getCmp('selectTousseName').getRawValue();
+				if(value == ''){
+					$Id('parm_s_tousseName').value = '';
+					grid.dwrReload();
+				}
+			}
 		}
 	});
 	var dwrCallParams = null;