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/NewAndEditInquiryForm.page |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/force-app/main/default/pages/NewAndEditInquiryForm.page b/force-app/main/default/pages/NewAndEditInquiryForm.page
index 35d6eed..d01a8f4 100644
--- a/force-app/main/default/pages/NewAndEditInquiryForm.page
+++ b/force-app/main/default/pages/NewAndEditInquiryForm.page
@@ -126,6 +126,9 @@
         var requiredFieldAPIList = JSON.parse('{!requiredFieldAPIListStr}');
         var fieldAPIToLabelMap = JSON.parse('{!fieldAPIToLabelMapStr}');
         var staticResources = JSON.parse('{!staticResource}');
+        //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 start
+        var staticResourcesV2 = JSON.parse('{!staticResourceV2}');
+        //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 end
         var staticResourcesContact = JSON.parse('{!staticResourceContact}');
         var staticResourcesLead = JSON.parse('{!staticResourceLead}');
         console.log('{!staticResource}');
@@ -312,14 +315,18 @@
             let obj = JSON.parse(payloadForNewPI);
             obj[0].dataId = '{!AWSDataId}';
             let payloadForNewPIJson = JSON.stringify(obj);
-            AWSService.update(staticResources.updateUrl, sobjJson, payloadForNewPIJson, controllerSaveMethod, staticResources.token, staticResources.transactionUrl, false, insertOrUpdateBack,redirectCallBack);
-            
+            //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 start
+            //AWSService.update(staticResources.updateUrl, sobjJson, payloadForNewPIJson, controllerSaveMethod, staticResources.token, staticResources.transactionUrl, false, insertOrUpdateBack,redirectCallBack);
+            AWSService.update(staticResourcesV2.updateUrl, sobjJson, payloadForNewPIJson, controllerSaveMethod, staticResourcesV2.token, staticResources.transactionUrl, false, insertOrUpdateBack,redirectCallBack);
+            //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 start
         }
         //鏂板缓 to AWS
         function NewPIToAWS(sobjJson, payloadForNewPI) {
             let controllerSaveMethod = config.insertMethod;
-            AWSService.insert(staticResources.newUrl, sobjJson, payloadForNewPI, controllerSaveMethod, staticResources.token, staticResources.transactionUrl, true, insertOrUpdateBack,redirectCallBack);
-            
+            //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 start
+            //AWSService.insert(staticResources.newUrl, sobjJson, payloadForNewPI, controllerSaveMethod, staticResources.token, staticResources.transactionUrl, true, insertOrUpdateBack,redirectCallBack);
+            AWSService.insert(staticResourcesV2.newUrl, sobjJson, payloadForNewPI, controllerSaveMethod, staticResourcesV2.token, staticResources.transactionUrl, true, insertOrUpdateBack,redirectCallBack);
+            //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 start
         }
         
         //蹇呭~瀛楁
@@ -439,6 +446,9 @@
             let contactNodeId = document.querySelector("[data-id='Contact_Name__c']").id + '_lkid';
             document.getElementById(contactNodeId).value = contactInfo.ContactId;
             document.querySelector("[data-id='Contact_Name__c']").value = contactInfo.Name;
+            //2022-5-7 yjk 澧炲姞鍙傛暟
+            document.querySelector("[data-id='Email__c']").value = contactInfo.email;
+            document.querySelector("[data-id='Phone__c']").value = contactInfo.phone;
         }
         
         //鏇挎崲vlookup

--
Gitblit v1.9.1