Index: ssts-web/src/main/webapp/disinfectsystem/packing/tousesPackingTeachingImage.js
===================================================================
diff -u -r16290 -r21472
--- ssts-web/src/main/webapp/disinfectsystem/packing/tousesPackingTeachingImage.js	(.../tousesPackingTeachingImage.js)	(revision 16290)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/tousesPackingTeachingImage.js	(.../tousesPackingTeachingImage.js)	(revision 21472)
@@ -1,5 +1,5 @@
-function loadToussePackingTeachingImage(tousseName,td_id,currentPage){
-	var url = WWWROOT + '/disinfectSystem/packingAction!getImage.do?id=' + td_id + '&page=' + currentPage +'&imageType='+imageType_packingTeaching ;
+function loadToussePackingTeachingImage(tousseName,td_id,imgType,currentPage){
+	var url = WWWROOT + '/disinfectSystem/packingAction!getImage.do?id=' + td_id + '&page=' + currentPage +'&imageType='+imgType ;
 //    var image = top.Ext4.getCmp('pt_browseImage');
 //    image.setSrc('');
 //    image.setSrc(url);// 覆盖原来的图片
@@ -63,15 +63,21 @@
     
     panel.add(newImage);
 }
-
+function showTousseSpecificationImage(tousseName,td_id){
+	showTousseImages(tousseName,td_id,imageType_specification);
+}
 function showToussePackingTeachingImage(tousseName,td_id){
-	var totalPage = 0;
+	showTousseImages(tousseName,td_id,imageType_packingTeaching);
+}
+
+function showTousseImages(tousseName,td_id,imgType){
 	
-	 Ext.Ajax.request({
+	var totalPage = 0;
+	Ext.Ajax.request({
          url : WWWROOT + '/disinfectSystem/packingAction!getUploadPicTotalPage.do',
          params : {
              td_id : td_id,
-              imageType:imageType_packingTeaching
+              imageType:imgType
          },
          success : function(result){
              var pageStr = result.responseText;
@@ -107,24 +113,25 @@
 		    	   if(currentPage == 1){
 		    		   showResult("已是第一页！");
 		    	   }else{
-		    		   loadToussePackingTeachingImage(imageName,td_id,parseInt(currentPage)-1);
+		    		   loadToussePackingTeachingImage(imageName,td_id,imgType,parseInt(currentPage)-1);
 		    	   }
 		       }},
 		       {xtype:'button',text:'>>', tooltip :"下一页", handler : function(){
 		    	   var imageName = top.Ext4.getCmp('pt_imageName').getText();
 		    	   var currentPage = top.Ext4.getCmp('pt_currentPage').getValue();
-		    	   if(currentPage == totalPage){
+//		    	   alert(currentPage+','+totalPage)
+		    	   if(currentPage >= totalPage){
 		    		   showResult("已是最后一页！");
 		    	   }else{
-		    		   loadToussePackingTeachingImage(imageName,td_id,parseInt(currentPage)+1);
+		    		   loadToussePackingTeachingImage(imageName,td_id,imgType,parseInt(currentPage)+1);
 		    	   }
 		       }}
 		]
 	});
 	
 	var window = new top.Ext4.Window({
         id : 'packageImg',
-        title : '器械包装配教学图片',
+        title : imgType,
         width : document.body.clientHeight > 768 ? 1024 : 800, // 动态计算窗口大小，支持在1024x768分辨率下的显示
         height :document.body.clientHeight > 768 ? 768 : 600,
         border : false,
@@ -140,5 +147,5 @@
     });
     window.show();
     
-    loadToussePackingTeachingImage(tousseName,td_id,1);
+    loadToussePackingTeachingImage(tousseName,td_id,imgType,1);
 }
\ No newline at end of file