From 0593d044698afa73e7e58022dab190ead1925f3a Mon Sep 17 00:00:00 2001
From: 沙世明 <shashiming@prec-tech.com>
Date: 星期六, 12 三月 2022 18:12:55 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG
---
force-app/main/default/pages/CM_SearchContactService.page | 52 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 35 insertions(+), 17 deletions(-)
diff --git a/force-app/main/default/pages/CM_SearchContactService.page b/force-app/main/default/pages/CM_SearchContactService.page
index b902684..9968e6b 100644
--- a/force-app/main/default/pages/CM_SearchContactService.page
+++ b/force-app/main/default/pages/CM_SearchContactService.page
@@ -6,6 +6,15 @@
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<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;
+ }
+ </style>
<script type="text/javascript">
// 2022/02/15 寮犲崕寤� 鏀归�燩I start
@@ -112,25 +121,29 @@
window.close();
}
- function showPIDiv(awsDataId){
- console.log('awsDataId Value:'+awsDataId);
- let parentNode = document.getElementById(awsDataId);
- let createDiv = document.createElement("div");
- createDiv.id = awsDataId+"_PI";
+ function showPIDiv(dataId,awsDataId){
+ // console.log('awsDataId Value:'+awsDataId);
+ // let parentNode = document.getElementById(awsDataId);
+ // let createDiv = document.createElement("div");
+ // createDiv.id = awsDataId+"_PI";
+ // let piInformation = 'Name:'+contact[awsDataId].lastName +'\n' +'Phone:'+contact[awsDataId].phone
+ // //let piInformation = 'Name:'+contact['943114607025717249'].lastName +'\n' +'Phone:'+contact['943114607025717249'].phone
+ // createDiv.innerText = piInformation;
+ // let x=window.event.x;
+ // let y=window.event.y;
+ // createDiv.style.left=x;
+ // createDiv.style.top=y;
+ // createDiv.style.background="#dddddd";
+ // 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 = 'Name:'+contact['943114607025717249'].lastName +'\n' +'Phone:'+contact['943114607025717249'].phone
- createDiv.innerText = piInformation;
- let x=window.event.x;
- let y=window.event.y;
- createDiv.style.left=x;
- createDiv.style.top=y;
- createDiv.style.background="#dddddd";
- createDiv.style.position = "absolute";
- parentNode.appendChild(createDiv);
+ document.getElementById(dataId+'_'+awsDataId).innerText = piInformation;
}
- function hidePIDiv(awsDataId){
- document.getElementById(awsDataId+'_PI').remove();
+ function hidePIDiv(dataId,awsDataId){
+ // document.getElementById(awsDataId+'_PI').remove();
+ document.getElementById(dataId+'_'+awsDataId).innerText = '';
}
// 2022骞�2鏈�15鏃� PI鏀归�� 寰愪寒 start
@@ -270,7 +283,12 @@
</td>
<!-- <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.AWS_Data_Id__c}')" onmouseout="hidePIDiv('{!lineinfo.con.AWS_Data_Id__c}')">{!lineinfo.con.Name}</a></td>
+ <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>
+ <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>
<td><input style="width:90%;" type="button" value="缂栬緫" onclick="editContactJs('{!lineinfo.con.Id}'); return null;" /></td>
--
Gitblit v1.9.1