From ac719375874fd50fad5a11f8e04ac3329081bd0b Mon Sep 17 00:00:00 2001
From: Li Jun <buli@deloitte.com.cn>
Date: 星期五, 08 四月 2022 22:58:44 +0800
Subject: [PATCH] Fix Weekly Report

---
 force-app/main/default/pages/SearchLeadPage.page |   38 +++++++++++++++++++++++++-------------
 1 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/force-app/main/default/pages/SearchLeadPage.page b/force-app/main/default/pages/SearchLeadPage.page
index 64275ca..63a9026 100644
--- a/force-app/main/default/pages/SearchLeadPage.page
+++ b/force-app/main/default/pages/SearchLeadPage.page
@@ -1,5 +1,6 @@
 <apex:page controller="SearchLeadController" showHeader="false" id="page">
     <apex:includeScript value="{! URLFOR($Resource.AWSService, 'AWSService.js') }" />
+    <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
 
     <head>
     </head>
@@ -19,7 +20,11 @@
             var staticResources = JSON.parse('{!staticResource}');
             var leadAWSIds = JSON.parse('{!leadAWSIds}');
             var leadsInfo = JSON.parse('{!leadsInfo}');
-            var searchContactName = '';
+            var searchKeyWord = '{!searchKeyWord}';
+            var searchContactName = searchKeyWord;      
+            if(searchContactName){
+                document.getElementById('page:form:lksrch').value = searchContactName;
+            }
             queryLeadFromAWS();
             function searchAWSContact(){
                 console.log('Search process!');
@@ -48,20 +53,27 @@
                 let requestSearchPayload = preparePayloadForSearchLead();
                 console.log('request payload body:'+requestSearchPayload);
                 //2. Invoke AWS Service
-                fetch(staticResources.searchUrl, {
-                    method: 'POST',
-                    body: requestSearchPayload,
-                    headers: {
-                        'Content-Type': 'application/json',
-                        'pi-token': staticResources.token
-                    }
-                }).then((data) => {
-                    return data.json();
-                }).then((result) => {
+                
+                // fetch(staticResources.searchUrl, {
+                //     method: 'POST',
+                //     body: requestSearchPayload,
+                //     headers: {
+                //         'Content-Type': 'application/json',
+                //         'pi-token': staticResources.token
+                //     }
+                // }).then((data) => {
+                //     return data.json();
+                // }).then((result) => {
+                //     if(result.object&&result.object.length>0){
+                //         initContactTable(result);
+                //     }                   
+                // })
+                let queryLeadBack = function(result){
                     if(result.object&&result.object.length>0){
                         initContactTable(result);
-                    }                   
-                })
+                    } 
+                }
+                AWSService.search(staticResources.searchUrl, requestSearchPayload, queryLeadBack, staticResources.token);
             }
             
             function redirectToParentPage(obj) {

--
Gitblit v1.9.1