From 7240d47434ad2c03903af97135f424c9f7dac8fd Mon Sep 17 00:00:00 2001
From: zengjin <zengjin@essa.cn>
Date: Tue, 6 Nov 2018 15:37:29 +0800
Subject: [PATCH] PO询价bug修复

---
 src/main/java/com/essa/pageObject/HomePage.java                                 |  4 ++--
 src/main/java/com/essa/pageObject/inquiryManage/ProductInquiryFeedbackPage.java | 18 ++++--------------
 src/main/java/com/essa/testSuite/TestPOInquiry.java                             |  1 +
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/essa/pageObject/HomePage.java b/src/main/java/com/essa/pageObject/HomePage.java
index 3702584..2753ae7 100644
--- a/src/main/java/com/essa/pageObject/HomePage.java
+++ b/src/main/java/com/essa/pageObject/HomePage.java
@@ -122,7 +122,7 @@ public class HomePage extends BasePage{
     WebElement inquiryManage;
     
     //成品询价任务列表
-    @FindBy (xpath = "//*[text()='成品询价任务列表']")
+    @FindBy (xpath = "//a[contains(text(),'成品询价任务列表')]")
     WebElement productInquiryTask;
     
     //产品开发
@@ -343,7 +343,7 @@ public class HomePage extends BasePage{
      */
     public ProductInquiryTaskPage toProductInquiryTask() {
     	click(inquiryManage);
-    	jsExecutorClick(productInquiryTask);
+    	click(productInquiryTask);
     	return new ProductInquiryTaskPage(driver);
     }
     
diff --git a/src/main/java/com/essa/pageObject/inquiryManage/ProductInquiryFeedbackPage.java b/src/main/java/com/essa/pageObject/inquiryManage/ProductInquiryFeedbackPage.java
index 4020bf8..634e9eb 100644
--- a/src/main/java/com/essa/pageObject/inquiryManage/ProductInquiryFeedbackPage.java
+++ b/src/main/java/com/essa/pageObject/inquiryManage/ProductInquiryFeedbackPage.java
@@ -60,19 +60,12 @@ public class ProductInquiryFeedbackPage extends BasePage {
 		sendKeys(searchText, Model.getSkuNo());
 		// 根据sku编号来判断是否加载出想要的sku信息
 		click(search);
-//		boolean b = isVisibility(By.xpath("//*[contains(text(),'" + Model.getSkuNo() + "')]"));
-//		while (!b) {
-//			forceWait(1000);
-//		}
+		forceWait(1000);
 		dynamicWait(By.xpath("//*[contains(text(),'" + Model.getSkuNo() + "')]"));
 		click(waitFeedback);
 		// 判断是否加载待反馈视图
-//		boolean b1 = isVisibility(By.xpath("//*[contains(text(),'询价要求完成时间')]"));
-//		while (!b1) {
-//			forceWait(1000);
-//		}
 		dynamicWait(By.xpath("//*[contains(text(),'询价要求完成时间')]"));
-		moveHeightScroll("100");
+		moveHeightScroll("0");
 		click(submit);
 		return new ProductInquiryTaskPage(driver);
 	}
@@ -89,14 +82,11 @@ public class ProductInquiryFeedbackPage extends BasePage {
 		selectElement(searchType, "来源PO单/成品采购单号");
 		sendKeys(searchText, Model.getPoNum());
 		click(search);
-//		while (!(isVisibility(By.xpath("//*[@id='mask' and @style='display: none;']")))) {
-//			forceWait(1000);
-//		}
 		dynamicLoad(By.xpath("//*[@id='mask' and @style='display: none;']"));
-		forceWait(1000);
 		click(waitFeedback);
+		forceWait(500);
 		dynamicWait(By.xpath("//*[contains(text(),'询价要求完成时间')]"));
-		moveHeightScroll("100");
+		moveHeightScroll("0");
 		toSubmit();
 		return new ProductInquiryTaskPage(driver);
 	}
diff --git a/src/main/java/com/essa/testSuite/TestPOInquiry.java b/src/main/java/com/essa/testSuite/TestPOInquiry.java
index 9631726..5831de4 100644
--- a/src/main/java/com/essa/testSuite/TestPOInquiry.java
+++ b/src/main/java/com/essa/testSuite/TestPOInquiry.java
@@ -34,6 +34,7 @@ public class TestPOInquiry extends BaseTest {
 	public void POInquiry() {
 		this.driver = getDriver();
 		HomePage homePage = PageFactory.initElements(driver, HomePage.class);
+		homePage.getHome();
 		homePage.toProductInquiryTask();
 		ProductInquiryTaskPage productInquiryTask = PageFactory.initElements(driver, ProductInquiryTaskPage.class);
 		ProductInquiryFeedbackPage productInquiryFeedbackPage = PageFactory.initElements(driver,
--
libgit2 0.21.2