From 4f200849487fc6f914e237d5af3ecefd6d802457 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期一, 10 七月 2023 09:52:59 +0800
Subject: [PATCH] backup1007
---
force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp | 72 +++++++++--------------------------
1 files changed, 19 insertions(+), 53 deletions(-)
diff --git a/force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp b/force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp
index f497ca4..2eef9b1 100644
--- a/force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp
+++ b/force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp
@@ -121,36 +121,25 @@
<aura:attribute name="contactawsurl" type="Map" />
<aura:attribute name="allselectlistAgencyPerson" type="Map" />
<!-- PIPL update Yin Mingjie 21/02/2022 end -->
-
- <!-- start DTT-zhj 澧炲姞閿欒淇℃伅table 2023-05-16-->
- <aura:attribute name="errorData" type="Object" />
- <aura:attribute name="errorColumns" type="List" />
- <!-- show Error information -->
- <aura:attribute name="showErrorInfo" type="Boolean" default="false" />
- <!-- end DTT-zhj 澧炲姞閿欒淇℃伅table 2023-05-16-->
-
<!-- 鎵归噺娣诲姞鍛ㄦ姤 end-->
<ltng:require scripts="{! $Resource.AWSService+'/AWSService.js' }" />
<ltng:require scripts="{! $Resource.jquery183minjs }" />
<!--銉兗銉変腑...-->
<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 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>
</div>
</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"
@@ -183,7 +172,7 @@
/>
</div>
<div
- class="tr slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-12 slds-large-size--1-of-12"
+ class="tr slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12"
>
<ui:button
aura:id="new_button"
@@ -193,7 +182,7 @@
/>
</div>
<div
- class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12"
+ class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12"
>
<ui:button
aura:id="copy_button"
@@ -224,31 +213,29 @@
>
<thead>
<tr class="slds-line-height--reset">
- <th class="table_header slds-text-title--caps" style="width: 250px">
- <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"></th>
+ <th class="table_header slds-text-title--caps">
<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">
<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">
<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">
<!-- 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"
+ <span class="slds-truncate" title="Name"
>{!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">
<span class="slds-truncate" title="Name"
>{!v.fieldsmap.visitor_title__c}</span
>
@@ -395,27 +382,6 @@
onclick="{!c.cancel}"
/>
</div>
- <!-- start DTT-zhj 澧炲姞閿欒淇℃伅table 2023-05-16-->
- <aura:if isTrue="{!v.showErrorInfo}">
- <div class="slds-p-around--large slds-align--absolute-center">
- <lightning:button
- label="瀵煎嚭閿欒淇℃伅"
- variant="brand"
- onclick="{!c.exportErrorInfo}"
- />
- </div>
- <div class="slds-p-around--large slds-align--absolute-center">
- <div style="height: 300px; overflow-x: scroll">
- <lightning:datatable
- keyField="id"
- data="{! v.errorData }"
- columns="{! v.errorColumns }"
- hideCheckboxColumn="true"
- />
- </div>
- </div>
- </aura:if>
- <!-- start DTT-zhj 澧炲姞閿欒淇℃伅table 2023-05-16-->
</aura:set>
</aura:if>
</div>
@@ -539,7 +505,7 @@
>
<div class="slds-modal__container">
<div class="slds-modal__header">
- <h4 id="headerTarget" class="slds-float--left"></h4>
+ <h4 id="headerTarget" class="slds-float--left">{!v.dialog_type}</h4>
<h2 id="headerTarget" class="slds-text-heading--medium">
鍛ㄦ姤({!v.selected_date} {!v.selected_agency_person})
</h2>
--
Gitblit v1.9.1