Index: ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnTousseByInvoicePlan.js
===================================================================
diff -u -r17724 -r17728
--- ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnTousseByInvoicePlan.js	(.../returnTousseByInvoicePlan.js)	(revision 17724)
+++ ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnTousseByInvoicePlan.js	(.../returnTousseByInvoicePlan.js)	(revision 17728)
@@ -952,7 +952,8 @@
 								if(action.result.success){
 //									grid.dwrReload();
 									this_window.close();
-									document.location.href = WWWROOT+'/disinfectsystem/returnGoodsRecord/returnGoodsRecordView.jsp';
+//									document.location.href = WWWROOT+'/disinfectsystem/returnGoodsRecord/returnGoodsRecordView.jsp';
+									history.go(-1);
 								} else if (action.result.message){
 									showResult(action.result.message);
 								} else {
@@ -976,7 +977,8 @@
 			text : '取消',
 			handler : function() {
 				this_window.close();
-				document.location.href = WWWROOT+'/disinfectsystem/returnGoodsRecord/returnGoodsRecordView.jsp';
+//				document.location.href = WWWROOT+'/disinfectsystem/returnGoodsRecord/returnGoodsRecordView.jsp';
+				history.go(-1);
 			}
 		}]
 	});
Index: ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnDisposableGoodsByInvoicePlan.js
===================================================================
diff -u -r17711 -r17728
--- ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnDisposableGoodsByInvoicePlan.js	(.../returnDisposableGoodsByInvoicePlan.js)	(revision 17711)
+++ ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnDisposableGoodsByInvoicePlan.js	(.../returnDisposableGoodsByInvoicePlan.js)	(revision 17728)
@@ -1045,7 +1045,8 @@
 								}
 //								grid.dwrReload();
 								top.Ext.getCmp('returnGoodsRecordWin').close();
-								document.location.href = WWWROOT+'/disinfectsystem/returnGoodsRecord/returnGoodsRecordView.jsp';
+//								document.location.href = WWWROOT+'/disinfectsystem/returnGoodsRecord/returnGoodsRecordView.jsp';
+								history.go(-1);
 							},
 							failure : function(form, action) {
 								top.Ext.getCmp("depart").disable();// 禁止修改科室
@@ -1065,6 +1066,7 @@
 			text : '取消',
 			handler : function() {
 				top.Ext.getCmp('returnGoodsRecordWin').close();
+				history.go(-1);
 			}
 		}]
 	});