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/NewConsumApply.page |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/force-app/main/default/pages/NewConsumApply.page b/force-app/main/default/pages/NewConsumApply.page
index 047fec5..f9386a3 100644
--- a/force-app/main/default/pages/NewConsumApply.page
+++ b/force-app/main/default/pages/NewConsumApply.page
@@ -10,7 +10,7 @@
     <apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
     <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;
@@ -57,8 +57,10 @@
         //Query Required Parameter
         var queryBack = function queryBack(data) {
             console.log('data = ' + data);
-            document.querySelector("[data-id='Phone_number__c']").value = data.object.phoneNumber;
-            document.querySelector("[data-id='direct_shippment_address__c']").value = data.object.directShippmentAddress;
+            if(document.querySelector("[data-id='Phone_number__c']"))
+                document.querySelector("[data-id='Phone_number__c']").value = data.object.phoneNumber;
+            if(document.querySelector("[data-id='direct_shippment_address__c']"))
+                document.querySelector("[data-id='direct_shippment_address__c']").value = data.object.directShippmentAddress;
             unblockUI();
         };
 
@@ -233,7 +235,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 {
                     if (blankRequiredFields == '') {
@@ -318,7 +322,8 @@
             let dataId = contactsInfo[sfId];
             let url = staticResourcesContact.queryUrl + '?dataId=' + dataId;
             let queryBackContactName = function queryBackContactName(result){
-                document.querySelector("[data-id='Loaner_medical_Staff__c']").value = result.object.lastName;
+                if(document.querySelector("[data-id='Loaner_medical_Staff__c']"))
+                    document.querySelector("[data-id='Loaner_medical_Staff__c']").value = result.object.lastName;
                 //document.querySelector("[data-id='LastName']").value = result.object.lastName;
             };
             AWSService.query(staticResourcesContact.queryUrl, dataId, queryBackContactName, staticResourcesContact.token);

--
Gitblit v1.9.1