From b776940205e893302f77d24c4285613f228b44c6 Mon Sep 17 00:00:00 2001
From: Li Jun <buli@deloitte.com.cn>
Date: 星期三, 11 五月 2022 17:14:29 +0800
Subject: [PATCH] Page Enhance 0511

---
 force-app/main/default/pages/NewAndEditLead.page |   66 +++++++++++++++++++-------------
 1 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/force-app/main/default/pages/NewAndEditLead.page b/force-app/main/default/pages/NewAndEditLead.page
index 85f2a9a..3698107 100644
--- a/force-app/main/default/pages/NewAndEditLead.page
+++ b/force-app/main/default/pages/NewAndEditLead.page
@@ -3,7 +3,7 @@
     <apex:includeScript value="{! URLFOR($Resource.AWSService, 'AWSService.js') }" />
     <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}" />
     <apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}" />
-    <script src="../../soap/ajax/53.0/connection.js" type="text/javascript"></script>
+    <apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
     <style>
         .disabledbutton {
             pointer-events: none;
@@ -170,16 +170,21 @@
         }
         var queryBack = function queryBack(data) {
             console.log('data = ' + data);
-            document.querySelector("[data-id='LastName']").value = data.object.lastName == null ? '' : data.object.lastName;
-            document.querySelector("[data-id='Phone']").value = data.object.phone == null ? '' : data.object.phone;
-            document.querySelector("[data-id='Email']").value = data.object.email == null ? '' : data.object.email;
+            if(document.querySelector("[data-id='LastName']"))
+                document.querySelector("[data-id='LastName']").value = data.object.lastName == null ? '' : data.object.lastName;
+            if(document.querySelector("[data-id='Phone']"))
+                document.querySelector("[data-id='Phone']").value = data.object.phone == null ? '' : data.object.phone;
+            if(document.querySelector("[data-id='Email']"))
+                document.querySelector("[data-id='Email']").value = data.object.email == null ? '' : data.object.email;
             unblockUI();
         };
         var queryBackIFS = function queryBackIFS(data) {
             console.log('data = ' + data);
             //document.querySelector("[data-id='LastName']").value = document.querySelector("[data-id='Contact_Name__c']").value
-            document.querySelector("[data-id='Phone']").value = data.object.phone == null ? '' : data.object.phone;
-            document.querySelector("[data-id='Email']").value = data.object.email == null ? '' : data.object.email;
+            if(document.querySelector("[data-id='Phone']"))
+                document.querySelector("[data-id='Phone']").value = data.object.phone == null ? '' : data.object.phone;
+            if(document.querySelector("[data-id='Email']"))  
+                document.querySelector("[data-id='Email']").value = data.object.email == null ? '' : data.object.email;
             unblockUI();
         };
 
@@ -204,6 +209,8 @@
             }
             if('{!rtTypeId}'){
                 payloadJson.RecordTypeId = '{!rtTypeId}';//Add by zhj for Record Type Issue 20220421
+            }else{
+                delete payloadJson.RecordTypeId;
             }
             return payloadJson;
         }
