From 41625c74ad92b72151f4d1009ea0c791635d9dac Mon Sep 17 00:00:00 2001
From: binxie <137736985@qq.com>
Date: 星期一, 19 六月 2023 22:02:56 +0800
Subject: [PATCH] test
---
force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp | 76 ++++++++++++++++++++++++++------------
1 files changed, 52 insertions(+), 24 deletions(-)
diff --git a/force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp b/force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp
index e16d6fd..c821d3b 100644
--- a/force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp
+++ b/force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp
@@ -81,22 +81,33 @@
<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}">
- <div class="slds-spinner_container height100vh">
- <div class="slds-spinner--brand slds-spinner slds-spinner--medium" role="alert">
- <span class="slds-assistive-text">Loading</span>
- <div class="slds-spinner__dot-a"></div>
- <div class="slds-spinner__dot-b"></div>
- </div>
- </div>
+ <!-- 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>
- <div aura:id="report" id="report" class="contents_wrapper">
+ <div aura:id="report" id="report">
<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">
鍛�
@@ -112,10 +123,10 @@
<div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12">
<ui:inputSelect aura:id="select_agency_person" class="slds-select agency_person_select" change="{!c.select_agency_change}"/>
</div>
- <div class="tr slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12">
+ <div class="tr slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-12 slds-large-size--1-of-12">
<ui:button aura:id="new_button" label="鏂板缓" press="{!c.new_report}" disabled="true"/>
</div>
- <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12">
+ <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12">
<ui:button aura:id="copy_button" label="澶嶅埗" press="{!c.copy_button}" disabled="true"/>
<!-- <ui:button aura:id="import" label="瀵煎叆" press="{!c.import}" /> -->
<ui:button aura:id="import" label="瀵煎叆" press="{!c.import}" />
@@ -133,26 +144,26 @@
<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">
+ <th class="table_header slds-text-title--caps" style="width: 250px;">
</th>
- <th class="table_header slds-text-title--caps">
+ <th class="table_header slds-text-title--caps" style="width: 100px;">
<span class="slds-truncate" title="Name">{!v.fieldsmap.Person_In_Charge2__c}</span>
</th>
- <th class="table_header slds-text-title--caps">
+ <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">
+ <th class="table_header slds-text-title--caps" style="width: 100px;">
<span class="slds-truncate" title="Name">{!v.fieldsmap.Department_Cateogy__c}</span>
</th>
- <th class="table_header slds-text-title--caps">
+ <th class="table_header slds-text-title--caps" style="width: 100px;">
<!-- 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">{!v.fieldsmap.Agency_Contact__c}</span>
+ <span class="slds-truncate" title="Name" style="width: 100px;">{!v.fieldsmap.Agency_Contact__c}</span>
</th>
- <th class="table_header slds-text-title--caps">
+ <th class="table_header slds-text-title--caps" style="width: 100px;">
<span class="slds-truncate" title="Name">{!v.fieldsmap.visitor_title__c}</span>
</th>
<th class="table_header slds-text-title--caps">
@@ -170,8 +181,8 @@
<td role="gridcell" class="slds-cell-edit">
<span class="slds-grid slds-grid--align-spread">
<span class="slds-truncate" title="{!item.Person_In_Charge2__r.Name}">
- <span class="encrypt">{!item.Person_In_Charge2__r.Name}</span>
- <span class="decrypt">{!item.Person_In_Charge2__r.awsdata.lastName}</span>
+ {!item.Person_In_Charge2__r.Name}
+ <!-- <span class="decrypt">{!item.Person_In_Charge2__r.awsdata.lastName}</span> -->
</span>
</span>
</td>
@@ -245,7 +256,19 @@
<lightning:button label="鍙栨秷" variant="brand"
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>
@@ -433,9 +456,12 @@
<!-- <force:inputField value="{!v.data.Product_Category3__c}" aura:id="input-product-category3"/> -->
<ui:inputSelect aura:id="select_Product3" class="slds-select" change="{!c.productcategoryChange3}"/>
</div>
- <!--SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start-->
- <!-- 鏀彺闇�姹� -->
-
+ <!--SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start-->
+ <!-- 鏀彺闇�姹� change="{!c.SupportNeeds__c}"-->
+ <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6">
+ {!v.fieldsmap.SupportNeeds__c}
+ <ui:inputSelect aura:id="SupportNeeds__c" class="slds-select" />
+ </div>
<!--SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� end-->
<div aura:id="result" class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12">
{!v.fieldsmap.Result__c}
@@ -564,8 +590,10 @@
<br/>
<div class="save_button_area">
<lightning:button class="slds-m-top_small" type="button" label="鍙栨秷" onclick="{!c.createCancel}"/>
- <lightning:button class="slds-m-top_small" type="submit" label="鏂板缓" />
+ <lightning:button class="slds-m-top_small" type="submit" label="淇濆瓨" />
</div>
+
+
</lightning:recordEditForm>
</div>
</div>
--
Gitblit v1.9.1