Index: ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js
===================================================================
diff -u -r41492 -r41545
--- ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js	(.../returnGoodsRecordForm.js)	(revision 41492)
+++ ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js	(.../returnGoodsRecordForm.js)	(revision 41545)
@@ -194,10 +194,7 @@
 	}
 
 	var tousseName = diposableGood.showName;
-	if (typeof (amount) == 'undefined') {
-		//alert('amount undefined')
-		amount = 1;
-	}
+	var amount = 1;
 	var barcode = batch.barcode;
 	var batchNumber = batch.batchNumber;
 	var price = priceAmount.price;
@@ -509,20 +506,31 @@
 					showResult(resultObj.errMsg);
 					return;
 				}
-				if(signStatus == '待审核'){
-					if(returnGoodsItemStore.getCount() > 0){
-						for(var i=0;i<returnGoodsItemStore.getCount();i++){
-							var returnGoodsItemItems = returnGoodsItemStore.getAt(i)
-							if(returnGoodsItemItems.data.tousseName == resultObj.diposableGood.showName && returnGoodsItemItems.data.barcode == ''){
-								returnGoodsItemStore.remove(returnGoodsItemItems)
-								break;
+				if (resultObj.diposableGood.goodsType == '高值耗材') {
+					if(signStatus == '待审核'){
+						if(returnGoodsItemStore.getCount() > 0){
+							for(var i=0;i<returnGoodsItemStore.getCount();i++){
+								var returnGoodsItemItems = returnGoodsItemStore.getAt(i)
+								if(returnGoodsItemItems.data.tousseName == resultObj.diposableGood.showName && returnGoodsItemItems.data.barcode == ''){
+									returnGoodsItemStore.remove(returnGoodsItemItems)
+									break;
+								}
 							}
 						}
 					}
-				}
-				if (resultObj.diposableGood.goodsType == '高值耗材') {
 					addExpensiveDisposablegoodsItems(resultObj.diposableGood);
 				} else {
+					if(signStatus == '待审核' && resultObj.diposableGood.priceAmountList.length > 0){
+						if(returnGoodsItemStore.getCount() > 0){
+							for(var i=0;i<returnGoodsItemStore.getCount();i++){
+								var returnGoodsItemItems = returnGoodsItemStore.getAt(i)
+								if(returnGoodsItemItems.data.tousseName == resultObj.diposableGood.showName && returnGoodsItemItems.data.barcode == ''){
+									returnGoodsItemStore.remove(returnGoodsItemItems)
+									break;
+								}
+							}
+						}
+					}
 					onLoadDiposableGoodsInfo(resultObj.diposableGood,signStatus);
 				}
 			} else {
@@ -553,8 +561,10 @@
 	setBatchNumbers([batch]);
 	//设置价格
 	setPrices(diposableGood.priceAmountList)
-	if(signStatus == '待审核'){
-		onAddDiposableGoodsClick();
+	if(signStatus == '待审核' && diposableGood.priceAmountList.length > 0){
+		setTimeout(function(){
+			onAddDiposableGoodsClick();
+		}, 200);
 	}
 }
 
@@ -985,7 +995,7 @@
 			header: "退货数量", width: 70, dataIndex: 'amount', menuDisabled: true,
 			editor: new top.Ext.form.NumberField({
 				allowBlank: false,
-				disabled: !enableBtn,
+				disabled: !(enableBtn || signStatus == '待审核'),
 				allowNegative: false,
 				style: 'text-align: left',
 				allowDecimals: false
@@ -1751,6 +1761,7 @@
 	if (warehouse != null) {
 		warehouse.setValue(returnGoodsRecord.warehouseName);
 		top.Ext.getCmp('warehouseID').setValue(returnGoodsRecord.warehouseID);
+		top.Ext.getCmp("warehouseName").setValue(returnGoodsRecord.warehouseName);
 	}
 
 	if (sstsConfig.enableStoreCode && isShowStoreCodeCombo(departCoding)) {