Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r28577 -r28589
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 28577)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 28589)
@@ -4530,14 +4530,14 @@
     			id: 'packingViewTab0',
             	title: ' 待装配任务  ',
             	layout: 'border',
-            	height : window.screen.height,
+            	height : document.body.clientHeight,
  	            items: [{
-					    region: 'west',
-					    margin: '0 0 0 0',
-					    width : '42%',
-					    items: [basketColumnTreeGrid,waitPackColumnTreeGrid]
-					},formPanel
-					,materialGrid
+					region: 'west',
+					margin: '0 0 0 0',
+					width : '42%',
+					height : document.body.clientHeight,
+					items: [basketColumnTreeGrid,waitPackColumnTreeGrid]
+				},formPanel,materialGrid
  	            ]
     		},{
     			id: 'packingViewTab1',