Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/ShowImageAction.java =================================================================== diff -u -r15372 -r17857 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/ShowImageAction.java (.../ShowImageAction.java) (revision 15372) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/ShowImageAction.java (.../ShowImageAction.java) (revision 17857) @@ -208,7 +208,8 @@ Long objectId = 0L; String imageType = parameters.get("imageType"); if(StringTools.equals(ImageFile.IMAGE_TYPE_TOUSSE, imageType) - || StringTools.equals(ImageFile.IMAGE_TYPE_SPECIFICATION,imageType)){ + || StringTools.equals(ImageFile.IMAGE_TYPE_SPECIFICATION,imageType) + || StringTools.equals(ImageFile.IMAGE_TYPE_TOUSSEPACKING,imageType)){ TousseDefinition tousseDefinition = getTousseDefinition(parameters); objectId = getObjectId(tousseDefinition); }else if(StringTools.equals(ImageFile.IMAGE_TYPE_MATERIAL, imageType)){ Index: ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js =================================================================== diff -u -r17512 -r17857 --- ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js (.../reviewView.js) (revision 17512) +++ ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js (.../reviewView.js) (revision 17857) @@ -814,6 +814,12 @@ currentImageType = "器械包图片"; loadImage('',tousseName,currentImageType); } + },{ + text : '查看装配教学图片', + handler : function(){ + currentImageType = "器械包装配教学图片"; + loadImage('',tousseName,currentImageType); + } }]; var materialStore = new top.Ext4.data.Store({ proxy : { @@ -873,7 +879,9 @@ currentImageType = "材料图片"; var materialDefinitionId = record.data['materialDefinitionId']; var materialName = record.data['name']; + alert('materialName : ' + materialName + ' id : ' + materialDefinitionId); if (materialDefinitionId != '') { + alert('dd') materialId = materialDefinitionId; loadImage(materialDefinitionId,materialName,currentImageType); }