Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js =================================================================== diff -u -r32070 -r32104 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js (.../invoicePlanExtractedForm.js) (revision 32070) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js (.../invoicePlanExtractedForm.js) (revision 32104) @@ -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 : currentHeight-210, + height : windowH < 864 ? windowH-232 : 475, autoExpandColumn : 'deleteItem', enableHdMenu : false, frame : false, @@ -3156,7 +3156,7 @@ title : '发货单', resizable: false, width : windowW < 1280 ? windowW-4 : 1280, - height : currentHeight, + height : windowH < 864 ? windowH : 730, border : false, modal : true, plain : true,