From 4488f711dbc01a8db6753907cae2ef4021dede68 Mon Sep 17 00:00:00 2001
From: FUYU <fuyu@prec-tech.com>
Date: 星期三, 13 十二月 2023 16:30:27 +0800
Subject: [PATCH] 修改前备份
---
force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.cmp | 59 +++++++++++++++++------------------------------------------
1 files changed, 17 insertions(+), 42 deletions(-)
diff --git a/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.cmp b/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.cmp
index 373278d..a8f7149 100644
--- a/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.cmp
+++ b/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.cmp
@@ -25,7 +25,6 @@
<aura:attribute name="isClone" type="Boolean" default="False" />
<ltng:require scripts="{! $Resource.AWSService+'/AWSService.js' }" />
<ltng:require scripts="{! $Resource.jquery183minjs }" />
-<<<<<<< HEAD
<aura:attribute name="isModalOpen" type="boolean" default="false" />
<aura:attribute name="searchKeyWord" type="string" default="" />
<aura:attribute name="contactAWSIds" type="List" />
@@ -41,16 +40,7 @@
event="c:NewAgencyContactEvent"
action="{!c.closeAgencyContact}"
/>
-=======
- <aura:attribute name="isModalOpen" type="boolean" default="false"/>
- <aura:attribute name="searchKeyWord" type="string" default=""/>
- <aura:attribute name="contactAWSIds" type="List"/>
- <aura:attribute name="login" type="Boolean" default="false"/>
- <aura:attribute name="show" type="Boolean" default="false"/>
- <aura:attribute name="showNewAgencyContact" type="Boolean" default="false"/>
- <aura:handler name="NewAgencyContactEvent" event="c:NewAgencyContactEvent" action="{!c.closeAgencyContact}"/>
- <aura:attribute name="agencyHospitalId" type="String" default = ""/>
->>>>>>> LEXCommunityLiJun
+ <aura:attribute name="agencyHospitalId" type="String" default="" />
<div class="{! v.container_class}">
<!-- header -->
@@ -64,17 +54,15 @@
<aura:if isTrue="{!v.showSpinner}">
<lightning:spinner alternativeText="Loading" size="medium" />
</aura:if>
-<<<<<<< HEAD
- <lightning:recordEditForm objectApiName="Agency_Opportunity__c">
+ <lightning:recordEditForm
+ objectApiName="Agency_Opportunity__c"
+ onload="{!c.handleLoad}"
+ >
<lightning:accordion
activeSectionName="{! v.section_names }"
allowMultipleSectionsOpen="true"
class="greyyyy"
>
-=======
- <lightning:recordEditForm objectApiName="Agency_Opportunity__c" onload="{!c.handleLoad}">
- <lightning:accordion activeSectionName="{! v.section_names }" allowMultipleSectionsOpen="true" class="greyyyy" >
->>>>>>> LEXCommunityLiJun
<aura:iteration items="{!v.layout}" var="section">
<aura:if isTrue="{! section.editHeading }">
<lightning:accordionSection
@@ -227,7 +215,12 @@
</lightning:layout>
<div id="QueryResult" style="margin-top: 20px"></div>
</div>
-<<<<<<< HEAD
+
+ <!-- <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
@@ -238,36 +231,18 @@
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>
<div class="slds-backdrop slds-backdrop_open"></div>
</aura:if>
-=======
-
- <!-- <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" tabindex="-1" aria-modal="true" aria-labelledby="modal-heading-01"
- class="slds-modal slds-fade-in-open" aura:id="NewAgencyContact"
- id="NewAgencyContact" aria-describedby="modal-content-id-2" style="z-index: 9999;">
- <c:NewAgencyContact2 agencyHospitalId="{!v.agencyHospitalId}"/>
- </section>
- <div class="slds-backdrop2 slds-backdrop_open2"></div>
- </aura:if>
-
- </div>
- </section>
- <div class="slds-backdrop slds-backdrop_open"></div>
-
- </aura:if>
->>>>>>> LEXCommunityLiJun
</div>
</aura:component>
--
Gitblit v1.9.1