Index: ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.js
===================================================================
diff -u -r36704 -r36800
--- ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.js	(.../operationReservationInvoiceView.js)	(revision 36704)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.js	(.../operationReservationInvoiceView.js)	(revision 36800)
@@ -230,7 +230,7 @@
 
 var storageLocationStore = new Ext.data.Store({
 	proxy : new Ext.data.HttpProxy({
-		url : WWWROOT + '/disinfectSystem/baseData/storageLocationAction!loadStorageLocationForOperationReservationInvoice.do',
+		url : WWWROOT + '/disinfectSystem/baseData/storageLocationAction!loadStorageLocationByOrgUnitCode.do',
 		method : 'POST'
 	}),
 	reader : new Ext.data.JsonReader({
@@ -244,9 +244,8 @@
 	]),
 	listeners : {
 		beforeload:function(thiz){
-			var invoicePlanId = top.Ext.getCmp('invoicePlanIdHidden').getValue();
-			if(invoicePlanId){
-				thiz.baseParams["invoicePlanId"] = invoicePlanId;
+			if(top.Ext.getCmp('orgUnitCoding')){
+				thiz.baseParams["orgUnitCode"] = top.Ext.getCmp('orgUnitCoding').getValue();
 			}
 		}
 	}
@@ -1469,7 +1468,8 @@
 					items:[{
 						xtype:'hidden',
 						id:'storageLocationAddr',
-						name:'storageLocationAddr'
+						name:'storageLocationAddr',
+						value:kardexContainerAddr
 					},{
 						xtype : 'combo',
 						id : 'storageLocationAddrName',
@@ -1484,6 +1484,7 @@
 						triggerAction : 'all',
 						forceSelection : true,
 						anchor : '99%',
+						value:kardexContainerAddr,
 						store : new Ext.data.SimpleStore({
 							fields : ['queryMode','queryValue'],
 							data : [['一号开口','S01-1'],['二号开口','S01-2'],['三号开口','S01-3']]
@@ -1518,13 +1519,12 @@
 						fieldLabel : '托盘选择',
 						id : 'storageLocationName',
 						name : 'storageLocationName',
+						queryParam: 'spell',
 						minChars : 0,
 						valueField : 'name',
 						displayField : 'name',
 						store : storageLocationStore,
 						triggerAction : 'all',
-						readOnly : true,
-						editable: false,
 						forceSelection : true,
 						allowBlank : true,
 						anchor : '99%',