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 | 273 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 188 insertions(+), 85 deletions(-)
diff --git a/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.cmp b/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.cmp
index a16937c..a8f7149 100644
--- a/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.cmp
+++ b/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.cmp
@@ -5,35 +5,44 @@
@last modified on : 07-08-2022
@last modified by : ChangeMeIn@UserSettingsUnder.SFDoc
-->
-<aura:component implements="force:lightningQuickActionWithoutHeader,force:hasRecordId,lightning:actionOverride,lightning:isUrlAddressable" access="global"
- controller="NewAgencyOpportunityController">
-
- <aura:attribute name = "recordId" type = "Id" default = ""/>
- <aura:attribute name = "recordTypeId" type = "Id" default = ""/>
- <aura:attribute name="ac_name" type="string"/>
- <aura:attribute name="title" type="string"/>
+<aura:component
+ implements="force:lightningQuickActionWithoutHeader,force:hasRecordId,lightning:actionOverride,lightning:isUrlAddressable"
+ access="global"
+ controller="NewAgencyOpportunityController"
+>
+ <aura:attribute name="recordId" type="Id" default="" />
+ <aura:attribute name="recordTypeId" type="Id" default="" />
+ <aura:attribute name="ac_name" type="string" />
+ <aura:attribute name="title" type="string" />
<aura:handler name="init" value="{!this}" action="{!c.doInit}" />
- <aura:attribute name="layout" type="LayoutDescriberHelper.LayoutWrapper"/>
- <aura:attribute name="record_data" type="Map"/>
- <aura:attribute name="section_names" type="List"/>
- <aura:attribute name="showSpinner" type="Boolean" default = "False"/>
- <aura:attribute name="showSpinner2" type="Boolean" default = "False"/>
- <aura:attribute name="staticResource" type="Map"/>
- <aura:attribute name="pi_fields_map" type="Map"/>
- <aura:attribute name="isClone" type="Boolean" default = "False"/>
+ <aura:attribute name="layout" type="LayoutDescriberHelper.LayoutWrapper" />
+ <aura:attribute name="record_data" type="Map" />
+ <aura:attribute name="section_names" type="List" />
+ <aura:attribute name="showSpinner" type="Boolean" default="False" />
+ <aura:attribute name="showSpinner2" type="Boolean" default="False" />
+ <aura:attribute name="staticResource" type="Map" />
+ <aura:attribute name="pi_fields_map" type="Map" />
+ <aura:attribute name="isClone" type="Boolean" default="False" />
<ltng:require scripts="{! $Resource.AWSService+'/AWSService.js' }" />
<ltng:require scripts="{! $Resource.jquery183minjs }" />
- <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="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="" />
-
-
- <div class="{! v.container_class}">
+ <div class="{! v.container_class}">
<!-- header -->
<header class="slds-modal__header">
<h2 id="modal-heading-01" class="slds-modal__title slds-hyphenate">
@@ -45,27 +54,66 @@
<aura:if isTrue="{!v.showSpinner}">
<lightning:spinner alternativeText="Loading" size="medium" />
</aura:if>
- <lightning:recordEditForm objectApiName="Agency_Opportunity__c">
- <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"
+ >
<aura:iteration items="{!v.layout}" var="section">
<aura:if isTrue="{! section.editHeading }">
- <lightning:accordionSection name="{! section.label }" label="缁忛攢鍟嗚浠蜂俊鎭�">
- <aura:iteration items="{! section.layoutColumns}" var="col">
- <aura:iteration items="{! col.layoutItems}" var="field">
-
- <aura:if isTrue="{!and(field.behavior != 'Readonly', field.field != 'Agency_Contact__c')}">
- <lightning:inputField required="{! field.behavior == 'Required' }" aura:id="field" fieldName="{! field.field}" value="{! field.value}" />
+ <lightning:accordionSection
+ name="{! section.label }"
+ label="缁忛攢鍟嗚浠蜂俊鎭�"
+ >
+ <aura:iteration
+ items="{! section.layoutColumns}"
+ var="col"
+ >
+ <aura:iteration
+ items="{! col.layoutItems}"
+ var="field"
+ >
+ <aura:if
+ isTrue="{!and(field.behavior != 'Readonly', field.field != 'Agency_Contact__c')}"
+ >
+ <lightning:inputField
+ required="{! field.behavior == 'Required' }"
+ aura:id="field"
+ fieldName="{! field.field}"
+ value="{! field.value}"
+ />
</aura:if>
- <aura:if isTrue="{!field.field == 'Agency_Contact__c' }">
+ <aura:if
+ isTrue="{!field.field == 'Agency_Contact__c' }"
+ >
<lightning:layout>
<lightning:layoutItem size="12">
- <lightning:input required="{! field.behavior == 'Required' }" label="瀹㈡埛浜哄憳" value = "{! field.value}" variant = "label-inline" style="margin-left: 0cm; display: none;" onclick="{! c.openModel }"/>
- <lightning:input required="{! field.behavior == 'Required' }" label="瀹㈡埛浜哄憳" value = "{! v.ac_name}" variant = "label-inline" style="margin-left: 0cm; " onclick="{! c.openModel }"/>
+ <lightning:input
+ required="{! field.behavior == 'Required' }"
+ label="瀹㈡埛浜哄憳"
+ value="{! field.value}"
+ variant="label-inline"
+ style="
+ margin-left: 0cm;
+ display: none;
+ "
+ onclick="{! c.openModel }"
+ />
+ <lightning:input
+ required="{! field.behavior == 'Required' }"
+ label="瀹㈡埛浜哄憳"
+ value="{! v.ac_name}"
+ variant="label-inline"
+ style="margin-left: 0cm"
+ onclick="{! c.openModel }"
+ />
</lightning:layoutItem>
</lightning:layout>
</aura:if>
-
-
</aura:iteration>
</aura:iteration>
</lightning:accordionSection>
@@ -73,73 +121,128 @@
</aura:iteration>
</lightning:accordion>
</lightning:recordEditForm>
-
- <div style="text-align:center;margin: 5px;">
- <lightning:button class="slds-button slds-button_neutral" label="鍙栨秷" onclick="{! c.cancelClick }" />
- <lightning:button class="slds-button slds-button_brand" variant="brand" label="淇濆瓨" onclick="{! c.saveClick }" />
+
+ <div style="text-align: center; margin: 5px">
+ <lightning:button
+ class="slds-button slds-button_neutral"
+ label="鍙栨秷"
+ onclick="{! c.cancelClick }"
+ />
+ <lightning:button
+ class="slds-button slds-button_brand"
+ variant="brand"
+ label="淇濆瓨"
+ onclick="{! c.saveClick }"
+ />
</div>
</div>
- <aura:if isTrue="{!v.isModalOpen}">
-
- <!-- Modal/Popup Box starts here-->
- <section role="dialog" tabindex="-1" aria-labelledby="modal-heading-01"
- aria-modal="true" aria-describedby="modal-content-id-1"
- class="slds-modal slds-fade-in-open" >
-
-
-
- <aura:renderIf isTrue="{!v.login}">
- <div class="slds-spinner_container height100vh">
- <div class="slds-spinner--brand slds-spinner slds-spinner--medium" role="alert">
- <span id="aa" class="slds-assistive-text">Loading</span>
- <div class="slds-spinner__dot-a"></div>
- <div class="slds-spinner__dot-b"></div>
- </div>
+ <aura:if isTrue="{!v.isModalOpen}">
+ <!-- Modal/Popup Box starts here-->
+ <section
+ role="dialog"
+ tabindex="-1"
+ aria-labelledby="modal-heading-01"
+ aria-modal="true"
+ aria-describedby="modal-content-id-1"
+ class="slds-modal slds-fade-in-open"
+ >
+ <aura:renderIf isTrue="{!v.login}">
+ <div class="slds-spinner_container height100vh">
+ <div
+ class="slds-spinner--brand slds-spinner slds-spinner--medium"
+ role="alert"
+ >
+ <span id="aa" class="slds-assistive-text"
+ >Loading</span
+ >
+ <div class="slds-spinner__dot-a"></div>
+ <div class="slds-spinner__dot-b"></div>
</div>
- </aura:renderIf>
+ </div>
+ </aura:renderIf>
-
-
- <div class="slds-modal__container">
+ <div class="slds-modal__container">
<!-- Modal/Popup Box Header Starts here-->
<header class="slds-modal__header">
- <lightning:buttonIcon iconName="utility:close"
+ <lightning:buttonIcon
+ iconName="utility:close"
onclick="{! c.closeModel }"
alternativeText="close"
variant="bare-inverse"
- class="slds-modal__close"/>
- <h2 id="modal-heading-01" class="slds-text-heading_medium slds-hyphenate">
- 鎼滅储瀹㈡埛浜哄憳
+ class="slds-modal__close"
+ />
+ <h2
+ id="modal-heading-01"
+ class="slds-text-heading_medium slds-hyphenate"
+ >
+ 鎼滅储瀹㈡埛浜哄憳
</h2>
</header>
-
+
<!--Modal Body Start here-->
- <div class="slds-modal__content slds-p-around_medium modal-body" id="modal-content-id-1">
+ <div
+ class="slds-modal__content slds-p-around_medium modal-body"
+ id="modal-content-id-1"
+ >
<lightning:layout>
<lightning:layoutItem size="7">
- <ui:inputText label="璇疯緭鍏ュ鎴峰鍚�" class="field" value="{!v.searchKeyWord}"/>
+ <ui:inputText
+ label="璇疯緭鍏ュ鎴峰鍚�"
+ class="field"
+ value="{!v.searchKeyWord}"
+ />
</lightning:layoutItem>
- <lightning:layoutItem size="2" class = "searchButton">
- <ui:button aura:id="button" buttonTitle="Click to see agency contact" class="button" label="鎼滅储" press="{!c.searchAgencyContact}" disabled="false"/>
+ <lightning:layoutItem size="2" class="searchButton">
+ <ui:button
+ aura:id="button"
+ buttonTitle="Click to see agency contact"
+ class="button"
+ label="鎼滅储"
+ press="{!c.searchAgencyContact}"
+ disabled="false"
+ />
</lightning:layoutItem>
- <lightning:layoutItem size="3" class = "searchButton">
- <ui:button aura:id="newAgencyContact" buttonTitle="Click to see agency contact" class="newAgencyContact" label="鏂板缓.瀹㈡埛浜哄憳" disabled="false" press="{!c.showNewAgency}"/>
+ <lightning:layoutItem size="3" class="searchButton">
+ <ui:button
+ aura:id="newAgencyContact"
+ buttonTitle="Click to see agency contact"
+ class="newAgencyContact"
+ label="鏂板缓.瀹㈡埛浜哄憳"
+ disabled="false"
+ press="{!c.showNewAgency}"
+ />
</lightning:layoutItem>
</lightning:layout>
- <div id="QueryResult" style = "margin-top:20px;">
- </div>
+ <div id="QueryResult" style="margin-top: 20px"></div>
</div>
-
- <aura:if isTrue="{!v.showNewAgencyContact}">
+
+ <!-- <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>
-
- </div>
- </section>
- <div class="slds-backdrop slds-backdrop_open"></div>
-
- </aura:if>
+ </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>
</div>
-</aura:component>
\ No newline at end of file
+</aura:component>
--
Gitblit v1.9.1