From f5a94e721ae5a26f817f0df75065b64f1f192eb3 Mon Sep 17 00:00:00 2001
From: Li Jun <buli@deloitte.com.cn>
Date: 星期一, 28 三月 2022 21:43:51 +0800
Subject: [PATCH] PIPLFunctionDeploy0328
---
force-app/main/default/pages/StraightBackAddress.page | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/force-app/main/default/pages/StraightBackAddress.page b/force-app/main/default/pages/StraightBackAddress.page
index b7b6bd1..2510d5d 100644
--- a/force-app/main/default/pages/StraightBackAddress.page
+++ b/force-app/main/default/pages/StraightBackAddress.page
@@ -56,7 +56,8 @@
if(isAddCon){
AWSService.post(staticResourceContact.transactionUrl, JSON.stringify({
"txId":con_aws_result.txId,
- "isSuccess":b ? 0 : 1
+ "isSuccess":b ? 0 : 1,
+ "sfRecordId":document.getElementById('allPage:allForm:sfRecordId').value
}), function(result){
if(!b)
window.location.reload();
@@ -449,8 +450,8 @@
'\n閭紪: '+PIData[awsDataId].zipCode+
'\n璇︾粏鍦板潃: '+PIData[awsDataId].detailedAddress
}else{
- piInformation = '鑱旂郴浜�: null'+
- '\n鐢佃瘽: '+PIData[awsDataId].telephone+
+ piInformation =
+ '鐢佃瘽: '+PIData[awsDataId].telephone+
'\n閭紪: '+PIData[awsDataId].zipCode+
'\n璇︾粏鍦板潃: '+PIData[awsDataId].detailedAddress
}
@@ -502,6 +503,7 @@
//鑷畾涔塴ookup鏌ヨ
function searchContact(contactNodeId,field){
closeField = field;
+ let searchContactKeyWord = document.getElementById(field).value
let accountValue = "";
if (document.getElementById('allPage:allForm:oppBlock2:UpdAddressId:Customer__r_Name')!=null) {
let accountNodeId = document.getElementById('allPage:allForm:oppBlock2:UpdAddressId:Customer__r_Name').id + '_lkid';
@@ -510,7 +512,7 @@
console.log(accountValue);
if(accountValue !='000000000000000'){
let baseUrl = "/apex/SearchContactPage";
- let suffixUrl = "?contactId="+contactNodeId+"&accountId="+accountValue;
+ let suffixUrl = "?contactId="+contactNodeId+"&accountId="+accountValue+"&searchContactKeyWord=" + searchContactKeyWord;
let newSearchContactParam = 'height=600,width=800,left=100,top=100,dialogHide=true,resizable=no,scrollbars=yes,toolbar=no,status=no';
newSearchContactWindow = window.open(baseUrl+suffixUrl, 'Popup', newSearchContactParam);
if (window.focus) {
@@ -518,7 +520,7 @@
}
return false;
}else{
- console.log('璇峰厛閫夋嫨瀹㈡埛鍐嶉�夋嫨鑱旂郴浜�')
+ alert('璇峰厛閫夋嫨瀹㈡埛鍐嶉�夋嫨鑱旂郴浜�')
}
}
@@ -544,6 +546,7 @@
<apex:inputHidden id="tableValueFrontEnd" value="{!tableDataStr}"/>
<apex:inputHidden value="{!contactId}" id="contactId"/>
<apex:inputHidden value="{!insUpdDataStr}" id="insUpdDataStr"/>
+ <apex:inputHidden value="{!sfRecordId}" id="sfRecordId"/>
<div id="tab01">
<!-- 椤甸潰鏁版嵁鍒濆鍖栨柟娉� -->
<apex:actionFunction name="init" action="{!init}" rerender="oppBlock1,message,checEventFrame" onComplete="unblockUI();"></apex:actionFunction>
@@ -557,7 +560,7 @@
<apex:param name="isUpload" assignTo="{!isUpload}" value="" />
</apex:actionFunction>
<!-- 淇濆瓨鍜屼慨鏀规柟娉� -->
- <apex:actionFunction name="save" action="{!save}" rerender="oppBlock2,message" onComplete="unblockUI();{!IF(isSearchBtn,'searchBtnJs()',false)};Trans()"></apex:actionFunction>
+ <apex:actionFunction name="save" action="{!save}" rerender="oppBlock2,message,sfRecordId" onComplete="unblockUI();{!IF(isSearchBtn,'searchBtnJs()',false)};Trans();"></apex:actionFunction>
<!-- 鏌ヨ瀹㈡埛璁板綍绫诲瀷鏂规硶 -->
<apex:actionFunction name="queryRecordType" action="{!queryRecordType}" rerender="oppBlock2,message" onComplete="unblockUI();"></apex:actionFunction>
<!-- 鐐瑰嚮淇敼鎸夐挳鑾峰彇淇敼鏁版嵁鏂规硶 -->
@@ -668,9 +671,9 @@
<td align="left" style="vertical-align: inherit;border-width: 0px 1px 1px 0px;">
<apex:outputText value="{!or.address.Detailed_Address__c}" />
</td>
- <!-- <td align="center" style="vertical-align: inherit;width:30px;">
+ <td align="center" style="vertical-align: inherit;width:30px;">
<apex:commandButton value=" 缂栬緫 " onclick="onEditorJs('{!or.address.id}');return false;" style="background:#98c1fbf7;display:{!or.canEdit};"/>
- </td> -->
+ </td>
<td align="center" style="vertical-align: inherit;width:30px;">
<apex:commandButton value=" 澶嶅埗 " onclick="onCopyJs('{!or.address.id}');return false;" style="background: #98c1fbf7;display:{!or.canCopy};"/>
</td>
@@ -699,7 +702,8 @@
<!-- Before PIPL 20220308 -->
<!-- <apex:inputfield value="{!insUpdData.Contacts__c}" id="Contacts__c" required="false"/> -->
<!-- Add By Li Jun for PIPL 20220308 Start -->
- <apex:inputText label="鑱旂郴浜�" disabled="true" value="{!contactNameValue}" id="Contacts__c">
+ <!-- <apex:inputText label="鑱旂郴浜�" disabled="true" value="{!contactNameValue}" id="Contacts__c">-->
+ <apex:inputText label="鑱旂郴浜�" value="{!contactNameValue}" id="Contacts__c">
</apex:inputText>
<apex:inputHidden id="contactIdValue" value="{!contactIdValue}"/>
<!-- Add By Li Jun for PIPL 20220308 End -->
--
Gitblit v1.9.1