Index: ssts-web/src/main/webapp/disinfectsystem/invoice/canInvoiceTousseList.js
===================================================================
diff -u -r25552 -r25795
--- ssts-web/src/main/webapp/disinfectsystem/invoice/canInvoiceTousseList.js	(.../canInvoiceTousseList.js)	(revision 25552)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/canInvoiceTousseList.js	(.../canInvoiceTousseList.js)	(revision 25795)
@@ -199,7 +199,7 @@
 	
 	
 	var form = new top.Ext.FormPanel({
-		id : 'recyclingApplicationForm',
+		id : 'recyclingApplicationFormOne',
 		frame : true,
 		labelSeparator : '：',
 		bodyStyle : 'padding:5px 5px 0px 5px',
@@ -430,21 +430,26 @@
 						}
 					]
 				}],
-				buttons : [{
-					text : '取消',
+				buttons : [
+					{
+						text : '返回',
+						handler : function() {
+							canInvoiceTousseListFormWindow.close();
+							top.Ext.getCmp("recyclingApplicationWin").show();
+						}
+					},{
+					text : '关闭',
 					handler : function() {
 						//切记注意:按取消关闭window后,一定要把已选择的申请单号变量清空
+						top.Ext.getCmp("recyclingApplicationWin").show();
 						selectedInvoicePlanId = "";
 						canInvoiceTousseListFormWindow.close();
+  						closeInvoiceFormWindow();
 					}
 				}]
-			});
-
-	
-	
-	
+			});	
 	var canInvoiceTousseListFormWindow = new top.Ext.Window( {
-		id : 'recyclingApplicationWin',
+		id : 'recyclingApplicationWinOne',
 		layout : 'fit',
 		title : '发货单',
 		width : 1020,