Index: ssts-web/src/main/webapp/disinfectsystem/showTousseImage/ext4ShowTousseImage.js
===================================================================
diff -u -r14941 -r15249
--- ssts-web/src/main/webapp/disinfectsystem/showTousseImage/ext4ShowTousseImage.js	(.../ext4ShowTousseImage.js)	(revision 14941)
+++ ssts-web/src/main/webapp/disinfectsystem/showTousseImage/ext4ShowTousseImage.js	(.../ext4ShowTousseImage.js)	(revision 15249)
@@ -1,13 +1,15 @@
 //展示器械包信息
 function getAndShowTousseInfoDiv(tousseName,tousseDefinitionId) {
 	
-	var materialId = null;
-	var materialName = '';
-	var curMaterialPage = 0;
-	var materialTotalPage = 0;
-	var curTousseDefinitionImagePage = 0;
-	var tousseDefinitionImageTotalPage = 0;
-	var curImageType = '器械包';
+	var objectId = tousseDefinitionId;
+	var objectName = tousseName;
+	var curPage = 0;
+	var totalPage = 0;
+	var IMAGE_TYPE_TOUSSE = "器械包图片";
+	var IMAGE_TYPE_MATERIAL = "材料图片";
+	var IMAGE_TYPE_SPECIFICATION = "器械包说明书";
+	var curImageType = IMAGE_TYPE_TOUSSE;
+	
 	var toolbarPage = new top.Ext4.Toolbar.TextItem({
 		text : '第0页'
 	});
@@ -17,59 +19,31 @@
 	var img_tbar = [ {
 		text : '上一张',
 		handler : function() {
-			if(curImageType == '器械包'){
-				if(tousseDefinitionImageTotalPage == 0){
-					showResult('没有图片');
-					return;
-				}
-				if (curTousseDefinitionImagePage <= 1) {
-					showResult('已是第一页');
-					return;
-				}
-				--curTousseDefinitionImagePage;
-				loadCurrentTousseDefinitionImage(tousseDefinitionId,tousseName);
-			}else{
-				if(materialTotalPage == 0){
-					showResult('没有图片');
-					return;
-				}
-				if (curMaterialPage <= 1) {
-					showResult('已是第一页');
-					return;
-				}
-				--curMaterialPage;
-				loadCurrentMaterialImage(materialId,materialName);
+			if(totalPage == 0){
+				showResult('没有图片');
+				return;
 			}
-			
+			if (curPage <= 1) {
+				showResult('已是第一页');
+				return;
+			}
+			--curPage;
+			loadCurrentImage();
 		}
 	},toolbarPage,
 	toolbarTotalPage,{
 		text : '下一张',
 		handler : function() {
-			if(curImageType == '器械包'){
-				if(tousseDefinitionImageTotalPage == 0){
-					showResult('没有图片');
-					return;
-				}
-				if (curTousseDefinitionImagePage + 1 > tousseDefinitionImageTotalPage) {
-					showResult('已是最后一页');
-					return;
-				}
-				++curTousseDefinitionImagePage;
-				loadCurrentTousseDefinitionImage(tousseDefinitionId,tousseName);
-			}else{
-				if(materialTotalPage == 0){
-					showResult('没有图片');
-					return;
-				}
-				if (curMaterialPage + 1 > materialTotalPage) {
-					showResult('已是最后一页');
-					return;
-				}
-				++curMaterialPage;
-				loadCurrentMaterialImage(materialId,materialName);
+			if(totalPage == 0){
+				showResult('没有图片');
+				return;
 			}
-			
+			if (curPage + 1 > totalPage) {
+				showResult('已是最后一页');
+				return;
+			}
+			++curPage;
+			loadCurrentImage();
 		}
 	}];
 	
@@ -85,123 +59,63 @@
 		    id : 'browseImage',
 		    fieldLabel : "预览图片",
 		    src : Ext4.BLANK_IMAGE_URL
-		    /*
-		    autoEl : {
-				id : 'imageBrowse',
-				tag : 'img',
-				src : Ext4.BLANK_IMAGE_URL,
-				style : 'filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod=scale);',
-				complete : 'off'
-		    }
-		    */
 		}]
 	});
 	
