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/SLAReportDetails.page | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/force-app/main/default/pages/SLAReportDetails.page b/force-app/main/default/pages/SLAReportDetails.page
index d330911..298f148 100644
--- a/force-app/main/default/pages/SLAReportDetails.page
+++ b/force-app/main/default/pages/SLAReportDetails.page
@@ -1,9 +1,9 @@
-<apex:page Controller="SLAReportDetailsController" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="淇℃伅鏇存柊">
+<apex:page Controller="SLAReportDetailsController" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="淇℃伅鏇存柊" lightningStylesheets="true">
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:includeScript value="{! URLFOR($Resource.AWSService, 'AWSService.js') }" />
- <apex:includeScript value="/soap/ajax/40.0/connection.js"/>
+ <apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
<script>
function cancelJs() {
window.opener=null;
@@ -35,7 +35,10 @@
}
for(var i=0;i<result.object.length;i++){
if(result.object[i].sfRecordId != null){
- contact[result.object[i].sfRecordId] = result.object[i].lastName
+ var o = [];
+ o.lastName = result.object[i].lastName;
+ o.phone = result.object[i].phone;
+ contact[result.object[i].sfRecordId] = o;
}
}
resolve('success');
@@ -51,7 +54,10 @@
var p = new Promise(function(resolve, reject){
for(let key in contact){
var k = ''+key;
- document.getElementById(k).innerText = contact[k];
+ document.getElementById(k).innerText = contact[k].lastName;
+ if(document.getElementById(k+'_Phone')){
+ document.getElementById(k+'_Phone').innerText = contact[k].phone;
+ }
}
});
return p;
--
Gitblit v1.9.1