Index: ssts-web/src/main/webapp/disinfectsystem/instrumentInstanceManager/instrumentInstanceView.js
===================================================================
diff -u -r34674 -r34677
--- ssts-web/src/main/webapp/disinfectsystem/instrumentInstanceManager/instrumentInstanceView.js	(.../instrumentInstanceView.js)	(revision 34674)
+++ ssts-web/src/main/webapp/disinfectsystem/instrumentInstanceManager/instrumentInstanceView.js	(.../instrumentInstanceView.js)	(revision 34677)
@@ -6,9 +6,10 @@
 	udi: '',
 	instrumentBarcode: ''
 }
+var pageSize = 20;
 
 function modify(v, data) {
-	if(!SSTS_InstrumentInstanceManager_Update){
+	if (!SSTS_InstrumentInstanceManager_Update) {
 		showEditWindow(data.id);
 	}
 }
@@ -17,7 +18,7 @@
 function reloadGird(pageNum) {
 	leftStore.proxy.extraParams = {
 		pageNum: pageNum,
-		pageSize: 20
+		pageSize: pageSize
 	}
 	leftStore.reload();
 }
@@ -37,7 +38,7 @@
 				root: 'data'
 			},
 			extraParams: {
-				pageSize: 20,
+				pageSize: pageSize,
 				pageNum: 1
 			}
 		},
@@ -46,30 +47,20 @@
 			{ name: 'name' }
 		],
 		listeners: {
-			load: function (store) {
+			load: function (store, records) {
+				if (records.length > 0) {
+					var rowCount = records[0].raw.rowCount;
+					var pageCount = records[0].raw.pageCount;
+					Ext4.getCmp('pageCount').setValue(pageCount);
+					Ext4.getCmp('rowCount').setValue(rowCount);
+				}
 				var data = { 'id': '', 'name': '全部器械' };
 				leftStore.insert(0, data);
 			}
 		}
 	});
 
