Index: ssts-web/src/main/webapp/disinfectsystem/returnMaterialRecord/returnMaterialRecordForm.js
===================================================================
diff -u -r30032 -r30057
--- ssts-web/src/main/webapp/disinfectsystem/returnMaterialRecord/returnMaterialRecordForm.js	(.../returnMaterialRecordForm.js)	(revision 30032)
+++ ssts-web/src/main/webapp/disinfectsystem/returnMaterialRecord/returnMaterialRecordForm.js	(.../returnMaterialRecordForm.js)	(revision 30057)
@@ -137,7 +137,7 @@
 		]),
 		listeners : {
 			beforeload : function(store,option) {
-				store.baseParams['departCoding'] = getSettleAccountsDepartCoding();
+				store.baseParams['departCoding'] = getCurrentDepartCoding();
 			}
 		}
 	});
@@ -504,6 +504,7 @@
 							select:function(combo,  record, index ){
 								var tem = record.data.id;
 								top.Ext.getCmp('departCoding').setValue(tem);
+								returnGoodsItemStore.removeAll();
 								updateGoodsComboStatus();
 								Ext.Ajax.request({
 									url: WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getDefaultSettleAccountDepart.do',
@@ -551,12 +552,7 @@
 						triggerAction : 'all',
 						hideTrigger : true,
 						typeAhead : false,
-						allowBlank : false,
-						listeners :{
-							select:function(combo,  record, index ){
-								returnGoodsItemStore.removeAll();
-							}
-						}
+						allowBlank : false
 					}]
 				} ,{
 					columnWidth : .5,
@@ -686,7 +682,7 @@
 												return ;
 											}
 											ReturnMaterialRecordTableManager.loadMaterialPriceAmountInfoCanReturned(
-												getSettleAccountsDepartCoding(),record.data.id,warehouseId,function(priceAmountList){
+												getCurrentDepartCoding(),record.data.id,warehouseId,function(priceAmountList){
 														if(priceAmountList != null){
 															setPrices(priceAmountList);
 														}