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 | 41 ++++++++++++++++++++++++++++-------------
1 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/force-app/main/default/pages/CM_SearchContactService.page b/force-app/main/default/pages/CM_SearchContactService.page
index 9968e6b..6f99f37 100644
--- a/force-app/main/default/pages/CM_SearchContactService.page
+++ b/force-app/main/default/pages/CM_SearchContactService.page
@@ -7,13 +7,14 @@
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<style>
- .decrypt{
- position: relative;
- text-align: left;
- display: block;
- margin-left: 5px;
- margin-top: -5px;
+ .decrypt{position: absolute;
+ top: 0;
+ left: 100%;
+ display: none;
+ text-align: left;
+ padding-left: 5px;
}
+ a:hover .decrypt{display: block;width: 150px}
</style>
<script type="text/javascript">
@@ -25,6 +26,18 @@
var now_edit_id = '';
var aws_result = {};
searchContactAll();
+ function Foo(){
+ j$('[aws-id]').each(function(i,e){
+ let awsDataId = j$(e).attr('aws-id');
+ 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');
+ }
+
+ });
+ }
function preparePayloadForSearchContact(){
let searchPayload = new Object();
@@ -43,11 +56,12 @@
for(var i=0;i<contacts.length;i++){
let temp = {}
temp.lastName = contacts[i].lastName;
- temp.phone = contacts[i].phone;
+ temp.mobilePhone = contacts[i].mobilePhone;
contact[contacts[i].dataId] = temp;
}
console.log(JSON.stringify(contact));
+ Foo();
};
AWSService.search(staticResources.searchUrl,data,searchCallBack,staticResources.token);
}
@@ -137,7 +151,7 @@
// createDiv.style.position = "absolute";
// parentNode.appendChild(createDiv);
console.log('dataId:'+dataId+'awsDataId Value:'+awsDataId);
- let piInformation = 'Name:'+contact[awsDataId].lastName +'\n' +'Phone:'+contact[awsDataId].phone
+ let piInformation = '濮撳悕:'+contact[awsDataId].lastName +'\n' +'鐢佃瘽:'+ (contact[awsDataId].mobilePhone?contact[awsDataId].mobilePhone:'');
document.getElementById(dataId+'_'+awsDataId).innerText = piInformation;
}
@@ -219,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();">
@@ -260,7 +274,7 @@
<table class="edittable" border="0" style="border-collapse: collapse;width:580px;table-layout:fixed;">
<colgroup>
<col width="50px" />
- <col width="100px" />
+ <col width="200px" />
<col width="380px" />
<col width="50px" />
</colgroup>
@@ -284,10 +298,11 @@
<!-- <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="#" onclick="setContact('{!lineinfo.lineNo}','{!lineinfo.con.AWS_Data_Id__c}');" id="{!lineinfo.con.AWS_Data_Id__c}" onmouseover="showPIDiv('{!lineinfo.con.id}','{!lineinfo.con.AWS_Data_Id__c}')" onmouseout="hidePIDiv('{!lineinfo.con.id}','{!lineinfo.con.AWS_Data_Id__c}')">
- {!lineinfo.con.Name}
+ <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>
- <span id="{!lineinfo.con.id}_{!lineinfo.con.AWS_Data_Id__c}" class="decrypt"></span>
+
</td>
<!-- 2022/02/15 寮犲崕寤� 瑙ｅ瘑淇℃伅 end -->
<td>{!lineinfo.con.AccountName__c}</td>
--
Gitblit v1.9.1