Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Review.java =================================================================== diff -u -r20225 -r20343 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Review.java (.../Review.java) (revision 20225) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Review.java (.../Review.java) (revision 20343) @@ -10,6 +10,8 @@ import org.testng.annotations.BeforeMethod; import org.testng.AssertJUnit; import org.openqa.selenium.By; +import org.openqa.selenium.Keys; +import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.interactions.Actions; import org.openqa.selenium.os.WindowsUtils; @@ -201,6 +203,55 @@ } } + /** + * 审核页面修改灭菌程序、包装类型 + * */ + @Test + public void Review_edit() { + try { + if (Utils.isFind(Utils.retryingFind(By + .cssSelector("div[class='x-grid3-row-checker']")))) { + Utils.retryingFindAndClick(By + .cssSelector("div[class='x-grid3-row-checker']")); + Utils.retryingFindAndClick(By + .xpath("//button[contains(text(), '修改')]")); + String currentwindowhandle = Utils.driver.getWindowHandle(); + Utils.driver.switchTo().window(currentwindowhandle); + Utils.retryingFindAndClick(By.id("packer2")); + Utils.retryingFindAndSendKeys(By.id("packer2"), Keys.DOWN); + String name = Utils.settings.getJSONObject("清点人").getString( + "姓名"); + Utils.retryingFindAndClick(By + .xpath("//div/div/div[contains(text(), '" + name + + "')]")); + Utils.retryingFindAndClick(By.id("reviewer2")); + Utils.retryingFindAndSendKeys(By.id("reviewer2"), Keys.DOWN); + Utils.retryingFindAndClick(By + .xpath("//div/div/div[contains(text(), '" + name + + "')]")); + Utils.retryingFindAndClick(By.id("sterilingType2")); + Utils.retryingFindAndSendKeys(By.id("sterilingType2"), + Keys.DOWN); + name = Utils.settings.getJSONObject("灭菌程序").getString("名称2"); + Utils.retryingFindAndClick(By + .xpath("//div/div/div[contains(text(), '" + name + + "')]")); + Utils.retryingFindAndClick(By.id("packageType2")); + Utils.retryingFindAndSendKeys(By.id("packageType2"), Keys.DOWN); + name = Utils.settings.getJSONObject("包装类型").getString("名称1"); + Utils.retryingFindAndClick(By + .xpath("//div/div/div[contains(text(), '" + name + + "')]")); + Utils.retryingFindAndClick(By + .xpath("//button[contains(text(), '确定')]")); + JSWaiter.waitUntilJQueryReady(); + } + } catch (Exception e) { + e.printStackTrace(); + AssertJUnit.fail(e.getMessage()); + } + } + @AfterMethod public void after() { Utils.driver.quit(); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java =================================================================== diff -u -r20276 -r20343 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java (.../ALL.java) (revision 20276) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java (.../ALL.java) (revision 20343) @@ -286,7 +286,6 @@ Utils.driver.switchTo().defaultContent(); Utils.retryingFindAndSwitchToFrame(By.id("iframe_packing")); assemble.assemble_forgeinSet(); - /*** 一级供应室审核外来器械 ***/ System.out.print("审核开始:"); Utils.DateTime(); Utils.driver.switchTo().defaultContent(); @@ -298,6 +297,10 @@ Utils.retryingFindAndClick(By.linkText(Utils.settings .getJSONObject("一级供应室装配组").getString("名称3"))); Utils.retryingFindAndSwitchToFrame(By.id("iframe_reviewPacking")); + /**审核页面修改灭菌程序、包装类型*/ + review.Review_edit(); + Utils.driver.switchTo().defaultContent(); + /*** 一级供应室审核外来器械 ***/ element = Utils.retryingFind(By .xpath("//button[contains(text(), '进入审核列表')]")); handleReview(element, review);