@@ -238,7 +245,9 @@
         function checkRequiredFieldMsg(formData) {
             let blankRequiredFields = '';
             for (i = 0; i < requiredFieldAPIList.length; i++) {
-                if (formData[requiredFieldAPIList[i]]) {
+                if (formData[requiredFieldAPIList[i]] && !VLookUpFields.has(requiredFieldAPIList[i])) {
+                    continue;
+                }else if(VLookUpFields.has(requiredFieldAPIList[i]) && formData[requiredFieldAPIList[i]] != '000000000000000'){
                     continue;
                 } else {
                     let fieldAPIValue = requiredFieldAPIList[i]
@@ -395,8 +404,10 @@
                 return;
             }
             let queryBackContactName = function queryBackContactName(result){
-                document.querySelector("[data-id='Contact_Name__c']").value = result.object.lastName;
-                document.querySelector("[data-id='LastName']").value = result.object.lastName;
+                if(document.querySelector("[data-id='Contact_Name__c']"))
+                    document.querySelector("[data-id='Contact_Name__c']").value = result.object.lastName;
+                if(document.querySelector("[data-id='LastName']"))
+                    document.querySelector("[data-id='LastName']").value = result.object.lastName;
             };
             AWSService.query(staticResourcesContact.queryUrl, dataId, queryBackContactName, staticResourcesContact.token);
         }
@@ -518,52 +529,53 @@
                 if ('{!ifc}' != '') {
                     blockme();
                     //鐘舵��
-                    document.querySelector("[data-id='Status']").value = '鏈窡杩�'
+                    if(document.querySelector("[data-id='Status']"))
+                        document.querySelector("[data-id='Status']").value = '鏈窡杩�'
                     //浼氳璇㈤棶鍗�
-                    if ('{!ifc.Id}')
+                    if ('{!ifc.Id}' && document.querySelector("[data-id='Lead_Inquiry_form__c']"))
                         document.getElementById(document.querySelector("[data-id='Lead_Inquiry_form__c']").id+'_lkid').value = '{!ifc.Id}'
-                    if ('{!ifc.Name}')
+                    if ('{!ifc.Name}' && document.querySelector("[data-id='Lead_Inquiry_form__c']"))
                         document.querySelector("[data-id='Lead_Inquiry_form__c']").value = '{!ifc.Name}'
                     //瀹㈡埛濮撳悕
-                    if ('{!ifc.Contact_Id__c}')
+                    if ('{!ifc.Contact_Id__c}' && document.querySelector("[data-id='Contact_Name__c']"))
                         document.getElementById(document.querySelector("[data-id='Contact_Name__c']").id + '_lkid').value = '{!ifc.Contact_Id__c}'
                     //鍖婚櫌
-                    if ('{!ifc.Hospital_Name__c}')
+                    if ('{!ifc.Hospital_Name__c}' && document.querySelector("[data-id='Hospital_Name__c']"))
                         document.getElementById(document.querySelector("[data-id='Hospital_Name__c']").id+'_lkold').value = '{!ifc.Hospital_Name__c}'
-                    if ('{!ifc.Hospital_ID__c}')
+                    if ('{!ifc.Hospital_ID__c}' && document.querySelector("[data-id='Hospital_Name__c']"))
                         document.getElementById(document.querySelector("[data-id='Hospital_Name__c']").id+'_lkid').value = '{!ifc.Hospital_ID__c}'
                     //鎴樼暐绉戝鍒嗙被
-                    if ('{!ifc.Department_Class__c}')
+                    if ('{!ifc.Department_Class__c}' && document.querySelector("[data-id='Department_Class__c']"))
                         document.getElementById(document.querySelector("[data-id='Department_Class__c']").id+'_lkold').value = '{!ifc.Department_Class__c}'
-                    if ('{!ifc.Department_ID__c}')
+                    if ('{!ifc.Department_ID__c}' && document.querySelector("[data-id='Department_Class__c']"))
                         document.getElementById(document.querySelector("[data-id='Department_Class__c']").id+'_lkid').value = '{!ifc.Department_ID__c}'
                     //宸叉湁璇环鍚嶇О
-                    if ('{!ifc.Opp_Name_Search__c}')
+                    if ('{!ifc.Opp_Name_Search__c}' && document.querySelector("[data-id='Opp_Name_Search__c']"))
                         document.getElementById(document.querySelector("[data-id='Opp_Name_Search__c']").id + '_lkold').value = '{!ifc.Opp_Name_Search__c}'
-                    if ('{!ifc.Opp_Name_Search_ID__c}')
+                    if ('{!ifc.Opp_Name_Search_ID__c}' && document.querySelector("[data-id='Opp_Name_Search__c']"))
                         document.getElementById(document.querySelector("[data-id='Opp_Name_Search__c']").id + '_lkid').value = '{!ifc.Opp_Name_Search_ID__c}'
                     //涓昏瀛︿細
-                    if ('{!ifc.Campaign__c}')
+                    if ('{!ifc.Campaign__c}' && document.querySelector("[data-id='Campaign__c']"))
                         document.getElementById(document.querySelector("[data-id='Campaign__c']").id +'_lkold').value = '{!ifc.Campaign__c}'
-                    if ('{!ifc.Campaign_ID__c}')
+                    if ('{!ifc.Campaign_ID__c}' && document.querySelector("[data-id='Campaign__c']"))
                         document.getElementById(document.querySelector("[data-id='Campaign__c']").id +'_lkid').value = '{!ifc.Campaign_ID__c}'
                     //鍙栨秷鍘熷洜
-                    if ('{!ifc.Cancel_Reason__c}')
+                    if ('{!ifc.Cancel_Reason__c}' && document.querySelector("[data-id='Cancel_Reason__c']"))
                         document.querySelector("[data-id='Cancel_Reason__c']").value = '{!ifc.Cancel_Reason__c}'
                     //鐢佃瘽
-                    if ('{!ifc.Phone__c}')
+                    if ('{!ifc.Phone__c}' && document.querySelector("[data-id='Phone']"))
                         document.querySelector("[data-id='Phone']").value = '{!ifc.Phone__c}'
                     //閭欢
-                    if ('{!ifc.Email__c}')
+                    if ('{!ifc.Email__c}' && document.querySelector("[data-id='Email']"))
                         document.querySelector("[data-id='Email']").value = '{!ifc.Email__c}'
                     //鍜ㄨ鍗曟潵婧�
                     if ('{!ifc.LeadSource__c}' && document.querySelector("[data-id='LeadSource']"))
                         document.querySelector("[data-id='LeadSource']").value = '{!ifc.LeadSource__c}'
                     //鎰忓悜鍖哄垎
-                    if ('{!ifc.Opportunity_Division__c}')
+                    if ('{!ifc.Opportunity_Division__c}' && document.querySelector("[data-id='Opportunity_Division__c']"))
                         document.querySelector("[data-id='Opportunity_Division__c']").value = '{!ifc.Opportunity_Division__c}'
                     //濮旀墭浜嬮」
-                    if ('{!ifc.Request1__c}') {
+                    if ('{!ifc.Request1__c}' && document.querySelector("[data-id='Request__c']")) {
                         var Request1__c = '{!ifc.Request1__c}';
                         //璧嬪�肩粰绗簩涓閫夋
                         var array = Request1__c.split(';');
@@ -588,7 +600,7 @@
                         }
                     }
                     //绱ф��
-                    if ('{!ifc.Urgent__c}')
+                    if ('{!ifc.Urgent__c}' && document.querySelector("[data-id='urgent__c']"))
                         document.querySelector("[data-id='urgent__c']").checked = '{!ifc.Urgent__c}' == 'false' ? false : true;
                     //鍏徃锛堢瀹わ級 = 绉戝鍚嶇О
                     if(document.querySelector("[data-id='Company']") && document.querySelector("[data-id='Hospital_Name__c']").value != ''){

--
Gitblit v1.9.1