Index: ssts-web/src/main/webapp/disinfectsystem/invoice/customInvoiceForm.js
===================================================================
diff -u -r29602 -r29604
--- ssts-web/src/main/webapp/disinfectsystem/invoice/customInvoiceForm.js	(.../customInvoiceForm.js)	(revision 29602)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/customInvoiceForm.js	(.../customInvoiceForm.js)	(revision 29604)
@@ -664,7 +664,7 @@
 		labelSeparator : '：',
 		bodyStyle : 'padding:5px 5px 0px 5px',
 		width : 1020,
-		autoHeight : true,
+		autoHeight:true,
 		autoScroll : true,
 		labelAlign:'right',
 		layout : 'form',
@@ -1031,7 +1031,7 @@
 								columnWidth : 0.5,
 								cm : cm,
 								width : top.screen.width < 1280 ? top.screen.width*0.57-25 : 680,
-								height : top.screen.height < 864 ? windowH-220  : 475,
+								height : top.screen.height < 864 ? windowH-240  : 455,
 								autoExpandColumn : 'deleteItem',
 								enableHdMenu : false,
 								frame : false,
@@ -1178,7 +1178,7 @@
 								cm : recyclingapplicationCm,
 								enableHdMenu : false,
 								width : top.screen.width < 1280 ? top.screen.width*0.43-20 : 560,
-								height : top.screen.height < 864 ? windowH-220 : 475,
+								height : top.screen.height < 864 ? windowH-240 : 455,
 								loadMask : true,
 								tbar:[{
 									text:'发货汇总'
@@ -1309,6 +1309,7 @@
 		layout : 'fit',
 		title : '发货单',
 		width : top.screen.width < 1280 ? windowW : 1280,
+		height:currentHeight,
 		border : false,
 		modal : true,
 		plain : true,