Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/apply/ApplyHandle.java =================================================================== diff -u -r34281 -r34291 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/apply/ApplyHandle.java (.../ApplyHandle.java) (revision 34281) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/apply/ApplyHandle.java (.../ApplyHandle.java) (revision 34291) @@ -507,4 +507,18 @@ public void click_end_checked_good_btn(){ applyPage.get_end_checked_good_btn().click(); } + + /** + * 输入开始时间 + */ + public void input_start_date(String date){ + input_text(applyPage.get_start_date(), date); + } + + /** + * 点击查询按钮 + */ + public void click_query_btn(){ + applyPage.get_query_btn().click(); + } } Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/recycle/AwaitForRecycleHandle.java =================================================================== diff -u -r34277 -r34291 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/recycle/AwaitForRecycleHandle.java (.../AwaitForRecycleHandle.java) (revision 34277) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/recycle/AwaitForRecycleHandle.java (.../AwaitForRecycleHandle.java) (revision 34291) @@ -58,7 +58,6 @@ * @param barcode */ public void scan_in_await_for_recycle_table(String barcode){ - System.out.println(barcode); Actions action = new Actions(Utils.driver); action.moveToElement(awaitForRecyclePage.get_await_for_recycle_table()).sendKeys(barcode+Keys.ENTER).perform();; } Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/apply/ApplyProxy.java =================================================================== diff -u -r34281 -r34291 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/apply/ApplyProxy.java (.../ApplyProxy.java) (revision 34281) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/apply/ApplyProxy.java (.../ApplyProxy.java) (revision 34291) @@ -196,6 +196,16 @@ } /** + * 根据开始日期过滤申请单列表 + * @param startDate + */ + public void select_application_by_date(String startDate){ + applyHandle.input_start_date(startDate); + applyHandle.click_query_btn(); + } + + + /** * 选择一张单点击返回修改按钮 * @param serialNum * @throws InterruptedException Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/apply/ApplyPage.java =================================================================== diff -u -r34281 -r34291 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/apply/ApplyPage.java (.../ApplyPage.java) (revision 34281) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/page/apply/ApplyPage.java (.../ApplyPage.java) (revision 34291) @@ -26,6 +26,8 @@ private By confirmDeleteBtn = By.xpath("//button[text()='是']");//确认删除按钮 private By endBtn = By.id("endBtn");//终止按钮 private By searchBar = By.xpath("//*[@class='x-form-twin-triggers']/../input[1]");//搜索列输入框 + private By startDate = By.id("startDate");//开始时间 + private By queryBtn = By.xpath("//button[text()='查询']"); /** * 公共元素 @@ -628,4 +630,20 @@ public WebElement get_end_checked_good_btn(){ return get_element_until_clickable(endCheckedGoodBtn); } + + /** + * 获取开始时间 + * @return + */ + public WebElement get_start_date(){ + return get_element_until_visibility(startDate); + } + + /** + * 获取查询按钮 + * @return + */ + public WebElement get_query_btn(){ + return get_element_until_clickable(queryBtn); + } } Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestApply.java =================================================================== diff -u -r34281 -r34291 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestApply.java (.../TestApply.java) (revision 34281) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium3/testscript/TestApply.java (.../TestApply.java) (revision 34291) @@ -202,6 +202,10 @@ //临床科室用户修改申请数量并提交 loginProxy.go_login_by_btn(applyUser.getString("username"), applyUser.getString("password")); personalDesktopProxy.go_apply(); + //因临床科室用户登录默认只能看到当月的申请单,因此需要按时间过滤,查询出所要操作的申请单 + applyProxy.select_application_by_date("2000-01-01 00:00"); + //等待过滤结果 + Thread.sleep(2000); String result= applyProxy.modify_apply_count_in_template(serialNum,tousseArray); Assert.assertTrue(result.contains(expect)); }