Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
===================================================================
diff -u -r18102 -r18112
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 18102)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 18112)
@@ -1141,6 +1141,11 @@
 				showResult(action.result.message);
 				if(action.result.success){
 					invoiceFormWindow.close();
+					// 返回退货界面
+					if(openMode == INVOICE_FORM_OPEN_MODE_CLICKRETURNRECORD){
+						document.location.href = WWWROOT+'/disinfectsystem/returnGoodsRecord/returnGoodsRecordView.jsp';
+						return;
+					}
 					grid.getStore().reload();
 				}
 			},
@@ -1150,6 +1155,11 @@
 				}else{
 					showResult("发货超时，请稍后查看发货单以确定发货是否成功，避免重复发货!");
 					invoiceFormWindow.close();
+					// 返回退货界面
+					if(openMode == INVOICE_FORM_OPEN_MODE_CLICKRETURNRECORD){
+						document.location.href = WWWROOT+'/disinfectsystem/returnGoodsRecord/returnGoodsRecordView.jsp';
+						return;
+					}
 					grid.getStore().reload();
 				}
 			}
@@ -1693,6 +1703,11 @@
 						//切记注意:按取消关闭window后,一定要把已选择的申请单号变量清空
 						selectedInvoicePlanId = "";
 						invoiceFormWindow.close();
+						
+						// 返回退货界面
+						if(openMode == INVOICE_FORM_OPEN_MODE_CLICKRETURNRECORD){
+							document.location.href = WWWROOT+'/disinfectsystem/returnGoodsRecord/returnGoodsRecordView.jsp';
+						}
 					}
 				}, {
 					text : '辅助发货',