-	function loadMaterialImage(id,name){
-		top.Ext4.getCmp('imagePanel').setTitle('材料[' + name + '] 图片');
-		var url = WWWROOT + '/disinfectSystem/baseData/materialDefinitionAction!getImage.do?id='+id+'&materialName='+name+'&number='+1;
+	function loadCurrentImage(){
 		var image = top.Ext4.getCmp('browseImage');
-		image.setSrc('');
+
+		var url = WWWROOT + '/disinfectSystem/baseData/showImageAction!getToussePic.do?id=' + objectId 
+		+ '&page=' + curPage + '&imageType=' + curImageType +'&time='+new Date();
 		image.setSrc(url);// 覆盖原来的图片  
-	}
-	function loadMaterialImage2(id,name){
-		clearMaterialImage(id,name);
-		Ext.Ajax.request({
-			url : WWWROOT + '/disinfectSystem/baseData/materialDefinitionAction!getTousseUploadPicTotalPage.do',
-			params : {
-				id : id
-			},
-			success : function(result){
-				materialId =id;
-				materialName = name;
-				top.Ext4.getCmp('imagePanel').setTitle('材料[' + name + '] 图片');
-				curImageType = '材料';
-				var pageStr = result.responseText;
-				materialTotalPage = parseInt(pageStr);
-				curMaterialPage = 0;
-				if(materialTotalPage > 0){
-					curMaterialPage = 1;
-				}
-				var element = top.Ext4.get(toolbarTotalPage.el);
-			    element.update('共' + materialTotalPage + '页');
-			    loadCurrentMaterialImage(id,name);
-			},
-			failure : function(){
-				loadCurrentMaterialImage(id,name);
-			}
-		});
-	}
-	function loadCurrentMaterialImage(id,name){
-		var image = top.Ext4.getCmp('browseImage');
-		image.setSrc('');
-		if(curMaterialPage > 0){
-//			var url = WWWROOT + '/disinfectSystem/baseData/materialDefinitionAction!getImage.do?id='+id+'&materialName='+name+'&number='+curMaterialPage;
-			var url = WWWROOT + '/disinfectSystem/baseData/materialDefinitionAction!getToussePic.do?id=' + id + '&page=' + curMaterialPage +'&time='+new Date();;
-			image.setSrc(url);// 覆盖原来的图片  
-		}
+		
 		var element = top.Ext4.get(toolbarPage.el);
-	    element.update('第' + curMaterialPage + '页');
-	}
-	
-	function clearMaterialImage(id,name){
-		materialTotalPage = 0;
-		curMaterialPage = 0;
+	    element.update('第' + curPage + '页');
+	}	
+	function clearImage(){
+		totalPage = 0;
+		curPage = 0;
 		var image = top.Ext4.getCmp('browseImage');
 		image.setSrc('');
 		var element = top.Ext4.get(toolbarTotalPage.el);
-	    element.update('共' + materialTotalPage + '页');
+	    element.update('共' + totalPage + '页');
 		var element2 = top.Ext4.get(toolbarPage.el);
-	    element2.update('第' + curMaterialPage + '页');
+	    element2.update('第' + curPage + '页');
 	}
-	function loadCurrentTousseDefinitionImage(tousseDefinitionId,tousseName){
-		var image = top.Ext4.getCmp('browseImage');
-		image.setSrc('');
-		if(curTousseDefinitionImagePage > 0){
-			var url = WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getToussePic.do?name=' + tousseName + '&page=' + curTousseDefinitionImagePage +'&time='+new Date();
-			image.setSrc(url);// 覆盖原来的图片  
+	function getTitle(){
+		if(curImageType==IMAGE_TYPE_TOUSSE){
+			return '器械包[' + objectName + '] 图片';
+		}else if(curImageType==IMAGE_TYPE_MATERIAL){
+			return '材料[' + objectName + '] 图片';
+		}else if(curImageType==IMAGE_TYPE_SPECIFICATION){
+			return '器械包[' + objectName + '] 说明书';
+		}else{
+			return '';
 		}
-		var element = top.Ext4.get(toolbarPage.el);
-	    element.update('第' + curTousseDefinitionImagePage + '页');
 	}
-	function clearTousseDefinitionImage(tousseDefinitionId,tousseName){
-		tousseDefinitionImageTotalPage = 0;
-		curTousseDefinitionImagePage = 0;
-		var image = top.Ext4.getCmp('browseImage');
-		image.setSrc('');
-		var element = top.Ext4.get(toolbarTotalPage.el);
-	    element.update('共' + tousseDefinitionImageTotalPage + '页');
-		var element2 = top.Ext4.get(toolbarPage.el);
-	    element2.update('第' + curTousseDefinitionImagePage + '页');
-	}
-
-    function loadTousseDefinitionImage(){
-//        var url = WWWROOT + "/disinfectSystem/recyclingApplicationAction!getImage.do?name=" + encodeURIComponent(tousseName)+'&imageType=器械包图片';
-//        var image = top.Ext4.getCmp('browseImage');
-//        image.setSrc('');
-//        image.setSrc(url);// 覆盖原来的图片
-
-		clearTousseDefinitionImage(id,name);
+    function loadImageCount(){
+    	clearImage();
 		Ext.Ajax.request({
-			url : WWWROOT + "/disinfectSystem/baseData/tousseDefinitionAction!getToussePictureAmount.do",
+			url : WWWROOT + "/disinfectSystem/baseData/showImageAction!getToussePictureAmount.do",
 			params : {
-				name : tousseName,
-				imageType: '器械包图片'
+				id : objectId,
+				name : objectName,
+				imageType : curImageType
 			},
 			success : function(result){
-				top.Ext4.getCmp('imagePanel').setTitle('器械包[' + tousseName + '] 图片');
-				curImageType = '器械包';
-				var pageStr = result.responseText;
-				tousseDefinitionImageTotalPage = parseInt(pageStr);
-				curTousseDefinitionImagePage = 0;
-				if(tousseDefinitionImageTotalPage > 0){
-					curTousseDefinitionImagePage = 1;
+				top.Ext4.getCmp('imagePanel').setTitle(getTitle());
+				var pageJson = Ext.decode(result.responseText);
+				totalPage = parseInt(pageJson.count);
+				curPage = 0;
+				if(totalPage > 0){
+					curPage = 1;
 				}
 				var element = top.Ext4.get(toolbarTotalPage.el);
-			    element.update('共' + tousseDefinitionImageTotalPage + '页');
-			    loadCurrentTousseDefinitionImage(tousseDefinitionId,tousseName);
+			    element.update('共' + totalPage + '页');
+			    loadCurrentImage();
 			},
 			failure : function(){
-				loadCurrentTousseDefinitionImage(tousseDefinitionId,tousseName);
+				loadCurrentImage();
 			}
 		});
     }
@@ -224,7 +138,20 @@
 	
 	var materialToolbar = [{
 		text : '查看器械包图片',
-		handler : loadTousseDefinitionImage
+		handler : function(){
+			curImageType = IMAGE_TYPE_TOUSSE;
+			objectName = tousseName;
+            objectId =tousseDefinitionId;
+            loadImageCount();
+		}
+	},{
+		text : '查看说明书图片',
+		handler : function(){
+			curImageType = IMAGE_TYPE_SPECIFICATION;
+			objectName = tousseName;
+            objectId =tousseDefinitionId;
+            loadImageCount();
+		}
 	}];
 	
 	var materialGrid = new top.Ext4.grid.Panel({
@@ -249,8 +176,10 @@
     materialGrid.on('itemclick', function(grid, record, item, columnIndex, e, eOpts){
         var materialDefinitionId = record.data['materialDefinitionId'];
         if (materialDefinitionId != '') {
-            var materialName = record.data['name'];
-            loadMaterialImage2(materialDefinitionId, materialName);
+        	curImageType = IMAGE_TYPE_MATERIAL;
+        	objectName = record.data['name'];
+            objectId =materialDefinitionId;
+            loadImageCount();
         }
     }, this);
 	
@@ -283,5 +212,5 @@
 	});
 	materialStore.load();
 	window.show();
-    loadTousseDefinitionImage();
+	loadImageCount();
 }
\ No newline at end of file