Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp =================================================================== diff -u -r36665 -r37009 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp (.../tousseImage.jsp) (revision 36665) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp (.../tousseImage.jsp) (revision 37009) @@ -49,6 +49,8 @@ var vidoeTypeTousseWashTeaching = '<%=VideoFile.VIDEO_TYPE_TOUSSE_WASH_TEACHING%>'; //配包教学视频 var vidoeTypeTousse = '<%=VideoFile.VIDEO_TYPE_TOUSSE%>'; +//清洗质量检查方法的图片 +var imageTypeWashQualityCheckMethod = '<%=ImageFile.IMAGE_TYPE_MATERIAL_WASHQUALITYCHECKMETHOD%>'; //加载原图 var originalImg = false; //动态加载JS和CSS @@ -97,6 +99,9 @@ var materialAmount = json[i].amount; sumTotal+=parseFloat(materialAmount); $('#SumTotal').text(sumTotal); + if(parentPageName == 'reviewView'){ + $('#washMethod').html('清洗质量
检查方法'); + } if(parentPageName == 'packingView' || parentPageName == 'application'){ trData += ''; trData += ''; @@ -112,7 +117,11 @@ if(sstsConfig.enableDisplaysTheImplantUsageOfTheTousseInRecycling && parentPageName == ''){ trData += ''+emptyStringIfUndefinedOrNull(json[i].implantAmountOfUseRecord)+''; } - trData += ''+emptyStringIfUndefinedOrNull(json[i].washMethod)+''; + if(parentPageName == 'reviewView'){ + trData += ''+emptyStringIfUndefinedOrNull(json[i].washMethod)+''; + }else { + trData += ''+emptyStringIfUndefinedOrNull(json[i].washMethod)+''; + } trData += ''+emptyStringIfUndefinedOrNull(json[i].washQualityCheckPoint)+''; trData += ''+emptyStringIfUndefinedOrNull(json[i].functionCheck)+''; trData += ''; @@ -141,6 +150,10 @@ $('.remark-box').remove(); $('#ImageID').removeClass("left"); } +//ZSSXLRMYY-227:加载清洗质量检查方法的图片 +function getWashQualityCheckMethodImg(materialDefinitionId,td){ + loadImage(materialDefinitionId,imageTypeWashQualityCheckMethod,td); +} /** * 材料被点击时触发 * @param mName 材料名称,包括规格 @@ -1019,7 +1032,7 @@ 数量 是否可拆 植入物使用数量 - 清洗方式 + 清洗方式 清洗质量检查关注点 功能检查