From 639b0139b5713badf37e67b4fe7b9d3b3a592163 Mon Sep 17 00:00:00 2001
From: Li Jun <buli@deloitte.com.cn>
Date: 星期一, 09 五月 2022 13:38:24 +0800
Subject: [PATCH] fixRequiredFieldValidation0509

---
 force-app/main/default/pages/NewAndEditTenderinformation.page |   42 +++++++++++++++++++++++++++++++++---------
 1 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/force-app/main/default/pages/NewAndEditTenderinformation.page b/force-app/main/default/pages/NewAndEditTenderinformation.page
index acd3a08..f067b1a 100644
--- a/force-app/main/default/pages/NewAndEditTenderinformation.page
+++ b/force-app/main/default/pages/NewAndEditTenderinformation.page
@@ -1,9 +1,15 @@
 <apex:page standardController="Tender_information__c" extensions="NewAndEditTenderinformationController" id="page">
     <apex:includeScript value="{! URLFOR($Resource.AWSService, 'AWSService.js') }" />
-    <script src="../../soap/ajax/53.0/connection.js" type="text/javascript"></script>
+    <apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
     <apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
     <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
     <apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
+    <style>
+        .disabledbutton {
+            pointer-events: none;
+            opacity: 0.4;
+        }
+    </style>
     <script>
         
         var config = {};
@@ -116,7 +122,7 @@
             updateMethod:"NewAndEditTenderinformationController.saveTenderinformation",
             insertMethod:"NewAndEditTenderinformationController.saveTenderinformation"
         }
-    	AWSService.sfSessionId = '{!GETSESSIONID()}';
+        AWSService.sfSessionId = '{!GETSESSIONID()}';
         var staticResources = JSON.parse('{!staticResource}');
         var requiredFieldAPIList = JSON.parse('{!requiredFieldAPIListStr}');
         var fieldAPIToLabelMap = JSON.parse('{!fieldAPIToLabelMapStr}');
@@ -125,9 +131,22 @@
         function ProcessPI(sobjJson, payloadForNewPI) {
             blockme();
             if ({!isNewMode} || {!isCloneMode}) {
-            	NewPIToAWS(sobjJson, payloadForNewPI)
+                NewPIToAWS(sobjJson, payloadForNewPI)
             }else {
                 UpdatePIToAWS(sobjJson, payloadForNewPI)
+            }
+        }
+
+        function EditButton(isDisabled){
+            var topele = document.getElementById('topButtonRow');
+            var bottomele = document.getElementById('bottomButtonRow');
+
+            if (isDisabled) {
+                topele.classList.add("disabledbutton");
+                bottomele.classList.add("disabledbutton");
+            }else {
+                topele.classList.remove("disabledbutton");
+                bottomele.classList.remove("disabledbutton");
             }
         }
 
@@ -152,8 +171,8 @@
             }
             return ['input','select','textarea'].indexOf(tag_name.toLowerCase())>-1;
         }
-    	
-    	function IsFormElement(e){
+        
+        function IsFormElement(e){
             return IsFormTag(e.tagName);
         }
 
@@ -235,7 +254,7 @@
                     }
                     //targets = targets.replace(/\n/g, ";");
                     if (targets !=''){
-                    	result[field_api_name] = targets.join(";");
+                        result[field_api_name] = targets.join(";");
                     }
                 } else {
                     result[field_api_name] = ele.value;
@@ -302,7 +321,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 == ''){
@@ -316,6 +337,8 @@
             return blankRequiredFields;
         }
         function saveSobjectProcess(save_and_new) {
+            EditButton(true);
+
             if(save_and_new){
                 config.SaveAndNew = true;
             }
@@ -354,6 +377,7 @@
             let errorMsgNode = document.getElementById("page:form:block:msgContent");
             errorMsgNode.innerText = errorMsg;
             errorMsgNode.className = 'pbError';
+            EditButton(false);
         }
         function hiddenErrorMsgNode() {
             let errorMsgNode = document.getElementById("page:form:block:msgContent");
@@ -471,10 +495,10 @@
                     //replaceSearchContactLookup();
                     //Replace Lead Vlookup Field
                     //replaceSearchLeadLookup(); 
-                    document.querySelectorAll("[data-id='OwnerId']")[0].classList.add("disabledbutton");
+                    // document.querySelectorAll("[data-id='OwnerId']")[0].classList.add("disabledbutton");
                     // document.querySelectorAll("[data-id='OwnerId']")[1].classList.add("disabledbutton");
                     document.getElementById('topButtonRow').style = '';
-聽 聽 聽 聽 聽 聽 聽document.getElementById('bottomButtonRow').style = '';
+                    document.getElementById('bottomButtonRow').style = '';
                     
                     jQuery('a[data-id="OwnerId"]').remove();
 

--
Gitblit v1.9.1