Index: ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js
===================================================================
diff -u -r30062 -r30064
--- ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js	(.../returnGoodsRecordForm.js)	(revision 30062)
+++ ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js	(.../returnGoodsRecordForm.js)	(revision 30064)
@@ -478,7 +478,7 @@
 	// 清空批次价格
 	clearBatchNumberAndPrice();
 
-	ReturnGoodsRecordTableManager.getBatchStocksByStockIDWarehouseDepart(diposableGoods.id, warehouseID, departCoding,settleAccountsDepartCoding , function (batchesStr) {
+	ReturnGoodsRecordTableManager.getBatchStocksByStockIDWarehouseDepart(diposableGoods.id, warehouseID, departCoding,getSettleAccountsDepart() , function (batchesStr) {
 		var batches = top.Ext4.JSON.decode(batchesStr);
 		if (batches.length > 0) {
 			for (var i = 0; i < batches.length; ++i) {
@@ -955,6 +955,9 @@
 								} else {
 									top.Ext.getCmp('storeCodeLabel').setVisible(false);
 								}
+								if(returnGoodsItemStore){
+									returnGoodsItemStore.removeAll()
+								}
 								Ext.Ajax.request({
 									url: WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getDefaultSettleAccountDepart.do',
 									params: {
@@ -991,9 +994,7 @@
 						name: 'settleAccountsDepart',
 						disabled: !editableConfig.editable,
 						allowBlank: true,
-						anchor: '80%',
-						readOnly: true,
-						cls: 'x-item-disabled'
+						anchor: '80%'
 					}]
 				}, {
 					columnWidth: .5,
@@ -2110,6 +2111,9 @@
 							select: function (combo, record, index) {
 								var tem = record.data.id;
 								top.Ext.getCmp('departCoding').setValue(tem);
+								if(returnGoodsItemStore){
+									returnGoodsItemStore.removeAll()
+								}
 							}
 						}
 					}]
@@ -2129,9 +2133,7 @@
 						name: 'settleAccountsDepart',
 						disabled: !editableConfig.editable,
 						allowBlank: true,
-						anchor: '80%',
-						readOnly: true,
-						cls: 'x-item-disabled'
+						anchor: '80%'
 					}]
 				}, {
 					columnWidth: 1,