From 31cdc8c58cbdb9c4a54086be8d781af40dc4df7f Mon Sep 17 00:00:00 2001 From: Li Jun <buli@deloitte.com.cn> Date: 星期五, 08 四月 2022 23:01:33 +0800 Subject: [PATCH] Fix Weekly Report0408 --- force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp b/force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp index 41c8c07..0dc1c71 100644 --- a/force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp +++ b/force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp @@ -82,7 +82,8 @@ <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}"> @@ -145,7 +146,11 @@ <span class="slds-truncate" title="Name">{!v.fieldsmap.Department_Cateogy__c}</span> </th> <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">{!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> @@ -165,8 +170,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> @@ -430,10 +435,7 @@ </div> <!--SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start--> <!-- 鏀彺闇�姹� --> - <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" change="{!c.SupportNeeds__c}"/> - </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} -- Gitblit v1.9.1