~liucheng/OlyMEBG.git

			@@ -61,10 +61,14 @@

			//payloadJson.AWS_Data_Id__c = r.object[0].dataId;
			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}';
			}
			if('{!rtTypeId}'){
			payloadJson.RecordTypeId = '{!rtTypeId}';//Add by zhj for Record Type Issue 20220421
			}
			return payloadJson;
			},
			@@ -122,13 +126,15 @@
			}

			var staticResources = JSON.parse('{!staticResource}');
			var staticResourceAWSContact = JSON.parse('{!staticResourceAWSContact}');

			var requiredFieldAPIList = JSON.parse('{!requiredFieldAPIListStr}');
			var fieldAPIToLabelMap = JSON.parse('{!fieldAPIToLabelMapStr}');
			console.log('{!staticResource}');
			var VLookUpFields = {! VLookUpFieldsJson};
			function ProcessPI(sobjJson, payloadForNewPI) {
			blockme();
			if ({!isNewMode}) {
			if ({!isNewMode} \|\| {!isCloneMode}) {
			NewPIToAWS(sobjJson, payloadForNewPI)
			}else {
			UpdatePIToAWS(sobjJson, payloadForNewPI)
			@@ -418,7 +424,8 @@
			let contactsInfo = JSON.parse('{!LookUpOverrideFieldsMapJson}');
			let dataId = contactsInfo[sfId];

			AWSService.query(staticResourcesContact.queryUrl,dataId,function(result){
			if(dataId){
			AWSService.query(staticResourceAWSContact.queryUrl,dataId,function(result){
			if(result.object){
			document.querySelector("[data-id='Contact__c']").value = result.object.lastName;
			}
			@@ -426,15 +433,17 @@
			},staticResources.token);
			}

			}

			</script>
			<div class="bPageTitle">
			<div class="ptBody">
			<div class="content">
			<img src="/img/s.gif" alt="{! SobjectLabel}" class="pageTitleIcon" title="{! SobjectLabel}" />
			<h1 class="pageType">{! SobjectLabel}<apex:outputText rendered="{!isNewMode}">{!$Label.New}</apex:outputText><apex:outputText rendered="{!not(isNewMode)}">{!$Label.Edit}</apex:outputText>
			<h1 class="pageType">{! SobjectLabel}<apex:outputText rendered="{!isNewMode \|\| isCloneMode}">{!$Label.New}</apex:outputText><apex:outputText rendered="{!not(isNewMode \|\| isCloneMode)}">{!$Label.Edit}</apex:outputText>
			<span class="titleSeparatingColon">:</span>
			</h1>
			<h2 class="pageDescription"> <apex:outputText rendered="{!isNewMode}">{!$Label.New}</apex:outputText><apex:outputText rendered="{!not(isNewMode)}">{!$Label.Edit}</apex:outputText>{! SobjectLabel}</h2>
			<h2 class="pageDescription"> <apex:outputText rendered="{!isNewMode \|\| isCloneMode}">{!$Label.New}</apex:outputText><apex:outputText rendered="{!not(isNewMode \|\| isCloneMode)}">{!$Label.Edit}</apex:outputText>{! SobjectLabel}</h2>
			<div class="blank"> </div>
			</div>
			<div class="links">
			@@ -456,9 +465,9 @@
			<tr>
			<td class="pbTitle">
			<img src="/img/s.gif" alt="" class="minWidth" title="" width="1" height="1" />
			<h2 class="mainTitle">{! SobjectLabel}<apex:outputText rendered="{!isNewMode}">{!$Label.New}</apex:outputText><apex:outputText rendered="{!not(isNewMode)}">{!$Label.Edit}</apex:outputText></h2>
			<h2 class="mainTitle">{! SobjectLabel}<apex:outputText rendered="{!isNewMode \|\| isCloneMode}">{!$Label.New}</apex:outputText><apex:outputText rendered="{!not(isNewMode \|\| isCloneMode)}">{!$Label.Edit}</apex:outputText></h2>
			</td>
			<td class="pbButton" id="topButtonRow">
			<td class="pbButton" id="topButtonRow" style="pointer-events: none; opacity: 0.4;">
			<input class="btn" type="Button" value="{!$Label.Save}" onclick="saveSobjectProcess()" />
			<input class="btn" type="Button" value="{!$Label.SaveAndNew}" onclick="saveSobjectProcess(1)" />
			<apex:commandButton action="{!cancel}" value="{!$Label.Cancel}" />
			@@ -480,8 +489,10 @@

			<!--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="{!Agency_Contact__c[layoutField.fieldAPI]}" rendered="{!not(layoutField.isPlaceHOlder)}"
			<apex:inputField styleClass="{!ApiPrefix} {!ApiPrefix}_{!layoutField.fieldAPI}" html-data-id="{!layoutField.fieldAPI}" value="{!Agency_Contact__c[layoutField.fieldAPI]}" rendered="{!not(layoutField.isPlaceHOlder)&&layoutField.fieldAPI!='RecordTypeId'}"
			required="{!layoutField.isRequired}" />
			<apex:outputField styleClass="PIBackApi PIBackApi_{!layoutField.fieldAPI}" html-data-id="{!layoutField.fieldAPI}" value="{!Agency_Contact__c[layoutField.fieldAPI]}" rendered="{!not(layoutField.isPlaceHOlder)&&layoutField.fieldAPI=='RecordTypeId'}"
			/>
			<apex:pageblocksectionitem rendered="{!layoutField.isPlaceHolder}">
			</apex:pageblocksectionitem>
			</apex:repeat>
			@@ -532,6 +543,8 @@
			}
			jQuery('a[data-id="OwnerId"]').remove();

			document.getElementById('topButtonRow').style = '';
			document.getElementById('bottomButtonRow').style = '';
			/*
			jQuery(".lookupInput").each(function(i,e){
			let je =jQuery(e).find('input');
			@@ -600,7 +613,7 @@
			<tr>
			<td class="pbTitle">
			<img src="/img/s.gif" alt="" class="minWidth" title="" width="1" height="1" /> </td>
			<td class="pbButtonb" id="bottomButtonRow">
			<td class="pbButtonb" id="bottomButtonRow" style="pointer-events: none; opacity: 0.4;">
			<input class="btn" type="Button" value="{!$Label.Save}" onclick="saveSobjectProcess()" />
			<input class="btn" type="Button" value="{!$Label.SaveAndNew}" onclick="saveSobjectProcess()" />
			<apex:commandButton action="{!cancel}" value="{!$Label.Cancel}" />