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/SearchAWSContactByNamePage.page | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/force-app/main/default/pages/SearchAWSContactByNamePage.page b/force-app/main/default/pages/SearchAWSContactByNamePage.page
index 8f311fd..e6bb191 100644
--- a/force-app/main/default/pages/SearchAWSContactByNamePage.page
+++ b/force-app/main/default/pages/SearchAWSContactByNamePage.page
@@ -1,5 +1,9 @@
<apex:page controller="SearchContactController" id="page">
+ <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}" />
<apex:includeScript value="{! URLFOR($Resource.AWSService, 'AWSService.js') }" />
+ <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}" />
+ <apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}" />
+ <apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}" />
<head>
</head>
@@ -22,7 +26,8 @@
var searchContactName = '';
function searchAWSContact(){
console.log('Search process!');
- //1. reset table;
+ //1. reset table;
+ blockme();
resetTable();
//2. get contact name value
searchContactName = document.getElementById('page:form:lksrch').value;
@@ -31,6 +36,7 @@
queryLeadFromAWS();
}else{
alert("璇疯緭鍏ヨ嚦灏�2涓叧閿瓧");
+ unblockUI();
}
}
@@ -65,7 +71,10 @@
console.log('JSON Result from aws:'+JSON.stringify(result));
if(result.object&&result.object.length>0){
initContactTable(result);
- }
+ }else{
+ unblockUI();
+ alert('娌℃湁鏌ュ埌璇ヨ仈绯讳汉')
+ }
})
}
@@ -90,7 +99,7 @@
let tableBody = document.createElement('TBODY');
table.appendChild(tableBody);
let headerTR = document.createElement('TR');
- let colsHeader = ['濮撳悕','瀹㈡埛鍚嶇О','閭', '鐢佃瘽'];
+ let colsHeader = ['濮撳悕','瀹㈡埛鍚嶇О','閭', '鐢佃瘽','鎵嬫満鍙�'];
tableBody.appendChild(headerTR);
for (let i = 0; i < colsHeader.length; i++) {
let td = document.createElement('TH');
@@ -121,9 +130,10 @@
}
}
myTableDiv.appendChild(table);
+ unblockUI();
}
function initContactTable(data) {
- let cols = ['Name','AccountName','Email', 'Phone'];
+ let cols = ['Name','AccountName','Email', 'Phone','MobilePhone'];
let contactInfoList = [];
let awsDataIds = [];
for(var i=0;i<data.object.length;i++){
@@ -131,6 +141,7 @@
let contactInfo = new Object();
contactInfo.Name = data.object[i].lastName;
contactInfo.Email = data.object[i].email;
+ contactInfo.MobilePhone = data.object[i].mobilePhone;
contactInfo.Phone = data.object[i].phone;
contactInfo.AWSDataId = data.object[i].dataId;
awsDataIds.push(contactInfo.AWSDataId);
@@ -143,7 +154,7 @@
//Invoke SF BackEnd
Visualforce.remoting.Manager.invokeAction(
'{!$RemoteAction.SearchContactController.searchContacts}',
- JSON.stringify(awsDataIds),
+ JSON.stringify(awsDataIds),'','',
function (result, event) {
if(event.status){
if(result.status == 'success'){
--
Gitblit v1.9.1