From 01f207d979d6be17c8cdec293feab48828c0ec3e Mon Sep 17 00:00:00 2001
From: 黄千龙 <huangqianlong@prec-tech.com>
Date: 星期五, 08 四月 2022 14:22:52 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG
---
force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.cmp | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.cmp b/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.cmp
index 6ae7294..e496831 100644
--- a/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.cmp
+++ b/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.cmp
@@ -77,6 +77,8 @@
<aura:attribute name="confirm_status" type="Integer" default="0" />
<aura:attribute name="modal_confirm_title" type="String" />
<aura:attribute name="modal_confirm_text" type="String" />
+ <!-- fy -->
+ <aura:attribute name="UserProType" type="String" />
<!-- 绉戝 -->
<aura:attribute name="opportunity_cfilter" type="String" />
<aura:attribute name="update_select_report_data_id" type="String" default="" />
@@ -91,6 +93,12 @@
<aura:attribute name="NumOfRecords" type="Integer" default="1000" />
<aura:attribute name="showMain" type="Boolean" default="true" />
<aura:attribute name="IsEventDefault" type="Boolean" default="true" />
+
+ <aura:attribute name="PIConfig" type="Map"/>
+
+ <ltng:require scripts="{! $Resource.AWSService+'/AWSService.js' }" />
+ <ltng:require scripts="{! $Resource.jquery183minjs }" />
+
<!-- 鎵归噺娣诲姞鍛ㄦ姤 end-->
<!--銉兗銉変腑...-->
<aura:renderIf isTrue="{!v.login}">
@@ -193,7 +201,10 @@
<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>
+ 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">
--
Gitblit v1.9.1