Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java =================================================================== diff -u -r20343 -r20363 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java (.../ALL.java) (revision 20343) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java (.../ALL.java) (revision 20363) @@ -300,6 +300,7 @@ /**审核页面修改灭菌程序、包装类型*/ review.Review_edit(); Utils.driver.switchTo().defaultContent(); + Utils.retryingFindAndSwitchToFrame(By.id("iframe_reviewPacking")); /*** 一级供应室审核外来器械 ***/ element = Utils.retryingFind(By .xpath("//button[contains(text(), '进入审核列表')]")); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Review.java =================================================================== diff -u -r20343 -r20363 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Review.java (.../Review.java) (revision 20343) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Review.java (.../Review.java) (revision 20363) @@ -16,6 +16,7 @@ import org.openqa.selenium.interactions.Actions; import org.openqa.selenium.os.WindowsUtils; +import test.forgon.disinfectsystem.selenium.factory.WaitFactory; import test.forgon.disinfectsystem.selenium.tools.JSWaiter; import test.forgon.disinfectsystem.selenium.tools.Utils; @@ -224,11 +225,15 @@ Utils.retryingFindAndClick(By .xpath("//div/div/div[contains(text(), '" + name + "')]")); + JSWaiter.waitUntilJQueryReady(); Utils.retryingFindAndClick(By.id("reviewer2")); Utils.retryingFindAndSendKeys(By.id("reviewer2"), Keys.DOWN); - Utils.retryingFindAndClick(By + if (Utils.isFind(Utils.retryingFind(By .xpath("//div/div/div[contains(text(), '" + name - + "')]")); + + "')]")))) { + Utils.retryingFindAndSendKeys(By.id("reviewer2"), "\n"); + } + JSWaiter.waitUntilJQueryReady(); Utils.retryingFindAndClick(By.id("sterilingType2")); Utils.retryingFindAndSendKeys(By.id("sterilingType2"), Keys.DOWN); @@ -238,13 +243,20 @@ + "')]")); Utils.retryingFindAndClick(By.id("packageType2")); Utils.retryingFindAndSendKeys(By.id("packageType2"), Keys.DOWN); - name = Utils.settings.getJSONObject("包装类型").getString("名称1"); + name = Utils.settings.getJSONObject("包装类型").getString("名称2"); Utils.retryingFindAndClick(By .xpath("//div/div/div[contains(text(), '" + name + "')]")); + JSWaiter.waitUntilJQueryReady(); Utils.retryingFindAndClick(By .xpath("//button[contains(text(), '确定')]")); JSWaiter.waitUntilJQueryReady(); + if (Utils.isFind(Utils.retryingFind(By + .id("reSetWin")))) { + Utils.retryingFindAndClick(By + .xpath("//td/em/button[contains(text(), '确定')]")); + } + JSWaiter.waitUntilJQueryReady(); } } catch (Exception e) { e.printStackTrace();