Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
===================================================================
diff -u -r33460 -r33492
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 33460)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 33492)
@@ -21,6 +21,21 @@
 var form;
 var tousseGroupName = "";
 var tousseGroupIds = null;
+//发货单
+var showInvoiceAssistantSender = getSystemSetConfig('showInvoiceAssistantSender',true);
+var showInvoicePersonInCharge = getSystemSetConfig('showInvoicePersonInCharge',true);
+var height = 730;
+if(showInvoiceAssistantSender || showInvoicePersonInCharge){
+	height += 40;
+}
+var recyclingApplicationWinWidth = windowW < 1280 ? windowW-4 : 1280;
+var recyclingApplicationWinHeight = windowH < 864 ?  windowH-20 : height;
+//条码列表
+var sendOutGoodsWidth = windowW < 1280 ? windowW*0.57-50 : 660;
+var sendOutGoodsHeight = windowH < 864 ?  windowH-300  : 475;
+//发货单明细
+var sendOutGoodsDetailWidth = windowW < 1280 ? windowW*0.43 : 546;
+var sendOutGoodsDetailHeight = windowH < 864 ? windowH-300  : 475;
 //发货单窗口的申请单下拉框的参数
 var tousseGroupIdsForApplyList = null;
 var selectedSterilingMethodsForApplyList = null;
@@ -2466,8 +2481,8 @@
 						store : sendOutGoodsStore1,
 						columnWidth : 0.5,
 						cm : sendOutGoodsColumnModel,
-						width : windowW < 1280 ? windowW*0.57-50 : 660,
-						height : windowH < 864 ?  windowH-232  : 475,
+						width : sendOutGoodsWidth,
+						height : sendOutGoodsHeight,
 						autoExpandColumn : 'deleteItem',
 						enableHdMenu : false,
 						frame : false,
@@ -2798,8 +2813,8 @@
 				store : recyclingapplicationStore1,
 				cm : recyclingapplicationCm,
 				enableHdMenu : false,
-				width : windowW < 1280 ? windowW*0.43 : 546,
-				height : windowH < 864 ? windowH-232  : 475,
+				width : sendOutGoodsDetailWidth,
+				height : sendOutGoodsDetailHeight,
 				loadMask : true,
 				tbar:[{
 					text:'<b>申请单:</b>',
@@ -3196,19 +3211,14 @@
 				}
 		]
 	});
-	var showInvoiceAssistantSender = getSystemSetConfig('showInvoiceAssistantSender',true);
-	var showInvoicePersonInCharge = getSystemSetConfig('showInvoicePersonInCharge',true);
-	var height = 730;
-	if(showInvoiceAssistantSender || showInvoicePersonInCharge){
-		height += 40;
-	}
+
 	invoiceFormWindowTwo = new top.Ext.Window( {
 		id : 'recyclingApplicationWin',
 		layout : 'border',
 		title : '发货单',
 		resizable: false,
-		width : windowW < 1280 ? windowW-4 : 1280,
-		height : windowH < 864 ?  windowH : height,
+		width : recyclingApplicationWinWidth,
+		height : recyclingApplicationWinHeight,
 		border : false,
 		modal : true,
 		plain : true,