From 01f207d979d6be17c8cdec293feab48828c0ec3e Mon Sep 17 00:00:00 2001
From: 黄千龙 <huangqianlong@prec-tech.com>
Date: 星期五, 08 四月 2022 14:22:52 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG
---
force-app/main/default/pages/SearchAWSContactByNamePage.page | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/force-app/main/default/pages/SearchAWSContactByNamePage.page b/force-app/main/default/pages/SearchAWSContactByNamePage.page
index 617534a..e6bb191 100644
--- a/force-app/main/default/pages/SearchAWSContactByNamePage.page
+++ b/force-app/main/default/pages/SearchAWSContactByNamePage.page
@@ -1,6 +1,7 @@
<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)}" />
@@ -70,7 +71,10 @@
console.log('JSON Result from aws:'+JSON.stringify(result));
if(result.object&&result.object.length>0){
initContactTable(result);
- }
+ }else{
+ unblockUI();
+ alert('娌℃湁鏌ュ埌璇ヨ仈绯讳汉')
+ }
})
}
@@ -95,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');
@@ -129,7 +133,7 @@
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++){
@@ -137,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);
--
Gitblit v1.9.1