~huangqianlong/OlyMEBG.git

			@@ -11,6 +11,7 @@
			}
			</style>
			<script>
			AWSService.sfSessionId = '{!GETSESSIONID()}';
			//Initial Required Information
			var staticResources = JSON.parse('{!staticResource}');
			var requiredFieldAPIList = JSON.parse('{!requiredFieldAPIListStr}');
			@@ -18,6 +19,19 @@
			var VLookUpFields = new Set(['Consum_Apply__c','Consum_Apply_Equipment_Set__c','Asset__c','Canceled__c','DeliverySlip__c','Return_DeliverySlip__c']);
			var userVLookUpFields = ['Follower_User__c','Consum_Assign_Person__c','Asset_Center_Confirm_Staff__c','Return_Operator__c','Return_wh_chenk_staff__c','Cancel_Mem__c','Lost_item_check_staff__c','Lost_item_check_staff_Final__c'];
			var redirectMode = 'Save';

			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");
			}
			}

			//Redirect Required Parameter
			var redirectCallBack = function redirectCallBack(sfId, errorMessage) {
			@@ -55,7 +69,9 @@
			} else {
			payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
			}
			debugger
			if('{!rtTypeId}'){
			payloadJson.RecordTypeId = '{!rtTypeId}';//Add by zhj for Record Type Issue 20220421
			}
			return payloadJson;
			}

			@@ -170,6 +186,8 @@

			//Base Process
			function saveConsumApplyProcess(saveMode) {
			EditButton(true);

			redirectMode = saveMode;
			console.log('redirectMode' + redirectMode);
			hiddenErrorMsgNode();
			@@ -198,16 +216,17 @@

			//Alert Error Message
			function alertErrorMessage(errorMsg) {
			let errorMsgNode = document.getElementById("page:form:msgContent");
			let errorMsgNode = document.getElementById("page:form:block:msgContent");
			errorMsg = '错误：无效数据。' + '\n' + errorMsg;
			errorMsgNode.innerText = errorMsg;
			errorMsgNode.className = 'pbError';
			unblockUI();
			EditButton(false);
			}

			//Hide Error Message
			function hiddenErrorMsgNode() {
			let errorMsgNode = document.getElementById("page:form:msgContent");
			let errorMsgNode = document.getElementById("page:form:block:msgContent");
			errorMsgNode.innerText = '';
			errorMsgNode.className = '';
			}
			@@ -233,11 +252,7 @@
			<div class="ptBreadcrumb"></div>
			</div>
			<apex:form id="form">
			<!-- Error Msg-->
			<apex:outputPanel id="errorMsg">
			<apex:pageMessages id="msgContent" escape="false" />
			</apex:outputPanel>
			<apex:pageblock >
			<apex:pageblock id="block">
			<div class="pbHeader">
			<table cellspacing="0" cellpadding="0" border="0">
			<tbody>
			@@ -246,7 +261,7 @@
			<img src="/img/s.gif" alt="" class="minWidth" title="" width="1" height="1" />
			<h2 class="mainTitle">耗材备品配套一览明细编辑</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="保存" onclick="saveConsumApplyProcess('Save')" />
			<input class="btn" type="Button" value="保存并新建" onclick="saveConsumApplyProcess('SaveAndNew')" />
			<apex:commandButton action="{!cancel}" value="取消" />
			@@ -255,14 +270,24 @@
			</tbody>
			</table>
			</div>
			<!-- Error Msg-->
			<div style="text-align: center;">
			<apex:outputPanel id="errorMsg">
			<apex:pageMessages id="msgContent" escape="false" />
			</apex:outputPanel>
			</div>
			<!-- Iterate the layoutSections, which is a list of sections -->
			<apex:repeat value="{!layoutSections}" var="layoutSection">
			<apex:pageBlockSection title="{!layoutSection.name}" collapsible="{!layoutSection.allowCollapse}" columns="{!layoutSection.columns}">

			<!--Each section has layoutFields, let's iterate them as well-->
			<apex:repeat value="{!layoutSection.layoutFields}" var="layoutField">
			<apex:inputField html-data-id="{!layoutField.fieldAPI}" value="{!Consum_Apply_Equipment_Set_Detail__c[layoutField.fieldAPI]}" rendered="{!not(layoutField.isPlaceHOlder)}"
			<apex:inputField styleClass="PIBackApi PIBackApi_{!layoutField.fieldAPI}" html-data-id="{!layoutField.fieldAPI}" value="{!Consum_Apply_Equipment_Set_Detail__c[layoutField.fieldAPI]}" rendered="{!not(layoutField.isPlaceHOlder)&&isNewMode}"
			required="{!layoutField.isRequired}" />
			<apex:inputField styleClass="PIBackApi PIBackApi_{!layoutField.fieldAPI}" html-data-id="{!layoutField.fieldAPI}" value="{!Consum_Apply_Equipment_Set_Detail__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="{!Consum_Apply_Equipment_Set_Detail__c[layoutField.fieldAPI]}" rendered="{!not(layoutField.isPlaceHOlder)&&not(isNewMode)&&layoutField.fieldAPI=='RecordTypeId'}"
			/>
			<apex:pageblocksectionitem rendered="{!layoutField.isPlaceHolder}">
			</apex:pageblocksectionitem>
			</apex:repeat>
			@@ -298,8 +323,10 @@
			blockme();
			QueryConsumApplyFromAWS();
			};
			document.querySelector("[data-id='OwnerId']").classList.add("disabledbutton");

			//document.querySelector("[data-id='OwnerId']").classList.add("disabledbutton");

			document.getElementById('topButtonRow').style = '';
			document.getElementById('bottomButtonRow').style = '';
			//zhj 2022/04/11 start
			// jQuery(".lookupInput").each(function(i,e){
			// let je =jQuery(e).find('input');
			@@ -339,7 +366,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="保存" onclick="saveConsumApplyProcess('Save')" />
			<input class="btn" type="Button" value="保存并新建" onclick="saveConsumApplyProcess('SaveAndNew')" />
			<apex:commandButton action="{!cancel}" value="取消" />