From f5d4f999ba69421c3fb107561fe1ee4c29d3f680 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 07 七月 2023 17:26:18 +0800
Subject: [PATCH] CodeBackupStage
---
force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp | 169 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 128 insertions(+), 41 deletions(-)
diff --git a/force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp b/force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp
index 2eef9b1..831f94a 100644
--- a/force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp
+++ b/force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp
@@ -36,6 +36,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" />
@@ -121,22 +122,35 @@
<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 id="aa" class="slds-assistive-text">Loading</span>
- <div class="slds-spinner__dot-a"></div>
- <div class="slds-spinner__dot-b"></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>
- </div>
+ </aura:renderIf>
</aura:renderIf>
<div aura:id="report" id="report" class="contents_wrapper">
@@ -172,7 +186,7 @@
/>
</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"
+ 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"
@@ -182,7 +196,7 @@
/>
</div>
<div
- class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12"
+ 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"
@@ -213,34 +227,60 @@
>
<thead>
<tr class="slds-line-height--reset">
- <th class="table_header slds-text-title--caps"></th>
- <th class="table_header slds-text-title--caps">
+ <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; 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">
+ <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">
+ <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">
+ <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"
+ <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">
+ <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
>
@@ -338,6 +378,13 @@
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">
@@ -382,6 +429,27 @@
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>
@@ -504,8 +572,15 @@
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">{!v.dialog_type}</h4>
+ <h4 id="headerTarget" class="slds-float--left"></h4>
<h2 id="headerTarget" class="slds-text-heading--medium">
鍛ㄦ姤({!v.selected_date} {!v.selected_agency_person})
</h2>
@@ -520,26 +595,31 @@
<div class="slds-box slds-theme--shade">
<div class="slds-grid slds-wrap slds-grid--pull-padded">
<div
- class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6"
+ class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6 marginTop"
>
娲诲姩鏃�
<!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> -->
- <force:inputField
+ <!-- <force:inputField value="{!v.data.Report_Date__c}" aura:id="input-report-date"/> -->
+ <lightning:input
+ type="date"
value="{!v.data.Report_Date__c}"
aura:id="input-report-date"
+ variant="label-hidden"
/>
</div>
<!-- 鍖婚櫌 -->
<div
aura:id="hospital_list"
- class="slds-form-element slds-lookup slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-5"
+ class="slds-form-element slds-lookup slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-5 marginTop"
data-select="single"
>
- <ui:inputText
+ <!-- <ui:inputText aura:id="hospital_input_text" label="鍖婚櫌" class="field" value="{!v.hospital}" updateOn="keyup"/> -->
+ 鍖婚櫌
+ <lightning:input
aura:id="hospital_input_text"
- label="鍖婚櫌"
class="field"
value="{!v.hospital}"
+ variant="label-hidden"
updateOn="keyup"
/>
<div class="slds-lookup__menu" id="lookup-66">
@@ -570,7 +650,7 @@
<!-- 绉戝鍒嗙被 -->
<div
- class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-8"
+ class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-8 marginTop"
>
{!v.fieldsmap.Department_Cateogy__c}
<ui:inputSelect
@@ -582,7 +662,7 @@
<!-- 鍏堢敓 -->
<div
- class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-8"
+ class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-8 marginTop"
>
{!v.fieldsmap.doctor2__c}
<ui:inputSelect
@@ -593,7 +673,7 @@
</div>
<div
- class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-12"
+ class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-12 marginTop"
>
<br />
<ui:button
@@ -607,14 +687,14 @@
<!-- 鑱屼綅 -->
<div
- class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-8"
+ class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-8 marginTop"
>
{!v.fieldsmap.visitor_title__c}
<div>{!v.doctor_title}</div>
</div>
<!-- 娲诲姩鍖哄垎 -->
<div
- class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6"
+ class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6 marginTop"
>
{!v.fieldsmap.Purpose_Type__c}
<ui:inputSelect
@@ -626,7 +706,7 @@
<!-- 璇环 -->
<div
aura:id="input-opportunity-opp"
- class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--4-of-12 slds-large-size--4-of-12"
+ class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--4-of-12 slds-large-size--4-of-12 marginTop"
>
{!v.fieldsmap.Opportunity__c}
<!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> -->
@@ -652,11 +732,11 @@
</div>
<div
aura:id="input-opportunity-blank"
- class="lds-p-horizontal--small slds-size--1-of-1 slds-medium-size--8-of-12 slds-large-size--8-of-12"
+ class="lds-p-horizontal--small slds-size--1-of-1 slds-medium-size--8-of-12 slds-large-size--8-of-12 marginTop"
></div>
<div
aura:id="input-opportunity-stage"
- class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12"
+ class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12 marginTop"
>
{!v.fieldsmap.StageName__c}
<!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> -->
@@ -665,7 +745,7 @@
</div>
<div
aura:id="input-opportunity-amount1"
- class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12"
+ class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12 marginTop"
>
{!v.fieldsmap.Amount__c}
<!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> -->
@@ -673,7 +753,7 @@
</div>
<div
aura:id="input-opportunity-amount2"
- class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12"
+ class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12 marginTop"
>
{!v.fieldsmap.OCMSale_Price__c}
<!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> -->
@@ -684,7 +764,7 @@
</div>
<div
aura:id="input-opportunity-date"
- class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12"
+ class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12 marginTop"
>
{!v.fieldsmap.Close_Forecasted_Date__c}
<!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> -->
@@ -696,7 +776,7 @@
<!-- 瑁藉搧鍒嗛 -->
<div
aura:id="product_category_select1"
- 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--3-of-12 slds-large-size--3-of-12 marginTop"
>
{!v.fieldsmap.Product_Category1__c}
<!-- <force:inputField value="{!v.data.Product_Category1__c}" aura:id="input-product-category1"/> -->
@@ -708,7 +788,7 @@
</div>
<div
aura:id="product_category_select2"
- 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--3-of-12 slds-large-size--3-of-12 marginTop"
>
{!v.fieldsmap.Product_Category2__c}
<!-- <force:inputField value="{!v.data.Product_Category2__c}" aura:id="input-product-category2"/> -->
@@ -720,7 +800,7 @@
</div>
<div
aura:id="product_category_select3"
- 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--3-of-12 slds-large-size--3-of-12 marginTop"
>
{!v.fieldsmap.Product_Category3__c}
<!-- <force:inputField value="{!v.data.Product_Category3__c}" aura:id="input-product-category3"/> -->
@@ -733,7 +813,7 @@
<!--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"
+ class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6 marginTop"
>
{!v.fieldsmap.SupportNeeds__c}
<ui:inputSelect aura:id="SupportNeeds__c" class="slds-select" />
@@ -741,7 +821,7 @@
<!--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"
+ class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12 marginTop"
>
{!v.fieldsmap.Result__c}
<ui:inputSelect aura:id="select_result" class="slds-select" />
@@ -924,6 +1004,13 @@
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