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/CM_SearchContact.page | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/force-app/main/default/pages/CM_SearchContact.page b/force-app/main/default/pages/CM_SearchContact.page
index afa740a..c0deea4 100644
--- a/force-app/main/default/pages/CM_SearchContact.page
+++ b/force-app/main/default/pages/CM_SearchContact.page
@@ -124,7 +124,7 @@
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 = '濮撳悕:'+contact[awsDataId].lastName +'\n' +'鐢佃瘽:'+contact[awsDataId].phone
//let piInformation = 'Name:'+contact['943114607025717249'].lastName +'\n' +'Phone:'+contact['943114607025717249'].phone
createDiv.innerText = piInformation;
let x=window.event.x;
@@ -134,6 +134,7 @@
createDiv.style.background="#dddddd";
createDiv.style.position = "absolute";
parentNode.appendChild(createDiv);
+ parentNode.style.position = "relative";
}
function hidePIDiv(awsDataId){
@@ -196,7 +197,8 @@
AWSService.post(staticResources.transactionUrl, JSON.stringify({
"txId":aws_result.txId,
- "isSuccess":1
+ "isSuccess":1,
+ "sfRecordId":document.getElementById('Page:allForm:sfContactId').value
}), function(result){
window.location.reload();
}, staticResources.token);
@@ -222,9 +224,9 @@
if(obj){
document.getElementById("Page:allForm:editBlock:AWS_Data_Id__c").value = obj.dataId;
document.getElementById("Page:allForm:editBlock:Search_LastName__c").value = obj.lastName;
- document.getElementById("Page:allForm:editBlock:LastName_Encrypted__c").value = obj.lastNameEncrypt;
+ //document.getElementById("Page:allForm:editBlock:LastName_Encrypted__c").value = obj.lastNameEncrypt; //zhj 鏂版柟妗堟敼閫� 2022-12-05
document.getElementById("Page:allForm:editBlock:Phone").value = obj.phone;
- document.getElementById("Page:allForm:editBlock:Phone_Encrypted__c").value = obj.phoneEncrypt;
+ //document.getElementById("Page:allForm:editBlock:Phone_Encrypted__c").value = obj.phoneEncrypt; //zhj 鏂版柟妗堟敼閫� 2022-12-05
}
}
@@ -240,7 +242,7 @@
<apex:actionFunction name="editContact" action="{!editContact}" rerender="allForm" onComplete="assignUnencrypted();">
<apex:param name="firstParam" assignTo="{!conId}" value="" />
</apex:actionFunction>
- <apex:actionFunction name="saveNew" action="{!saveNew}" rerender="allForm" onComplete="Trans();">
+ <apex:actionFunction name="saveNew" action="{!saveNew}" rerender="allForm,sfContactId" onComplete="Trans();">
</apex:actionFunction>
<apex:actionFunction name="editClear" action="{!editClear}" rerender="allForm" onComplete="unblockUI();">
</apex:actionFunction>
@@ -248,6 +250,7 @@
<apex:actionFunction name="clearLineInfoList" action="{!clearLineInfoList}" rerender="allForm" onComplete="unblockUI();">
</apex:actionFunction>
<!-- 2022/02/15 寮犲崕寤� 娓呯┖LineInfoList end -->
+ <apex:inputHidden id="sfContactId" value="{!sfContactId}"/> <!-- zhj 2022-12-02 sfId -->
<apex:outputPanel id="allPanel">
<apex:pageBlock id="searchBlock" title="妫�绱㈡潯浠�">
<table class="linetable" border="0" style="border-collapse: collapse;width:600px;table-layout:fixed;">
@@ -311,8 +314,10 @@
<apex:commandButton onclick="editSaveJs();" value="淇濆瓨" rerender="dummy"/>
</apex:pageBlockButtons>
- <apex:inputHidden id="LastName_Encrypted__c" value="{!newCon.LastName_Encrypted__c}"/>
- <apex:inputHidden id="Phone_Encrypted__c" value="{!newCon.Phone_Encrypted__c}"/>
+ <!-- zhj 鏂版柟妗堟敼閫� 2022-12-05 start-->
+ <!-- <apex:inputHidden id="LastName_Encrypted__c" value="{!newCon.LastName_Encrypted__c}"/>
+ <apex:inputHidden id="Phone_Encrypted__c" value="{!newCon.Phone_Encrypted__c}"/> -->
+ <!-- zhj 鏂版柟妗堟敼閫� 2022-12-05 end-->
<apex:inputHidden id="AWS_Data_Id__c" value="{!newCon.AWS_Data_Id__c}"/>
<table class="edittable" border="0" style="border-collapse: collapse; width:600px; table-layout:fixed;">
--
Gitblit v1.9.1