From 0953b3b5fcf19c627c6479a6b86648df653c40db Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期一, 09 五月 2022 17:50:33 +0800
Subject: [PATCH] SF PIPL Page Fix Lookup Required issue

---
 force-app/main/default/pages/NewAndEditQuotes.page |   29 ++++++++++++-----------------
 1 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/force-app/main/default/pages/NewAndEditQuotes.page b/force-app/main/default/pages/NewAndEditQuotes.page
index 0115141..de438c5 100644
--- a/force-app/main/default/pages/NewAndEditQuotes.page
+++ b/force-app/main/default/pages/NewAndEditQuotes.page
@@ -1,10 +1,3 @@
-<!--
-  @description       : 
-  @author            : ChangeMeIn@UserSettingsUnder.SFDoc
-  @group             : 
-  @last modified on  : 03-04-2022
-  @last modified by  : ChangeMeIn@UserSettingsUnder.SFDoc
--->
 <apex:page standardController="Quotes__c" extensions="NewAndEditQuotesController" id="page">
     <apex:includeScript value="{! URLFOR($Resource.AWSService, 'AWSService.js') }" />
     <script src="../../soap/ajax/53.0/connection.js" type="text/javascript"></script>
@@ -183,7 +176,7 @@
             }
             let phone = document.querySelector(textPhone);
 
-            if(phone && !/^1[3|5|8|7][0-9]\d{4,8}$/.test(phone.value)){
+            if(false && phone && !/^1[3|5|8|7][0-9]\d{4,8}$/.test(phone.value)){
                 error_msg += ';鐢佃瘽鍙风爜閿欒';
             }
 
@@ -204,7 +197,7 @@
 
         function getSobjectInformation() {
             //api_id_map
-//let nodelist = document.getElementsByClassName(config.ApiPrefix);
+            //let nodelist = document.getElementsByClassName(config.ApiPrefix);
             let result = {}
             for (let index in api_id_map) {
                 let ele = document.getElementById(api_id_map[index]);
@@ -227,9 +220,9 @@
                             v = ele.value;
                         }
 
-                        if(v && v != "000000000000000"){
+                        //if(v && v != "000000000000000"){
                             result[field_api_name] = v;
-                        }
+                        //}
                         
                     }
                 } else if (ele.type == 'checkbox') {
@@ -303,7 +296,9 @@
         function checkRequiredFieldMsg(formData) {
             let blankRequiredFields = '';
             for(i = 0;i<requiredFieldAPIList.length;i++){
-                if(formData[requiredFieldAPIList[i]]){
+                if(formData[requiredFieldAPIList[i]] && (VLookUpFields.indexOf(requiredFieldAPIList[i]) == -1)){
+                    continue;
+                }else if((VLookUpFields.indexOf(requiredFieldAPIList[i]) != -1) && formData[requiredFieldAPIList[i]] != '000000000000000'){
                     continue;
                 }else{
                     if(blankRequiredFields == ''){
@@ -336,7 +331,7 @@
             // Check Required Field
             let checkRequiredFieldMsgResult = checkRequiredFieldMsg(sobjJson);
             if (checkRequiredFieldMsgResult) {
-                alertErrorMessage('requiredErrorMsg' + checkRequiredFieldMsgResult);
+                alertErrorMessage('{!$Label.Input_Required_Field_Msg}' + checkRequiredFieldMsgResult);
                 return
             }
             // //3. Prepare the payload for New PI API To AWS - To Do
@@ -364,7 +359,7 @@
 
         //鏇挎崲vlookup
         var newSearchContactWindow = null;  
-        var closeField = '';
+        // var closeField = '';
 
         function replaceSearchContactLookup() {
             if (!{!isNewMode}) {
@@ -403,7 +398,7 @@
         
         //鑷畾涔塴ookup鏌ヨ
         function searchContact(contactNodeId,field){
-            closeField = field;
+            // closeField = field;
             let accountValue = "";
             if (document.querySelector("[data-id='AccountId']")) {
                 let accountNodeId = document.querySelector("[data-id='AccountId']").id + '_lkid';
@@ -430,9 +425,9 @@
             let contactInfoStr = document.getElementById('page:form:contactId').value;
             console.log('closePopup:'+contactInfoStr);
             let contactInfo = JSON.parse(contactInfoStr);
-            let contactNodeId = document.querySelector("[data-id="+closeField+"]").id + '_lkid';
+            let contactNodeId = document.querySelector("[data-id='CONTACT_NAME__c']").id + '_lkid';
             document.getElementById(contactNodeId).value = contactInfo.ContactId;
-            document.querySelector("[data-id="+closeField+"]").value = contactInfo.Name;     
+            document.querySelector("[data-id='CONTACT_NAME__c']").value = contactInfo.Name;     
         }
 
     </script>

--
Gitblit v1.9.1