Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java =================================================================== diff -u -r19543 -r19752 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java (.../Recyle.java) (revision 19543) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java (.../Recyle.java) (revision 19752) @@ -545,6 +545,9 @@ Utils.retryingFindAndClick(By.id("recyclingErrorTable")); // 点击第1行的+号按钮 Utils.retryingFindAndClick(By.id("addButton0")); + if(Utils.isFind(Utils.retryingFind(By.id("errorRemark")))){ + Utils.retryingFindAndSendKeys(By.id("errorRemark"), "丢失标识牌"); + } Utils.retryingFindAndClick(By.id("errorSubmitButton")); Utils.driver.switchTo().defaultContent(); Utils.retryingFindAndClick(By @@ -553,19 +556,24 @@ Utils.retryingFindAndClick(By.id("recyclingDamageForm")); Utils.retryingFindAndClick(By.id("addButton0")); + + if(Utils.isFind(Utils.retryingFind(By.id("damageRemark")))){ + Utils.retryingFindAndSendKeys(By.id("damageRemark"), "报损材料"); + } Utils.retryingFindAndClick(By.id("damageSubmitButton")); - // 加急 Utils.driver.switchTo().defaultContent(); Utils.retryingFindAndClick(By.id("urgentAmountDiv0")); Utils.retryingFindAndSwitchToFrame(By.tagName("iframe")); Utils.retryingFindAndClick(By.id("recyclingErrorTable")); Utils.retryingFindAndClick(By.id("addButton0")); + JSWaiter.waitUntilJQueryReady(); if (Utils.isFind(Utils.retryingFind(By.id("urgentLevelTd")))) { Utils.retryingFindAndClick(By.id("urgentLevelTd")); Utils.retryingFindAndClick(By.cssSelector("option[value='加急']")); } Utils.retryingFindAndClick(By.id("urgentSubmitButton")); + JSWaiter.waitUntilJQueryReady(); Utils.driver.switchTo().defaultContent(); // 扫描篮筐条码 recycleForm.sendKeys(Utils.settings.getJSONObject("一级供应室清洗篮筐3") @@ -662,6 +670,9 @@ Utils.retryingFindAndClick(By.id("recyclingErrorTable")); // 点击第1行的+号按钮 Utils.retryingFindAndClick(By.id("addButton0")); + if(Utils.isFind(Utils.retryingFind(By.id("errorRemark")))){ + Utils.retryingFindAndSendKeys(By.id("errorRemark"), "丢失材料"); + } Utils.retryingFindAndClick(By.id("errorSubmitButton")); Utils.driver.switchTo().defaultContent(); Utils.retryingFindAndClick(By.id("saveBtn")); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/apply/helper/ApplyActionHelper.java =================================================================== diff -u -r19660 -r19752 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/apply/helper/ApplyActionHelper.java (.../ApplyActionHelper.java) (revision 19660) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/apply/helper/ApplyActionHelper.java (.../ApplyActionHelper.java) (revision 19752) @@ -176,7 +176,7 @@ * 确认删除 */ private static void confirmDelete(ApplyGoodBo applyGoodBo) { - Utils.retryingFindAndClick(By.id(applyGoodBo.getBtn())); + Utils.retryingFindAndClickByJavaScript((By.id(applyGoodBo.getBtn()))); Utils.switchToDefaultContent(); if (Utils.isFind(Utils.retryingFind(By .xpath("//button[contains(text(), '是')]")))) { @@ -188,8 +188,14 @@ Utils.retryingFindAndClick(By .xpath("//button[contains(text(), '删除')]")); Utils.switchToDefaultContent(); - Utils.retryingFindAndClick(By - .xpath("//button[contains(text(), '是')]")); + if (Utils.isFind(Utils.retryingFind(By + .xpath("//button[contains(text(), '是')]")))) { + Utils.retryingFindAndClick(By + .xpath("//button[contains(text(), '是')]")); + } + else{ + logger.info("没有'是'按钮"); + } } } ApplyHelper.waitSubmit(); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/JSWaiter.java =================================================================== diff -u -r19732 -r19752 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/JSWaiter.java (.../JSWaiter.java) (revision 19732) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/JSWaiter.java (.../JSWaiter.java) (revision 19752) @@ -108,6 +108,7 @@ .executeScript("return document.readyState").toString() .equals("complete"); try { + ((JavascriptExecutor)Utils.driver).executeScript("jQuery.fx.off=true"); jsReady = (Boolean) jsExec .executeScript("return document.readyState").toString() .equals("complete"); @@ -120,7 +121,6 @@ // Wait Javascript until it is Ready! if (!jsReady) { logger.debug("JS is NOT Ready!"); - Utils.refresh(); // Wait for Javascript to load wait.until(jsLoad); } else {