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/NewAndEditQIS.page |   43 ++++++++++++++++++++++++++++++++++++-------
 1 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/force-app/main/default/pages/NewAndEditQIS.page b/force-app/main/default/pages/NewAndEditQIS.page
index 12d71be..219a372 100644
--- a/force-app/main/default/pages/NewAndEditQIS.page
+++ b/force-app/main/default/pages/NewAndEditQIS.page
@@ -1,6 +1,6 @@
 <apex:page standardController="QIS_Report__c" extensions="NewAndEditQISController" 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)}"/>
@@ -67,6 +67,9 @@
                     delete payloadJson.OwnerId;
                 } else {
                     payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
+                }
+                if('{!rtTypeId}'){
+                    payloadJson.RecordTypeId = '{!rtTypeId}';//Add by zhj for Record Type Issue 20220421
                 }
                 return payloadJson;
             },
@@ -135,6 +138,19 @@
                 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");
             }
         }
 
@@ -254,9 +270,9 @@
                 } else {
                     result[field_api_name] = ele.value;
                     //鍏抽棴QIS鐞嗙敱涓烘棤鏃�
-                    if(field_api_name == 'Cancel_QIS_Reason__c' && ele.value == '_\x01_'){
-                        result[field_api_name] = '';
-                    }
+                    // if(field_api_name == 'Cancel_QIS_Reason__c' && ele.value == '_\x01_'){
+                    //     result[field_api_name] = '';
+                    // }
                 }
                 
                 // let e1 = document.getElementById(api_id_map[field_api_name]);
@@ -350,7 +366,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 == ''){
@@ -364,6 +382,7 @@
             return blankRequiredFields;
         }
         function saveSobjectProcess(save_and_new) {
+            EditButton(true);
             
             if(save_and_new){
                 config.SaveAndNew = true;
@@ -403,6 +422,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");
@@ -463,8 +483,12 @@
                     
                     <!--Each section has layoutFields, let's iterate them as well-->
                     <apex:repeat value="{!layoutSection.layoutFields}" var="layoutField">
-                        <apex:inputField styleClass="{!ApiPrefix} {!ApiPrefix}_{!layoutField.fieldAPI}" html-data-id="{!layoutField.fieldAPI}" value="{!QIS_Report__c[layoutField.fieldAPI]}" rendered="{!not(layoutField.isPlaceHOlder)}"
-                                        required="{!layoutField.isRequired}" />
+                        <apex:inputField styleClass="PIBackApi PIBackApi_{!layoutField.fieldAPI}" html-data-id="{!layoutField.fieldAPI}" value="{!QIS_Report__c[layoutField.fieldAPI]}" rendered="{!not(layoutField.isPlaceHOlder)&&isNewMode}"
+                            required="{!layoutField.isRequired}" />
+                        <apex:inputField styleClass="PIBackApi PIBackApi_{!layoutField.fieldAPI}" html-data-id="{!layoutField.fieldAPI}" value="{!QIS_Report__c[layoutField.fieldAPI]}" rendered="{!not(layoutField.isPlaceHOlder)&&not(isNewMode)&&layoutField.fieldAPI!='RecordTypeId'}"
+                            required="{!layoutField.isRequired}" />
+                        <apex:outputField styleClass="PIBackApi PIBackApi_{!layoutField.fieldAPI}" html-data-id="{!layoutField.fieldAPI}" value="{!QIS_Report__c[layoutField.fieldAPI]}" rendered="{!not(layoutField.isPlaceHOlder)&&not(isNewMode)&&layoutField.fieldAPI=='RecordTypeId'}"
+                        />
                         <apex:pageblocksectionitem rendered="{!layoutField.isPlaceHolder}">
                         </apex:pageblocksectionitem>
                     </apex:repeat>
@@ -484,6 +508,11 @@
             }
             console.log(api_id_map);
             sfdcPage.appendToOnloadQueue(function () {
+                jQuery('option').each(function(i,e){
+                    if(e.value == '_\x01_'){
+                        e.value = '';
+                    }
+                })
                 //鍒ゆ柇鏄惁涓哄彧璇婚�夐」
                 var layoutSections = JSON.parse('{!layoutSectionsStr}');
                     for (let m = 0; m < layoutSections.length; m++) {

--
Gitblit v1.9.1