From 744f42c5496e656a1f9927740a3b37c0b97a6cba Mon Sep 17 00:00:00 2001 From: buli <137736985@qq.com> Date: 星期五, 14 七月 2023 14:34:12 +0800 Subject: [PATCH] lexcommunityupload0714 --- force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp | 56 ++++++++++++++++++++++++++++++++++---------------------- 1 files changed, 34 insertions(+), 22 deletions(-) diff --git a/force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp b/force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp index b21a79e..8b827ee 100644 --- a/force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp +++ b/force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp @@ -16,6 +16,7 @@ <aura:attribute name="doclist" type="List"/> <aura:attribute name="docmap" type="Map"/> <aura:attribute name="login" type="Boolean" default="false"/> + <aura:attribute name="loginEdit" type="Boolean" default="false" /> <aura:attribute name="loadOpp" type="Boolean" default="false"/> <aura:attribute name="reportPageData" type="Map"/> <aura:attribute name="selectbody" type="String"/> @@ -95,19 +96,21 @@ <!--銉兗銉変腑...--> <aura:renderIf isTrue="{!v.login}"> - <!-- add by Deloitte-Link 2023-6-19 --> - <div class="weeklyReportSpinner"> - <div class="slds-spinner_container"> - <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> - </div> - </div> + <aura:renderIf isTrue="{!!v.loginEdit}"> + <!-- add by Deloitte-Link 2023-6-19 --> + <div class="weeklyReportSpinner"> + <div class="slds-spinner_container"> + <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> + </div> + </div> + </aura:renderIf> </aura:renderIf> - <div aura:id="report" id="report"> + <div aura:id="report" id="report" class="contents_wrapper"> <div class="slds-grid slds-wrap slds-grid--pull-padded"> <div class="tr mt5 slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-12 slds-large-size--1-of-12"> 鍛� @@ -139,34 +142,34 @@ </div> </div> - <div aura:id="report_list" class="report_list_area"> + <div aura:id="report_list" class="report_list_area" > <div class="slds-table--edit_container slds-is-relative"> <table class="slds-table slds-table--edit slds-table--bordered slds-table--fixed-layout slds-no-cell-focus" role="grid" style="width:66.75rem;"> <thead> <tr class="slds-line-height--reset"> - <th class="table_header slds-text-title--caps" style="width: 250px;"> + <th class="table_header slds-text-title--caps" style="width: 250px;font-size: 13px;"> <span class="slds-truncate" title="Name">鍛ㄦ姤缂栧彿</span> </th> - <th class="table_header slds-text-title--caps" style="width: 100px;"> + <th class="table_header slds-text-title--caps" style="width: 100px;font-size: 13px;"> <span class="slds-truncate" title="Name">{!v.fieldsmap.Person_In_Charge2__c}</span> </th> - <th class="table_header slds-text-title--caps" style="width: 250px;"> + <th class="table_header slds-text-title--caps" style="width: 250px;font-size: 13px;"> <span class="slds-truncate" title="Name">鍖婚櫌</span> </th> - <th class="table_header slds-text-title--caps" style="width: 100px;"> + <th class="table_header slds-text-title--caps" style="width: 100px;font-size: 13px;"> <span class="slds-truncate" title="Name">{!v.fieldsmap.Department_Cateogy__c}</span> </th> - <th class="table_header slds-text-title--caps" style="width: 100px;"> + <th class="table_header slds-text-title--caps" style="width: 100px;font-size: 13px;"> <!-- PIPL update Yin Mingjie 21/02/2022 start <span class="slds-truncate" title="Name">{!v.fieldsmap.doctor2__r}</span> PIPL update Yin Mingjie 21/02/2022 end--> - <span class="slds-truncate" title="Name" style="width: 100px;">{!v.fieldsmap.Agency_Contact__c}</span> + <span class="slds-truncate" title="Name" style="width: 100px;font-size: 13px;">{!v.fieldsmap.Agency_Contact__c}</span> </th> - <th class="table_header slds-text-title--caps" style="width: 100px;"> + <th class="table_header slds-text-title--caps" style="width: 100px;font-size: 13px;"> <span class="slds-truncate" title="Name">{!v.fieldsmap.visitor_title__c}</span> </th> - <th class="table_header slds-text-title--caps"> + <th class="table_header slds-text-title--caps" style="width: 100px;font-size: 13px;"> <span class="slds-truncate" title="Name">{!v.fieldsmap.Purpose_Type__c}</span> </th> </tr> @@ -231,10 +234,13 @@ </aura:renderIf> </div> -<!-- <ui:button aura:id="test_button" label="test" class="fade animation_on" press="{!c.test}"/>--> + <!-- <ui:button aura:id="test_button" label="test" class="fade animation_on" press="{!c.test}"/>--> <!-- 鎵归噺娣诲姞鍛ㄦ姤 start--> <div aura:id="modal_import" role="dialog" tabindex="-1" class="disp_none slds-modal slds-fade-in-open slds-modal--large" aria-labelledby="headerTarget"> <div class="slds-modal__container "> + <aura:renderIf isTrue="{!v.loginEdit}"> + <lightning:spinner alternativeText="Loading" size="medium" style="width: 100%; height: 80%;top:50px;" /> + </aura:renderIf> <div class="slds-modal__header "> <h4 id="headerTarget" class="slds-float--left"></h4> <h2 id="headerTarget" class="slds-text-heading--medium">鍛ㄦ姤鎵归噺瀵煎叆</h2> @@ -336,7 +342,10 @@ <!-- 鎵归噺瀵煎嚭鍛ㄦ姤 end--> <div aura:id="modal_window" role="dialog" tabindex="-1" class="disp_none slds-modal slds-fade-in-open slds-modal--large" aria-labelledby="headerTarget"> - <div class="slds-modal__container"> + <div class="slds-modal__container" > + <aura:renderIf isTrue="{!v.loginEdit}"> + <lightning:spinner alternativeText="Loading" size="medium" style="width: 100%; height: 80%;top:50px;" /> + </aura:renderIf> <div class="slds-modal__header"> <h4 id="headerTarget" class="slds-float--left"></h4> <h2 id="headerTarget" class="slds-text-heading--medium">鍛ㄦ姤({!v.selected_date} {!v.selected_agency_person})</h2> @@ -573,6 +582,9 @@ <div aura:id="modal_newAC" role="dialog" tabindex="-3" aria-labelledby="headertest" class="disp_none slds-modal slds-fade-in-open"> <div class="slds-modal__container"> + <aura:renderIf isTrue="{!v.loginEdit}"> + <lightning:spinner alternativeText="Loading" size="medium" style="width: 100%; height: 80%;top:50px;" /> + </aura:renderIf> <div class="slds-modal__header"> <h2 id="headertest" class="slds-text-heading--medium">鏂板缓.瀹㈡埛浜哄憳</h2> </div> -- Gitblit v1.9.1