Index: ssts-web/src/main/webapp/disinfectsystem/showTousseImage/ext4ShowTousseImage.js
===================================================================
diff -u -r32823 -r32829
--- ssts-web/src/main/webapp/disinfectsystem/showTousseImage/ext4ShowTousseImage.js	(.../ext4ShowTousseImage.js)	(revision 32823)
+++ ssts-web/src/main/webapp/disinfectsystem/showTousseImage/ext4ShowTousseImage.js	(.../ext4ShowTousseImage.js)	(revision 32829)
@@ -1,5 +1,16 @@
 //展示器械包信息
-function getAndShowTousseInfoDiv(tousseName, tousseDefinitionId, imageType) {
+function getAndShowTousseInfoDiv(tousseName, tousseDefinitionId, imageType, page) {
+	console.log(imageType)
+	var hiddenGrid = false;
+	var winWidth = 800;
+	var winHeight = 380;
+	var title = tousseName + '信息';
+	if (imageType == '一次性物品图片') {
+		hiddenGrid = true;
+		winWidth = 800;
+		winHeight = 524;
+		title = '【' + tousseName + '】图片';
+	}
 	var objectId = tousseDefinitionId;
 	var objectName = tousseName;
 	var curPage = 0;
@@ -47,6 +58,15 @@
 			++curPage;
 			loadCurrentImage();
 		}
+	}, {
+		text: '全屏',
+		handler: function () {
+			if(tousseDefinitionId == '' || curPage == 0){
+				showResult('图片不存在');
+				return;
+			}
+			openFullSizeWindowWithName(WWWROOT + '/disinfectsystem/touchScreen/recycle/showFullImg.jsp?page=' + curPage + '&count=' + totalPage + '&objId=' + tousseDefinitionId + '&tousseName=' + encodeURIComponent(tousseName) + '&imageType=' + encodeURIComponent(imageType), true, '全屏显示图片');
+		}
 	}];
 
 	var imagePanel = new top.Ext4.Panel({
@@ -94,7 +114,7 @@
 			return '';
 		}
 	}
-	function loadImageCount() {
+	function loadImageCount(page) {
 		clearImage();
 		Ext.Ajax.request({
 			url: WWWROOT + "/disinfectSystem/baseData/showImageAction!getToussePictureAmount.do",
@@ -109,7 +129,7 @@
 				totalPage = parseInt(pageJson.count);
 				curPage = 0;
 				if (totalPage > 0) {
-					curPage = 1;
+					curPage = page || 1;
 				}
 				var element = top.Ext4.get(toolbarTotalPage.el);
 				element.update('共' + totalPage + '页');
@@ -187,9 +207,9 @@
 
 	var window = new top.Ext4.Window({
 		id: 'packageImg',
-		title: tousseName + '信息',
-		width: 800,
-		height: 380,
+		title: title,
+		width: winWidth,
+		height: winHeight,
 		border: false,
 		autoScroll: true,
 		layout: 'border',
@@ -198,20 +218,23 @@
 			region: 'center',
 			layout: 'fit',
 			width: '30%',
+			hidden: hiddenGrid,
 			items: materialGrid
 		}, {
 			region: 'west',
 			layout: 'fit',
-			width: '70%',
+			width: hiddenGrid ? '100%' : '70%',
 			items: imagePanel
 		}]
 	});
-	//材料
-	top.Ext4.getCmp('materialGrid').setTitle('[' + tousseName + '] 包含的材料');
-	materialStore.on("beforeload", function (store, operation, eOpts) {
-		store.proxy.extraParams["tousseName"] = tousseName;
-	});
-	materialStore.load();
+	if (!hiddenGrid) {
+		//材料
+		top.Ext4.getCmp('materialGrid').setTitle('[' + tousseName + '] 包含的材料');
+		materialStore.on("beforeload", function (store, operation, eOpts) {
+			store.proxy.extraParams["tousseName"] = tousseName;
+		});
+		materialStore.load();
+	}
 	window.show();
-	loadImageCount();
+	loadImageCount(page);
 }
\ No newline at end of file