Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
===================================================================
diff -u -r25793 -r25796
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 25793)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 25796)
@@ -14,6 +14,7 @@
 var goodsInfo;
 var sendOutAbnormalGoodsStore;//异常物品列表参数
 var allBarcodeArr = [];//异常物品列表参数
+var invoiceFormWindowTwo;
 var wareHouseStore = new Ext.data.Store({
 	proxy : new Ext.data.HttpProxy({
 		url : WWWROOT + '/disinfectSystem/baseData/wareHouseAction!getWareHouseData.do',
@@ -1363,7 +1364,7 @@
  */
 var invoicePlanFormOpened = false;
 var g_orgUnitCoding = '';
-function addAndEditInvoicePlan(orgUnitCoding,depart,invoicePlanId) {	
+function addAndEditInvoicePlan(orgUnitCoding,depart,invoicePlanId) {
 	//发货计划
 	if(invoicePlanFormOpened){
 		return;
@@ -1739,19 +1740,11 @@
 			closeInvoiceFormWindow();
 		}
 	}
-	function closeInvoiceFormWindow(){
-		if(invoiceFormWindow){
-			selectedInvoicePlanId = "";
-			invoiceFormWindow.close();
-			invoiceFormWindow = null;
-			v_callback_yes = null;
-			v_callback_no = null;
-		}
-	}
+	
 	v_callback_yes = callback_yes;
 	v_callback_no = callback_no;
 	var barcodeBtn = new BarcodeBtn(function(){callback_yes();},function(){callback_no();});
-	var form = new top.Ext.FormPanel({
+	form = new top.Ext.FormPanel({
 		id : 'recyclingApplicationForm',
 		frame : true,
 		region: 'center',
@@ -2418,7 +2411,7 @@
 		}, {
 			text : '待发物品',
 			handler : function() {
-				closeInvoiceFormWindow();
+				top.Ext.getCmp("recyclingApplicationWin").hide();
 				openCanInvoiceTousseListForm(orgUnitCoding,depart,invoicePlanId);
 			}
 		}]
@@ -2657,7 +2650,7 @@
 				}
 		]
 	});
-	var invoiceFormWindow = new top.Ext.Window( {
+	invoiceFormWindowTwo = new top.Ext.Window( {
 		id : 'recyclingApplicationWin',
 		layout : 'border',
 		title : '发货单',
@@ -2672,14 +2665,14 @@
 	});
 	
 	
-	invoiceFormWindow.on('close',function(w){
+	invoiceFormWindowTwo.on('close',function(w){
 		//切记注意:按取消关闭window后,一定要把已选择的申请单号变量清空
 		selectedInvoicePlanId = "";
 		invoicePlanFormOpened = false;
 		top.getCurrentTab().focus();
 	});
 	 
-	invoiceFormWindow.show();
+	invoiceFormWindowTwo.show();
 	if(top.Ext.getCmp("sendOutGoodsDetail")){
 		top.Ext.getCmp("sendOutGoodsDetail").getEl().mask("加载中,请稍候...");
 	}
@@ -2830,4 +2823,13 @@
 		tousse.sendAmount = 1;
 		submitItems.push(tousse);
 	}
-}
\ No newline at end of file
+}
+function closeInvoiceFormWindow(){
+	if(invoiceFormWindowTwo){
+		selectedInvoicePlanId = "";
+		invoiceFormWindowTwo.close();
+		invoiceFormWindowTwo = null;
+		v_callback_yes = null;
+		v_callback_no = null;
+	}
+}