Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r33475 -r33481
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 33475)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 33481)
@@ -2889,8 +2889,13 @@
 		},
 		listeners: {
 			beforeload: function (store, operation) {
+				var pageNow = Ext4.getCmp('pageNow').getValue();
+				var waitPackingPageSize = Ext4.getCmp('waitPackingPageSize').getValue();
 				var params = {//参数  
-					taskGroup: taskGroup
+					taskGroup: taskGroup,
+					node: 'root',
+					pageIndex: pageNow,
+					pageSize: waitPackingPageSize
 				};
 				Ext4.apply(store.proxy.extraParams, params);
 			},
@@ -2916,6 +2921,22 @@
 						}
 					}
 				});
+				var pageNow = Ext4.getCmp('pageNow').getValue();
+				var waitPackingPageSize = Ext4.getCmp('waitPackingPageSize').getValue();
+				Ext4.Ajax.request({
+					url: WWWROOT + '/disinfectSystem/packingAction!loadWaitPackingTaskPageJson.do',
+					params: { taskGroup: taskGroup, pageSize: waitPackingPageSize },
+					success: function (response, options) {
+						var result = Ext4.decode(response.responseText);
+						if (result.success) {
+							var fristIndex = ((pageNow - 1) * waitPackingPageSize) + 1;
+							var endIndex = (pageNow * waitPackingPageSize) > result.totalCount ? result.totalCount : (pageNow * waitPackingPageSize);
+							Ext4.getCmp('pagingInfo').setText('显示 ' + fristIndex + ' - ' + endIndex + ' 条，共 ' + result.totalCount + ' 条');
+							Ext4.getCmp('pagCountInfo').setText(' 共 ' + result.totalPage + ' 页');
+							Ext4.getCmp('waitPackingPageNumber').setValue(result.totalPage);
+						}
+					}
+				});
 			}
 		},
 		folderSort: true
@@ -5643,7 +5664,7 @@
 		id: 'waitPackingTreeGrid',
 		border: false,
 		columns: buildColumnTreeColumns('waitPackingTreeGrid'),
-		height: (document.body.clientHeight - 30) / 2,
+		height: (document.body.clientHeight - 22) / 2,
 		listeners: {
 			// cellclick事件改为select事件，便于selenium进行测试
 			itemclick: function (view, record, item, index, e, eOpts) {
@@ -5666,6 +5687,46 @@
 					setGridColumnsWidth(root, waitPackingTreeGrid, 'waitPackingTreeGrid');
 				}
 			},
