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

---
 force-app/main/default/pages/NewAndEditAddress.page |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/force-app/main/default/pages/NewAndEditAddress.page b/force-app/main/default/pages/NewAndEditAddress.page
index 40150c4..b1a70c6 100644
--- a/force-app/main/default/pages/NewAndEditAddress.page
+++ b/force-app/main/default/pages/NewAndEditAddress.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;
@@ -159,9 +159,12 @@
         }
         var queryBack = function queryBack(data) {
             console.log('data = ' + data);
-            document.querySelector("[data-id='Telephone__c']").value = data.object.telephone;
-            document.querySelector("[data-id='ZipCode__c']").value = data.object.zipCode;
-            document.querySelector("[data-id='Detailed_Address__c']").value = data.object.detailedAddress;
+            if(document.querySelector("[data-id='Telephone__c']"))
+                document.querySelector("[data-id='Telephone__c']").value = data.object.telephone;
+            if(document.querySelector("[data-id='ZipCode__c']"))
+                document.querySelector("[data-id='ZipCode__c']").value = data.object.zipCode;
+            if(document.querySelector("[data-id='Detailed_Address__c']"))
+                document.querySelector("[data-id='Detailed_Address__c']").value = data.object.detailedAddress;
             unblockUI();
         };
 
@@ -220,7 +223,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]

--
Gitblit v1.9.1