From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte
---
force-app/main/default/pages/SearchContactPage.page | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/force-app/main/default/pages/SearchContactPage.page b/force-app/main/default/pages/SearchContactPage.page
index c95f25d..4359803 100644
--- a/force-app/main/default/pages/SearchContactPage.page
+++ b/force-app/main/default/pages/SearchContactPage.page
@@ -1,6 +1,7 @@
-<apex:page controller="SearchContactController" showHeader="false" id="page">
+<apex:page controller="SearchContactController" showHeader="false" id="page" lightningStylesheets="true">
<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)}" />
@@ -82,8 +83,19 @@
let contactInfo = new Object();
contactInfo.Name = obj.currentTarget.innerText;
contactInfo.ContactId = obj.currentTarget.id;
+
+ //2022-5-7 yjk 澧炲姞閭銆佹墜鏈哄彿
+ var tdNodes = obj.currentTarget.parentNode.childNodes;
+ var email = tdNodes[2].innerText;
+
+ var mobile = tdNodes[4].innerText;
+ var phone = mobile? mobile :tdNodes[3].innerText;
+ contactInfo.email = email;
+ contactInfo.phone = phone;
var selectedContactNode = winMain.document.getElementById('{!JSENCODE($CurrentPage.parameters.contactId)}');
selectedContactNode.value = JSON.stringify(contactInfo);
+
+
closeWindow();
}
@@ -103,7 +115,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');
@@ -142,7 +154,7 @@
unblockUI();
}
function initContactTable(data) {
- let cols = ['Name','AccountName', 'Email', 'Phone'];
+ let cols = ['Name','AccountName', 'Email', 'Phone','MobilePhone'];
let contactInfoList = [];
let awsDataIds = [];
if(data.object){
@@ -151,6 +163,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;
contactInfo.pi = true;
@@ -188,6 +201,7 @@
contactInfo.Name = noPIInfo[f].Name!=null?noPIInfo[f].Name:'';
contactInfo.Email = noPIInfo[f].Email!=null?noPIInfo[f].Email:'';
contactInfo.Phone = noPIInfo[f].Phone!=null?noPIInfo[f].Phone:'';
+ contactInfo.MobilePhone = noPIInfo[f].MobilePhone!=null?noPIInfo[f].MobilePhone:'';
contactInfo.AWSDataId = '';
contactInfo.sfRecordId = noPIInfo[f].Id!=null?noPIInfo[f].Id:'';
contactInfo.AccountName = noPIInfo[f]['Account']['Name'];
--
Gitblit v1.9.1