From 5c01ebbfddb6b8674430b47c22977bea2e350084 Mon Sep 17 00:00:00 2001
From: Li Jun <buli@deloitte.com.cn>
Date: 星期三, 13 四月 2022 10:58:46 +0800
Subject: [PATCH] BackupPIPLFunction0413

---
 force-app/main/default/pages/NewRentalApply.page |   32 +++++++++++++++++---------------
 1 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/force-app/main/default/pages/NewRentalApply.page b/force-app/main/default/pages/NewRentalApply.page
index 5044943..658a126 100644
--- a/force-app/main/default/pages/NewRentalApply.page
+++ b/force-app/main/default/pages/NewRentalApply.page
@@ -1,10 +1,3 @@
-<!--
-  @description       : 
-  @author            : Dennis
-  @group             : 
-  @last modified on  : 03-31-2022
-  @last modified by  : ChangeMeIn@UserSettingsUnder.SFDoc
--->
 <apex:page standardController="Rental_Apply__c" extensions="RentalApplyController" id="page">
     <apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
     <apex:includeScript value="{! URLFOR($Resource.AWSService, 'AWSService.js') }" />
@@ -63,8 +56,9 @@
             payloadJson.Phone_Number_Encrypt__c = r.object[0].phoneNumberEncrypt;
             payloadJson.Direct_Shippment_Address_Encrypt__c = r.object[0].directShippmentAddressEncrypt;
             payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
-            if (isNewMode) {
+            if (isNewMode || {!isCloneMode}) {
                 payloadJson.AWS_Data_Id__c = r.object[0].dataId;
+                delete payloadJson.OwnerId;
             } else {
                 payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
             }
@@ -75,8 +69,7 @@
         // New Or Edit
         function ProcessPI(rentalApplyJson, payloadForNewPI) {
             blockme();
-            if ({!isNewMode
-            }) {
+            if ({!isNewMode} || {!isCloneMode}) {
                 NewPIToAWS(rentalApplyJson, payloadForNewPI)
             }else {
                 UpdatePIToAWS(rentalApplyJson, payloadForNewPI)
@@ -185,12 +178,19 @@
                     }
                 }             
             }
-            result.demo_purpose2__c = document.querySelector("[id='page:form:block:j_id34:2:j_id35:j_id36:2:j_id37']").value;
-            result.ToAgency__c = document.querySelector("[id='page:form:block:j_id34:0:j_id35:j_id36:14:j_id37']").value;
+            if(document.querySelector("[id='page:form:block:j_id34:2:j_id35:j_id36:2:j_id37']")!=null){
+                result.demo_purpose2__c = document.querySelector("[id='page:form:block:j_id34:2:j_id35:j_id36:2:j_id37']").value;
+            }            
+            if(document.querySelector("[id='page:form:block:j_id34:0:j_id35:j_id36:18:j_id37']")!=null){
+                result.ToAgency__c = document.querySelector("[id='page:form:block:j_id34:0:j_id35:j_id36:18:j_id37']").value;
+            }            
+            //document.querySelector("[id='page:form:block:j_id34:0:j_id35:j_id36:18:j_id37']").disabled =true; // Commented By Li Jun 20220304
             if(document.querySelector("[id='page:form:block:j_id34:13:j_id35:j_id36:1:j_id37']")!=null){
                 result.Loaner_cancel_reason__c = document.querySelector("[id='page:form:block:j_id34:13:j_id35:j_id36:1:j_id37']").value;
             }else{
-                result.Loaner_cancel_reason__c = document.querySelector("[id='page:form:block:j_id34:11:j_id35:j_id36:1:j_id37']").value;
+                if(document.querySelector("[id='page:form:block:j_id34:11:j_id35:j_id36:1:j_id37']")!=null){
+                    result.Loaner_cancel_reason__c = document.querySelector("[id='page:form:block:j_id34:11:j_id35:j_id36:1:j_id37']").value;
+                }               
             }
             // //鏍煎紡鍖栨椂闂�
             // if(result.HP_received_sign_day__c){
@@ -204,6 +204,10 @@
             if(e){
                     result.Extension_List_RentalApply__c = e.getData();
                 }
+            if(document.getElementById('page:form:block:j_id34:0:j_id35:j_id36:13:j_id37' + '_lkid')!=null){
+                // result.ToAgency__c = document.getElementById('page:form:block:j_id34:0:j_id35:j_id36:18:j_id37').value;
+                result.Office_Assistant1__c = document.getElementById('page:form:block:j_id34:0:j_id35:j_id36:13:j_id37' + '_lkid').value;
+            }
             console.log(JSON.stringify(result));
             return result;
         }
@@ -309,7 +313,6 @@
             return template.content.firstChild;
         }
         function queryContactName() {
-            function queryContactName() {
             let sfId = document.getElementById(document.querySelector("[data-id='Loaner_medical_Staff__c']").id + '_lkid').value;
             let dataId = '';
             if ('{!contactsInfo}' != '') {
@@ -322,7 +325,6 @@
                 document.querySelector("[data-id='Loaner_medical_Staff__c']").value = result.object.lastName;
             };
             AWSService.query(staticResourcesContact.queryUrl, dataId, queryBackContactName, staticResourcesContact.token);
-        }
         }
         //鑷畾涔塴ookup鏌ヨ
         function searchContact(contactNodeId){

--
Gitblit v1.9.1