From ac719375874fd50fad5a11f8e04ac3329081bd0b Mon Sep 17 00:00:00 2001
From: Li Jun <buli@deloitte.com.cn>
Date: 星期五, 08 四月 2022 22:58:44 +0800
Subject: [PATCH] Fix Weekly Report
---
force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp | 54 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 43 insertions(+), 11 deletions(-)
diff --git a/force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp b/force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp
index 3b58f87..e16d6fd 100644
--- a/force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp
+++ b/force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp
@@ -71,8 +71,19 @@
<!-- It will display 100 records . Change for your requirement-->
<aura:attribute name="NumOfRecords" type="Integer" default="1000"/>
<aura:attribute name="showMain" type="Boolean" default="true"/>
+ <!-- PIPL update Yin Mingjie 21/02/2022 start -->
+ <aura:attribute name="AWStoken" type="String"/>
+ <aura:attribute name="AWSsearch" type="String"/>
+ <aura:attribute name="AWSinsert" type="String"/>
+ <aura:attribute name="AWStransactionURL" type="String"/>
+ <aura:attribute name="AWSDoctor2Map" type="String"/>
+ <aura:attribute name="awsurl" type="Map"/>
+ <aura:attribute name="contactawsurl" type="Map"/>
+ <aura:attribute name="allselectlistAgencyPerson" type="Map"/>
+ <!-- PIPL update Yin Mingjie 21/02/2022 end -->
<!-- 鎵归噺娣诲姞鍛ㄦ姤 end-->
-
+ <ltng:require scripts="{! $Resource.AWSService+'/AWSService.js' }" />
+ <ltng:require scripts="{! $Resource.jquery183minjs }" />
<!--銉兗銉変腑...-->
<aura:renderIf isTrue="{!v.login}">
@@ -135,7 +146,11 @@
<span class="slds-truncate" title="Name">{!v.fieldsmap.Department_Cateogy__c}</span>
</th>
<th class="table_header slds-text-title--caps">
- <span class="slds-truncate" title="Name">{!v.fieldsmap.doctor2__c}</span>
+ <!-- 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>
+
</th>
<th class="table_header slds-text-title--caps">
<span class="slds-truncate" title="Name">{!v.fieldsmap.visitor_title__c}</span>
@@ -154,7 +169,10 @@
</td>
<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}">{!item.Person_In_Charge2__r.Name}</span>
+ <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>
+ </span>
</span>
</td>
<th scope="row" tabindex="0" class="slds-cell-edit">
@@ -169,12 +187,18 @@
</td>
<td role="gridcell" class="slds-cell-edit">
<span class="slds-grid slds-grid--align-spread">
- <span class="slds-truncate" title="{!item.doctor2__r.Name}">{!item.doctor2__r.Name}</span>
+ <span class="slds-truncate" title="{!item.doctor2__r.Name}">
+ <span class="encrypt">{!item.doctor2__r.Name}</span>
+ <span class="decrypt">{!item.doctor2__r.awsdata.name}</span>
+ </span>
</span>
</td>
<td role="gridcell" class="slds-cell-edit">
<span class="slds-grid slds-grid--align-spread">
- <span class="slds-truncate" title="{!item.visitor_title__c}">{!item.visitor_title__c}</span>
+ <span class="slds-truncate" title="{!item.visitor_title__c}">
+ <span class="encrypt">{!item.visitor_title__c}</span>
+ <span class="decrypt">{!item.doctor2__r.awsdata.doctorDivision1}</span>
+ </span>
</span>
</td>
<td role="gridcell" class="slds-cell-edit">
@@ -342,8 +366,7 @@
<div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-8">
{!v.fieldsmap.visitor_title__c}
<div>{!v.doctor_title}</div>
- </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">
{!v.fieldsmap.Purpose_Type__c}
@@ -410,7 +433,10 @@
<!-- <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绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� 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}
<ui:inputSelect aura:id="select_result" class="slds-select"/>
@@ -468,12 +494,18 @@
</td>
<td role="gridcell" class="slds-cell-edit">
<span class="slds-grid slds-grid--align-spread">
- <span class="slds-truncate" title="{!item.doctor2__r.Name}">{!item.doctor2__r.Name}</span>
+ <span class="slds-truncate" title="{!item.doctor2__r.Name}">
+ <span class="encrypt">{!item.doctor2__r.Name}</span>
+ <span class="decrypt">{!item.doctor2NameOrigin}</span>
+ </span>
</span>
</td>
<td role="gridcell" class="slds-cell-edit">
<span class="slds-grid slds-grid--align-spread">
- <span class="slds-truncate" title="{!item.visitor_title__c}">{!item.visitor_title__c}</span>
+ <span class="slds-truncate" title="{!item.visitor_title__c}">
+ <span class="encrypt">{!item.visitor_title__c}</span>
+ <span class="decrypt">{!item.visitorTitleOrigin}</span>
+ </span>
</span>
</td>
<td role="gridcell" class="slds-cell-edit">
@@ -519,7 +551,7 @@
<lightning:messages aura:id="OppMessage" />
<!-- onload="{!c.showRequiredFields}" -->
<aura:renderIf isTrue="{!v.truthy}">
- <lightning:inputField fieldName="Name"/>
+ <lightning:inputField fieldName="Name" aura:id="newOpportunityField" />
<lightning:inputField fieldName="Type__c" aura:id="newOpportunityField" />
<lightning:inputField fieldName="Doctor_Division1__c" aura:id="newOpportunityField" />
<!-- <lightning:inputField class="customRequired none" aura:id="Input_type__c" fieldName="Type__c"/>
--
Gitblit v1.9.1