Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r37802 -r37965
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 37802)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 37965)
@@ -3445,13 +3445,18 @@
 
 	var selModel = top.Ext4.create('top.Ext4.selection.CheckboxModel');
 
+	var collapsed = sessionStorage.getItem('collapsed') || false;
+
 	var materialGrid = new Ext4.grid.Panel({
 		id: 'materialGrid',
 		store: materialStore,
 		height: document.body.clientHeight - 20,
 		region: 'east',
 		margin: '0 0 0 0',
 		width: '24%',
+		floatable: false,
+		collapsible: true,
+		collapsed: collapsed,
 		selModel: selModel,
 		tbar: [{
 			xtype: 'button',
@@ -3551,6 +3556,12 @@
 			},
 			afterrender: function (grid) {
 				grid.getView().getHeaderAtIndex(0).hide();
+			},
+			collapse : function(deep){
+				sessionStorage.setItem('collapsed',true);
+			},
+			expand: function(deep){
+				sessionStorage.setItem('collapsed',false);
 			}
 		}
 	});
@@ -3569,7 +3580,39 @@
 				};
 			}
 		}
-	}), {
+	}), "-", {
+		text: '一键展开',
+		id:'waitPackingTreeExpandAll',
+		handler: function () {
+			var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
+			waitPackingTreeGrid.expandAll();
+			Ext4.getCmp('waitPackingTreeExpandAll').hide();
+			Ext4.getCmp('waitPackingTreeCollapseAll').show();
+		}
+	}, {
+		text: '一键折叠',
+		id:'waitPackingTreeCollapseAll',
+		hidden:true,
+		handler: function () {
+			var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
+			waitPackingTreeGrid.collapseAll();
+			Ext4.getCmp('waitPackingTreeExpandAll').show();
+			Ext4.getCmp('waitPackingTreeCollapseAll').hide();
+		}
+	}, "-", {
+		text: '清除已选',
+		handler: function () {
+			var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
+			var selNodes = waitPackingTreeGrid.getView().getChecked();
+			Ext4.each(selNodes, function (pNode) {
+				pNode.set('checked', false);
+				Ext4.each(pNode.childNodes, function (node) {
+					node.set('checked', false);
+				})
+			});
+			Ext4.getCmp('checkAllWaitPackingTaskNode').setValue(false);
+		}
+	}, {
 		text: '刷新',
 		iconCls: 'btn_ext_refresh1',
 		handler: function () {
@@ -6883,7 +6926,39 @@
 					};
 				}
 			}
-		}), '-',
+		}), "-", {
+			text: '一键展开',
+			id:'basketTreeExpandAll',
+			handler: function () {
+				var basketTreeGrid = Ext4.getCmp('basketTreeGrid');
+				basketTreeGrid.expandAll();
+				Ext4.getCmp('basketTreeExpandAll').hide();
+				Ext4.getCmp('basketTreeCollapseAll').show();
+			}
+		}, {
+			text: '一键折叠',
+			id:'basketTreeCollapseAll',
+			hidden:true,
+			handler: function () {
+				var basketTreeGrid = Ext4.getCmp('basketTreeGrid');
+				basketTreeGrid.collapseAll();
+				Ext4.getCmp('basketTreeExpandAll').show();
+				Ext4.getCmp('basketTreeCollapseAll').hide();
+			}
+		}, "-", {
+			text: '清除已选',
+			handler: function () {
+				var basketTreeGrid = Ext4.getCmp('basketTreeGrid');
+				var selNodes = basketTreeGrid.getView().getChecked();
+				Ext4.each(selNodes, function (pNode) {
+					pNode.set('checked', false);
+					Ext4.each(pNode.childNodes, function (node) {
+						node.set('checked', false);
+					})
+				});
+				Ext4.getCmp('checkAllTaskNode').setValue(false);
+			}
+		}, '-',
 		{
 			text: '打印分组类型:'
 		},
@@ -7376,7 +7451,7 @@
 			id: 'packingViewTab0',
 			title: ' 待装配任务  ',
 			layout: 'border',
-			height: document.body.clientHeight,
+			height: document.body.clientHeight-22,
 			items: [{
 				region: 'west',
 				margin: '0 0 0 0',