-	Ext4.Ajax.request({
-		url: WWWROOT + '/disinfectSystem/baseData/materialDefinitionController/loadMaterialDefinitionList.mhtml?pageSize=20&pageNum=1',
-		method: 'POST',
-		success: function (response, options) {
-			var result = Ext4.decode(response.responseText);
-			if (result) {
-				var rowCount = result.rowCount;
-				var pageCount = result.pageCount;
-				Ext4.getCmp('pageCount').setValue(pageCount);
-				Ext4.getCmp('rowCount').setValue(rowCount);
-				leftStore.loadPage(1);
-			}
-		},
-		failure: function (response, options) {
-			showResult("数据加载异常！");
-		}
-	});
+	leftStore.load();
 
 	var leftGrid = new Ext4.grid.GridPanel({
 		columns: columns,
@@ -202,7 +193,7 @@
 	var tbar = [{
 		text: '修改',
 		iconCls: 'btn_ext_application_edit',
-		hidden:SSTS_InstrumentInstanceManager_Update,
+		hidden: SSTS_InstrumentInstanceManager_Update,
 		handler: function () {
 			var records = instrumentGrid.getSelectionModel().getSelection();
 			if (records.length == 0) {
@@ -261,11 +252,36 @@
 				listStore.proxy.extraParams.materialDefinitonId = params.materialDefinitonId;
 				listStore.proxy.extraParams.udi = params.udi;
 				listStore.proxy.extraParams.instrumentBarcode = params.instrumentBarcode;
+				listStore.proxy.extraParams.pageSize = pageSize;
+				if (Ext4.getCmp('pageNowForList')) {
+					listStore.proxy.extraParams.pageNum = Ext4.getCmp('pageNowForList').getValue();
+				} else {
+					listStore.proxy.extraParams.pageNum = 1;
+				}
+			},
+			load: function (store, records) {
+				if (records.length > 0) {
+					var rowCount = records[0].raw.rowCount;
+					var pageCount = records[0].raw.pageCount;
+					var pageNum = 1;
+					if (Ext4.getCmp('pageNowForList')) {
+						pageNum = Ext4.getCmp('pageNowForList').getValue();
+					}
+					var fristIndex = ((pageNum - 1) * pageSize) + 1;
+					var endIndex = (pageNum * pageSize > rowCount) ? rowCount : pageNum * pageSize;
+					Ext4.getCmp('pagCountInfo').setText('，共 ' + pageCount + ' 页');
+					Ext4.getCmp('pagingInfo').setText('显示 ' + fristIndex + ' - ' + endIndex + '，共 ' + rowCount + ' 条');
+					Ext4.getCmp('rowCountForList').setValue(rowCount);
+					Ext4.getCmp('pageCountForList').setValue(pageCount);
+				} else {
+					Ext4.getCmp('pagCountInfo').setText('');
+					Ext4.getCmp('pagingInfo').setText('没数据');
+				}
 			}
 		}
 	});
 
-	listStore.loadPage(1);
+	listStore.load()
 
 	instrumentGrid = new Ext4.grid.GridPanel({
 		title: '器械实例列表',
@@ -275,11 +291,99 @@
 		store: listStore,
 		tbar: tbar,
 		height: Ext4.getBody().dom.clientHeight - 85,
-		dockedItems: [{
-			xtype: 'pagingtoolbar',
-			store: listStore,   // same store GridPanel is using  
-			dock: 'bottom',
-			displayInfo: true
+		bbar: [{
+			xtype: 'button',
+			text: '',
+			tooltip: "第一页",
+			cls: 'pageFirst',
+			handler: function () {
+				Ext4.getCmp('pageNowForList').setValue(1);
+				listStore.load();
+			}
+		}, {
+			xtype: 'button',
+			text: '',
+			tooltip: "上一页",
+			cls: 'pagePrev',
+			handler: function () {
+				var pageNowForList = Ext4.getCmp('pageNowForList').getValue();
+				pageNowForList = parseInt(pageNowForList);
+				if (pageNowForList - 1 <= 0) {
+					return;
+				}
+				pageNowForList = pageNowForList - 1;
+				Ext4.getCmp('pageNowForList').setValue(pageNowForList);
+				listStore.load();
+			}
+		}, {
+			xtype: 'label',
+			text: '第 ',
+			style: 'margin:0 5px'
+		}, {
+			xtype: 'numberfield',
+			hideTrigger: true,
+			id: 'pageNowForList',
+			value: 1,
+			minValue: 1,
+			width: 30,
+			enableKeyEvents: true,
+			listeners: {
+				keypress: function (that, e, eOpts) {
+					if (e.getKey() == 13) {
+						var pageCountForList = Ext4.getCmp('pageCountForList').getValue();
+						var pageNowForList = 1;
+						if (that.value > pageCountForList) {
+							pageNowForList = pageCountForList;
+						} else {
+							pageNowForList = that.value;
+						}
+						Ext4.getCmp('pageNowForList').setValue(pageNowForList);
+						listStore.load();
+					}
+				}
+			}
+		}, {
+			xtype: 'label',
+			text: ' 页',
+			style: 'margin:0 5px'
+		}, {
+			xtype: 'label',
+			id: 'pagCountInfo'
+		}, {
+			xtype: 'button',
+			text: '',
+			cls: 'pageNext',
+			tooltip: "下一页",
+			handler: function () {
+				var pageNowForList = Ext4.getCmp('pageNowForList').getValue();
+				var pageCountForList = Ext4.getCmp('pageCountForList').getValue();
+				pageNowForList = parseInt(pageNowForList);
+				if (pageNowForList + 1 > pageCountForList) {
+					return;
+				}
+				pageNowForList = pageNowForList + 1;
+				Ext4.getCmp('pageNowForList').setValue(pageNowForList);
+				listStore.load();
+			}
+		}, {
+			xtype: 'button',
+			text: '',
+			tooltip: "最后页",
+			cls: 'pageLast',
+			handler: function () {
+				var pageCountForList = Ext4.getCmp('pageCountForList').getValue();
+				Ext4.getCmp('pageNowForList').setValue(pageCountForList);
+				listStore.load();
+			}
+		}, '->', {
+			xtype: 'label',
+			id: 'pagingInfo'
+		}, {
+			xtype: 'hidden',
+			id: 'pageCountForList'
+		}, {
+			xtype: 'hidden',
+			id: 'rowCountForList'
 		}],
 		viewConfig: {
 			autoFill: true