From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001 From: buli <137736985@qq.com> Date: 星期五, 14 七月 2023 15:10:02 +0800 Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte --- force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.cmp | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.cmp b/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.cmp index 6cc8450..a8f7149 100644 --- a/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.cmp +++ b/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.cmp @@ -40,6 +40,7 @@ event="c:NewAgencyContactEvent" action="{!c.closeAgencyContact}" /> + <aura:attribute name="agencyHospitalId" type="String" default="" /> <div class="{! v.container_class}"> <!-- header --> @@ -53,7 +54,10 @@ <aura:if isTrue="{!v.showSpinner}"> <lightning:spinner alternativeText="Loading" size="medium" /> </aura:if> - <lightning:recordEditForm objectApiName="Agency_Opportunity__c"> + <lightning:recordEditForm + objectApiName="Agency_Opportunity__c" + onload="{!c.handleLoad}" + > <lightning:accordion activeSectionName="{! v.section_names }" allowMultipleSectionsOpen="true" @@ -212,6 +216,12 @@ <div id="QueryResult" style="margin-top: 20px"></div> </div> + <!-- <aura:if isTrue="{!v.showNewAgencyContact}"> + <section role="dialog" tabindex="-1" aria-modal="true" aria-labelledby="modal-heading-01" class="slds-modal slds-fade-in-open" aura:id="NewAgencyContact" id="NewAgencyContact"> + <c:NewAgencyContact2 /> + </section> + </aura:if> --> + <aura:if isTrue="{!v.showNewAgencyContact}"> <section role="dialog" @@ -221,9 +231,14 @@ class="slds-modal slds-fade-in-open" aura:id="NewAgencyContact" id="NewAgencyContact" + aria-describedby="modal-content-id-2" + style="z-index: 9999" > - <c:NewAgencyContact2 /> + <c:NewAgencyContact2 + agencyHospitalId="{!v.agencyHospitalId}" + /> </section> + <div class="slds-backdrop2 slds-backdrop_open2"></div> </aura:if> </div> </section> -- Gitblit v1.9.1