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/CM_SearchContactService.page | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/force-app/main/default/pages/CM_SearchContactService.page b/force-app/main/default/pages/CM_SearchContactService.page
index 4011785..6f99f37 100644
--- a/force-app/main/default/pages/CM_SearchContactService.page
+++ b/force-app/main/default/pages/CM_SearchContactService.page
@@ -29,8 +29,13 @@
function Foo(){
j$('[aws-id]').each(function(i,e){
let awsDataId = j$(e).attr('aws-id');
- let piInformation = '濮撳悕:'+contact[awsDataId].lastName +'<br/>' +'鎵嬫満鍙�:'+ (contact[awsDataId].mobilePhone ? contact[awsDataId].mobilePhone :'');
- j$(e).find('.decrypt').html(piInformation);
+ if (contact.hasOwnProperty(awsDataId)) {
+ let piInformation = '濮撳悕:'+contact[awsDataId].lastName +'<br/>' +'鎵嬫満鍙�:'+ (contact[awsDataId].mobilePhone ? contact[awsDataId].mobilePhone :'');
+ j$(e).find('.decrypt').html(piInformation);
+ }else{
+ console.log(awsDataId+' not in contact');
+ }
+
});
}
@@ -228,7 +233,7 @@
</script>
<apex:form id="allForm">
- <apex:actionFunction name="searchContact" action="{!searchContact}" rerender="allForm,allPanel" onComplete="unblockUI();">
+ <apex:actionFunction name="searchContact" action="{!searchContact}" rerender="allForm,allPanel" onComplete="unblockUI();Foo()">
<apex:param name="awsDataIdArray" assignTo="{!awsDataIdArray}" value="" />
</apex:actionFunction>
<apex:actionFunction name="editContact" action="{!editContact}" rerender="allForm,allPanel" onComplete="assignUnencrypted();">
@@ -293,7 +298,7 @@
<!-- <td><a href="#" onclick="setContact('{!lineinfo.lineNo}');" id="943114607025717249" onmouseover="showPIDiv('943114607025717249')" onmouseout="hidePIDiv('943114607025717249')">{!lineinfo.con.Name}</a></td> -->
<!-- 2022/02/15 寮犲崕寤� 瑙ｅ瘑淇℃伅 start -->
<td>
- <a href="/{!lineinfo.con.Id}" onclick="setContact('{!lineinfo.lineNo}','{!lineinfo.con.AWS_Data_Id__c}');" aws-id="{!lineinfo.con.AWS_Data_Id__c}" style="position:relative">
+ <a target="_blank" onclick="setContact('{!lineinfo.lineNo}','{!lineinfo.con.AWS_Data_Id__c}');" aws-id="{!lineinfo.con.AWS_Data_Id__c}" style="position:relative">
<span class="encrypt">{!lineinfo.con.Name}</span>
<span class="decrypt"></span>
</a>
--
Gitblit v1.9.1