Index: ssts-web/src/main/webapp/disinfectsystem/departmentStock/departmentStockInputView.js
===================================================================
diff -u -r26835 -r27887
--- ssts-web/src/main/webapp/disinfectsystem/departmentStock/departmentStockInputView.js	(.../departmentStockInputView.js)	(revision 26835)
+++ ssts-web/src/main/webapp/disinfectsystem/departmentStock/departmentStockInputView.js	(.../departmentStockInputView.js)	(revision 27887)
@@ -49,12 +49,12 @@
 	$Id("parm_s_tousseGroupName").value = tousseGroupName;
 	grid.dwrReload();
 }
-function search(searchField){
+function search(searchField,searchId){
 	if(searchField!=null && searchField.length!=0){
 		var treePanel = viewport.findById('west-panel');
 		Ext.Ajax.request({
-			url: WWWROOT + '/systemmanage/loadOrgUnitByName.do',
-			params: { name: searchField },
+			url: WWWROOT + '/systemmanage/loadOrgUnitById.do',
+			params: {orgUnitId:searchId},
 			success: function(response ,options){
 				var jsonObj = Ext.decode(response.responseText);
 				if(jsonObj!=null && jsonObj.length!=0){
@@ -123,11 +123,14 @@
     	proxy : new Ext.data.HttpProxy({
     		url : WWWROOT + '/systemmanage/getOrgNameBySpellingAndWB!getOrgNameBySpellingAndWB.do',
     		method : 'POST'
-    	}),
+		}),
+		baseParams :{
+			showDisableOrgUnit : false
+		},
     	reader : new Ext.data.JsonReader({
     		root : 'data'
     	},[
-    	    {name : 'name',mapping : 'name'}
+    	    {name : 'name',mapping : 'name',id:'id'}
     	  ]
     	)
     });
@@ -674,15 +677,22 @@
 					listeners:{
 						select:function(combo, record, index){
 							Ext.getCmp('searchField').setValue(record.data.name);
-							search(record.data.name);
+							Ext.getCmp('searchID').setValue(record.json.id);
+                            search(record.data.name,record.json.id);
 						}
 					}
                 	
                 },{
+					xtype : 'combo',
+					id : 'searchID',
+					name : 'searchID',
+					hidden:true
+				},{
                 	text:'查询',
                 	handler:function(){
                 		var searchField = Ext.getCmp('searchField').getValue();
-                		search(searchField);
+                		var searchId = Ext.getCmp('searchID').getValue();
+                		search(searchField,searchId);
                 	}
                 }],
                 loader: myLoader,   //数据加载