Index: ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnTousseByInvoice.js
===================================================================
diff -u -r28353 -r28844
--- ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnTousseByInvoice.js	(.../returnTousseByInvoice.js)	(revision 28353)
+++ ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnTousseByInvoice.js	(.../returnTousseByInvoice.js)	(revision 28844)
@@ -957,8 +957,6 @@
 								if(action.result.success){
 //									grid.dwrReload();
 									this_window.close();
-//									document.location.href = WWWROOT+'/disinfectsystem/returnGoodsRecord/returnGoodsRecordView.jsp';
-									history.go(-1);
 								} else if (action.result.message){
 									showResult(action.result.message);
 								} else {
@@ -982,8 +980,6 @@
 			text : '取消',
 			handler : function() {
 				this_window.close();
-//				document.location.href = WWWROOT+'/disinfectsystem/returnGoodsRecord/returnGoodsRecordView.jsp';
-				history.go(-1);
 			}
 		}]
 	});
@@ -996,11 +992,16 @@
 		modal : true,
 //		autoHeight : true,
 		border : false,
-		height:550,
+		height:600,
 		plain : true,
 		items : [ form ]
 	});
 	this_window.show();
+
+	this_window.on('hide',function(){
+		this_window.close();
+		history.go(-1);
+	})
 	
 	DWREngine.setAsync(false);
     ReturnGoodsRecordTableManager.getInvoiceInfo(invoiceId,function(batchesStr){