Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
===================================================================
diff -u -r32061 -r32070
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 32061)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 32070)
@@ -2063,7 +2063,7 @@
 			closeInvoiceFormWindow();
 		}
 	}
-	
+	var currentHeight = windowH < 864 ?  windowH : 730;	
 	v_callback_yes = callback_yes;
 	v_callback_no = callback_no;
 	barcodeBtn = new BarcodeBtn(function(){callback_yes();},function(){callback_no();});
@@ -2421,7 +2421,7 @@
 						columnWidth : 0.5,
 						cm : sendOutGoodsColumnModel,
 						width : windowW < 1280 ? windowW*0.57-50 : 660,
-						height : windowH < 864 ?  windowH-232  : 475,
+						height : currentHeight-210,
 						autoExpandColumn : 'deleteItem',
 						enableHdMenu : false,
 						frame : false,
@@ -3001,7 +3001,6 @@
 					})
 				]
 		});
-		
 	
 	var invoicePlan_form = new top.Ext.FormPanel({
 		id : 'invoicePlan_recyclingApplicationForm',
@@ -3157,7 +3156,7 @@
 		title : '发货单',
 		resizable: false,
 		width : windowW < 1280 ? windowW-4 : 1280,
-		height : windowH < 864 ?  windowH : 730,
+		height : currentHeight,
 		border : false,
 		modal : true,
 		plain : true,
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/customInvoiceForm.js
===================================================================
diff -u -r32061 -r32070
--- ssts-web/src/main/webapp/disinfectsystem/invoice/customInvoiceForm.js	(.../customInvoiceForm.js)	(revision 32061)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/customInvoiceForm.js	(.../customInvoiceForm.js)	(revision 32070)
@@ -708,6 +708,12 @@
 		doCancelAction();
 	}
 	var barcodeBtn = new BarcodeBtn(function(){callback_yes();},function(){callback_no();});
+	var currentHeight;
+	if(!getSystemSetConfig('showInvoiceAssistantSender',true)){
+		currentHeight = top.screen.height < 854 ? windowH-10 : 690;
+	}else {
+		currentHeight = top.screen.height < 864 ? windowH+10 : 710;
+	}
 	var form = new top.Ext.FormPanel({
 		id : 'recyclingApplicationForm',
 		frame : true,
@@ -1115,7 +1121,7 @@
 								columnWidth : 0.5,
 								cm : cm,
 								width : top.screen.width < 1280 ? top.screen.width*0.57-25 : 680,
-								height : top.screen.height < 864 ? windowH-250  : 445,
+								height : currentHeight-210,
 								autoExpandColumn : 'deleteItem',
 								enableHdMenu : false,
 								frame : false,
@@ -1382,12 +1388,6 @@
 	if(getSystemSetConfig('rememberLastInvoiceAssistantSender',false) && cookieAssistantSender){
 		top.Ext.getCmp('assistantSender').setValue(cookieAssistantSender);
 	}
-	var currentHeight;
-	if(!getSystemSetConfig('showInvoiceAssistantSender',true)){
-		currentHeight = top.screen.height < 854 ? windowH-10 : 690;
-	}else {
-		currentHeight = top.screen.height < 864 ? windowH+10 : 710;
-	}
 	var window = new top.Ext.Window( {
 		id : 'recyclingApplicationWin',
 		layout : 'fit',
Index: ssts-web/src/main/webapp/common/audio/beep.wav
===================================================================
diff -u
Binary files differ