Index: ssts-web/src/main/webapp/homepage/supplyRoomOperate.js
===================================================================
diff -u -r28729 -r28872
--- ssts-web/src/main/webapp/homepage/supplyRoomOperate.js	(.../supplyRoomOperate.js)	(revision 28729)
+++ ssts-web/src/main/webapp/homepage/supplyRoomOperate.js	(.../supplyRoomOperate.js)	(revision 28872)
@@ -63,7 +63,7 @@
 var tousseInvoiceGridTotalAmount = 0;
 var disposableInvoiceGridTotalAmount = 0;
 
-function loadData(loadType,pageIndex) {
+function loadData(loadType,pageIndex,pageSize) {
 	var newPageIndex = pageIndex || 1;
 	var goodName = $Id('goodsSearch').value;
 	var tousseType = $Id('tousseType').value;
@@ -95,7 +95,7 @@
 		department: department,
 		tousseGroupName: tousseGroupName,
 		comboTousseType: comboTousseType,
-		pageSize:10,
+		pageSize:pageSize || 10,
 		pageIndex:newPageIndex || 1,
 		queryTotalAmount:(newPageIndex == 1)?true:false
 	};
@@ -193,7 +193,7 @@
 			}
 		}
 		if(queryParam.pageIndex == 1){
-			var totalAmount = store.root.childNodes[0].attributes.totalAppAmount || store.root.childNodes[0].attributes.totalAmount;
+			var totalAmount = store.root.childNodes[0].attributes.totalAppAmount || store.root.childNodes[0].attributes.totalAmount || 0;
 			var totalRecyclingAmount = store.root.childNodes[0].attributes.totalRecyclingAmount || 0;
 			var totalSendOutAmount = store.root.childNodes[0].attributes.totalSendOutAmount || 0;
 			var totalUrgentAmount = store.root.childNodes[0].attributes.totalUrgentAmount || 0;
@@ -448,6 +448,26 @@
 		]
 	});
 
+	var pageSizeStore = new Ext.data.SimpleStore({
+		fields: ['key', 'value'],
+		data: [
+			['10', '10'], 
+			['20', '20'], 
+			['30', '30'], 
+			['50', '50'], 
+			['100', '100'], 
+			['200', '200'], 
+			['300', '300'], 
+			['400', '400'], 
+			['500', '500'],
+			['600', '600'],
+			['700', '700'],
+			['800', '800'],
+			['900', '900'],
+			['1000', '1000']
+		]
+	});
+
 	var supplyRoomRecord = Ext.data.Record.create([
 		{ name: 'departCode', type: 'string' },
 		{ name: 'name', type: 'string' }
@@ -1063,7 +1083,8 @@
 				listeners: {
 				   'click': function() {
 						Ext.getCmp(gridId+'_inputId').setValue(1);
-						loadData(gridId,1);
+						var pageSize = Ext.getCmp(gridId+'_selectId').getValue();
+						loadData(gridId,1,pageSize);
 				   }
 				}
 			},
@@ -1077,7 +1098,8 @@
 					   if(index > 1){
 							index -= 1;
 							Ext.getCmp(gridId+'_inputId').setValue(index);
-							loadData(gridId,index);
+							var pageSize = Ext.getCmp(gridId+'_selectId').getValue();
+							loadData(gridId,index,pageSize);
 					   }
 				   }
 				}
@@ -1097,7 +1119,8 @@
 					specialKey: function(obj, evt){
 						if (evt.getKey() == Ext.EventObject.RETURN){
 							var value = this.getValue();
-							loadData(gridId,value);
+							var pageSize = Ext.getCmp(gridId+'_selectId').getValue();
+							loadData(gridId,value,pageSize);
 						}
 					}
 				}
@@ -1125,9 +1148,10 @@
 						}else if(gridId == 'disposableInvoiceGrid'){
 							totalAmount = disposableInvoiceGridTotalAmount;
 						}
-						if(totalAmount/10 > index){
+						var pageSize = Ext.getCmp(gridId+'_selectId').getValue();
+						if(totalAmount/pageSize > index){
 							Ext.getCmp(gridId+'_inputId').setValue(index+1);
-							loadData(gridId,index+1);
+							loadData(gridId,index+1,pageSize);
 						}
 					}
 				}
@@ -1154,9 +1178,10 @@
 						}else if(gridId == 'disposableInvoiceGrid'){
 							totalAmount = disposableInvoiceGridTotalAmount;
 						}
-						var index = Math.ceil(totalAmount/10);
+						var pageSize = Ext.getCmp(gridId+'_selectId').getValue();
+						var index = Math.ceil(totalAmount/pageSize);
 						Ext.getCmp(gridId+'_inputId').setValue(index);
-						loadData(gridId,index);
+						loadData(gridId,index,pageSize);
 					}
 				}
 			},'-',{
@@ -1166,9 +1191,29 @@
 				listeners: {
 				   'click': function() {
 						Ext.getCmp(gridId+'_inputId').setValue(1);
-						loadData(gridId,1);
+						var pageSize = Ext.getCmp(gridId+'_selectId').getValue();
+						loadData(gridId,1,pageSize);
 				   }
 				}
+			},'-',{
+				xtype: 'combo',
+				id: gridId+'_selectId',
+				valueField: 'key',
+				displayField: 'value',
+				store: pageSizeStore,
+				value:'10',
+				forceSelection: true,
+				editable: false,
+				mode: 'local',
+				triggerAction: 'all',
+				anchor: '95%',
+				width:50,
+				listeners: {
+					select: function (store, record) {
+						var pageSize = record.data.value;
+						loadData(gridId,1,pageSize);
+					}
+				}
 			}
 		]
 		return pageBar;