From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte
---
force-app/main/default/pages/ContractDetailPDF.page | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/force-app/main/default/pages/ContractDetailPDF.page b/force-app/main/default/pages/ContractDetailPDF.page
index 048c9ac..0d44278 100644
--- a/force-app/main/default/pages/ContractDetailPDF.page
+++ b/force-app/main/default/pages/ContractDetailPDF.page
@@ -165,8 +165,9 @@
<c:PDFWbr targetStr="{!item.qli.NameForPrint__c}"/>
</apex:column>
<apex:column styleClass="detailRowString" style="vertical-align:text-top;width: 80px">
+ <!-- lt 20220223 CHAN-CBW9FX 鐗规畩浜よ揣鏈熷奖鍝嶇殑瀵瑰簲 -->
<!-- <apex:facet name="header">{!$Label.Quote_SFDA_Approbation_No}</apex:facet> </br>-->
- <apex:facet name="header">娉ㄥ唽璇佸彿/ 澶囨鍑瘉缂栧彿</apex:facet>
+ <apex:facet name="header">娉ㄥ唽璇佸彿/ 澶囨鍑瘉 <br/>缂栧彿</apex:facet>
<apex:outputText value="{!item.ApprobationNo_c}"/>
</apex:column>
<apex:column styleClass="detailRowString" style="vertical-align:text-top;width: 160px">
@@ -200,14 +201,14 @@
<apex:outputText value="銆�銆�"/>
</apex:column>
<apex:column styleClass="detailRowString" style="vertical-align:text-top; text-align: center;">
- <apex:facet name="header">鐗规畩淇濅慨骞撮檺</apex:facet>
+ <apex:facet name="header">鐗规畩淇濅慨 骞撮檺</apex:facet>
<apex:outputText value="{!item.qli.GuaranteePeriod__c}"/>
</apex:column>
<!-- lt 20220223 CHAN-CBW9FX 鐗规畩浜よ揣鏈熷奖鍝嶇殑瀵瑰簲 start -->
<apex:column styleClass="detailRowNumeric">
<apex:facet name="header">浜よ揣鏈�</apex:facet>
- <apex:outputText value="{!item.qli.PricebookEntry.Product2.DeliveryDate__c}"/>
+ <apex:outputText value="{!item.qli.DeliveryDate__c}"/>
</apex:column>
<!-- lt 20220223 CHAN-CBW9FX 鐗规畩浜よ揣鏈熷奖鍝嶇殑瀵瑰簲 end -->
@@ -370,7 +371,7 @@
<!-- lt 20220223 CHAN-CBW9FX 鐗规畩浜よ揣鏈熷奖鍝嶇殑瀵瑰簲 start -->
<apex:column styleClass="detailRowNumeric">
<apex:facet name="header">浜よ揣鏈�</apex:facet>
- <apex:outputText value="{!item.qli.PricebookEntry.Product2.DeliveryDate__c}"/>
+ <apex:outputText value="{!item.qli.DeliveryDate__c}"/>
</apex:column>
<!-- lt 20220223 CHAN-CBW9FX 鐗规畩浜よ揣鏈熷奖鍝嶇殑瀵瑰簲 end -->
--
Gitblit v1.9.1