Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/disinfectionTousseItems.jsp =================================================================== diff -u -r27023 -r27027 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/disinfectionTousseItems.jsp (.../disinfectionTousseItems.jsp) (revision 27023) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/disinfectionTousseItems.jsp (.../disinfectionTousseItems.jsp) (revision 27027) @@ -71,16 +71,22 @@ materialItems.push(materialItem); }); closeLayer();// 自动化测试无法定位到alert窗口,因此移动closeLayer()方法到前面执行 - if(window.parent){ + if(window.parent && parent.window.newAlert){ var falg= window.parent.createMaterialInfo(materialItems,row); if(falg){ parent.window.newAlert('修改成功。'); }else{ parent.window.newAlert('修改失败。'); } + }else if(window.parent){ + var falg= window.parent.createMaterialInfo(materialItems,row); + if(falg){ + alert('修改成功。'); + }else{ + alert('修改失败。'); + } } - } function loadMaterialNotice(materialDefinitionId){ $.ajax({