+			render: function () {
+				//滚动加载数据
+				// $('#waitPackingTreeGrid-body .x4-tree-view').on('scroll', function (e) {
+				// 	if ((e.target.scrollTop + e.target.clientHeight >= e.target.scrollHeight)) {
+				// 		if (pageNow < waitPackingPageNumber) {
+				// 			waitPackColumnTreeGrid.getEl().mask("数据加载中...");
+				// 			setTimeout(function () {
+				// 				pageNow++;
+				// 				Ext4.Ajax.request({
+				// 					url: WWWROOT + '/disinfectSystem/packingAction!loadWaitPackingTaskJson.do',
+				// 					params: {
+				// 						taskGroup: taskGroup,
+				// 						sort: '[{ "property": "leaf", "direction": "ASC" }]',
+				// 						node: 'data',
+				// 						pageIndex: pageNow,
+				// 						pageSize: waitPackingPageSize
+				// 					},
+				// 					success: function (response, options) {
+				// 						var result = Ext4.JSON.decode(response.responseText);
+				// 						var rootNode = waitPackingTaskStore.getRootNode();
+				// 						if (result.length > 0) {
+				// 							for (var i = 0; i < result.length; i++) {
+				// 								var parentNode = addTaskNode(result[i]);
+				// 								if (result[i].children.length > 0) {
+				// 									for (var j = 0; j < result[i].children.length; j++) {
+				// 										var childNode = addTaskNode(result[i].children[j]);
+				// 										parentNode.appendChild(childNode);
+				// 									}
+				// 								}
+				// 								rootNode.appendChild(parentNode);
+				// 							}
+				// 						}
+				// 						waitPackColumnTreeGrid.getEl().unmask();
+				// 					}
+				// 				});
+				// 			}, 200);
+				// 		}
+				// 	}
+				// })
+			},
 			checkchange: function (node, checked, eOpts) {
 				if (!node.get('leaf')) {
 					Ext4.each(node.childNodes, function (pNode) {
@@ -5692,7 +5753,103 @@
 			itemcontextmenu: taskItemMenu
 		},
 		store: waitPackingTaskStore,
-		tbar: waitPackingTbar
+		tbar: waitPackingTbar,
+		bbar: [{
+			xtype: 'button',
+			text: '',
+			tooltip: "第一页",
+			cls: 'pageFirst',
+			handler: function () {
+				Ext4.getCmp('pageNow').setValue(1);
+				waitPackingTaskStore.load();
+			}
+		}, {
+			xtype: 'button',
+			text: '',
+			tooltip: "上一页",
+			cls: 'pagePrev',
+			handler: function () {
+				var pageNow = Ext4.getCmp('pageNow').getValue();
+				pageNow = parseInt(pageNow);
+				if (pageNow - 1 <= 0) {
+					return;
+				}
+				pageNow = pageNow - 1;
+				Ext4.getCmp('pageNow').setValue(pageNow);
+				waitPackingTaskStore.load();
+			}
+		}, {
+			xtype: 'label',
+			text: '第 ',
+			style: 'margin:0 5px'
+		}, {
+			xtype: 'numberfield',
+			hideTrigger: true,
+			id: 'pageNow',
+			value: 1,
+			minValue: 1,
+			width: 30,
+			enableKeyEvents: true,
+			listeners: {
+				keypress: function (that, e, eOpts) {
+					if (e.getKey() == 13) {
+						var waitPackingPageNumber = Ext4.getCmp('waitPackingPageNumber').getValue();
+						var pageNow = 1;
+						if (that.value > waitPackingPageNumber) {
+							pageNow = waitPackingPageNumber;
+						} else {
+							pageNow = that.value;
+						}
+						Ext4.getCmp('pageNow').setValue(pageNow);
+						waitPackingTaskStore.load();
+					}
+				}
+			}
+		}, {
+			xtype: 'label',
+			text: ' 页',
+			style: 'margin:0 5px'
+		}, {
+			xtype: 'label',
+			id: 'pagCountInfo'
+		}, {
+			xtype: 'button',
+			text: '',
+			cls: 'pageNext',
+			tooltip: "下一页",
+			handler: function () {
+				var pageNow = Ext4.getCmp('pageNow').getValue();
+				var waitPackingPageNumber = Ext4.getCmp('waitPackingPageNumber').getValue();
+				pageNow = parseInt(pageNow);
+				if (pageNow + 1 > waitPackingPageNumber) {
+					return;
+				}
+				pageNow = pageNow + 1;
+				Ext4.getCmp('pageNow').setValue(pageNow);
+				waitPackingTaskStore.load();
+			}
+		}, {
+			xtype: 'button',
+			text: '',
+			tooltip: "最后页",
+			cls: 'pageLast',
+			handler: function () {
+				var waitPackingPageNumber = Ext4.getCmp('waitPackingPageNumber').getValue();
+				Ext4.getCmp('pageNow').setValue(waitPackingPageNumber);
+				waitPackingTaskStore.load();
+			}
+		}, '->', {
+			xtype: 'label',
+			id: 'pagingInfo'
+		}, {
+			xtype: 'hiddenfield',
+			id: 'waitPackingPageNumber',
+			value: 10
+		}, {
+			xtype: 'hiddenfield',
+			id: 'waitPackingPageSize',
+			value: 20
+		}]
 	});
 
 	function search() {
Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
===================================================================
diff -u -r33102 -r33481
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp	(.../packingView.jsp)	(revision 33102)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp	(.../packingView.jsp)	(revision 33481)
@@ -160,6 +160,30 @@
 body {
 	overflow: hidden;
 }
+
+.pageFirst .x4-btn-icon-el {
+	width: 16px;
+    height: 16px;
+	background-image: url(${ctx}/ext-4.2.3/resources/ext-theme-green/images/grid/page-first.gif);
+}
+.pagePrev .x4-btn-icon-el {
+	width: 16px;
+    height: 16px;
+	background-image: url(${ctx}/ext-4.2.3/resources/ext-theme-green/images/grid/page-prev.gif);
+}
+.pageNext .x4-btn-icon-el {
+	width: 16px;
+    height: 16px;
+	background-image: url(${ctx}/ext-4.2.3/resources/ext-theme-green/images/grid/page-next.gif);
+}
+.pageLast .x4-btn-icon-el {
+	width: 16px;
+    height: 16px;
+	background-image: url(${ctx}/ext-4.2.3/resources/ext-theme-green/images/grid/page-last.gif);
+}
+.pageFirst,.pagePrev,.pageNext,.pageLast {
+	width: 20px;
+}
 </style>
 <!-- ImageShow 样式定义结束 -->
 <!-- alertDiv样式 -->