From 2aa8da8af66aa8ae00f25831aed6bb0364176e7b Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期四, 24 二月 2022 20:32:31 +0800
Subject: [PATCH] 1.15---2.24 变更代码
---
force-app/main/default/pages/ContractDetailPDF.page | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/force-app/main/default/pages/ContractDetailPDF.page b/force-app/main/default/pages/ContractDetailPDF.page
index 996595f..048c9ac 100644
--- a/force-app/main/default/pages/ContractDetailPDF.page
+++ b/force-app/main/default/pages/ContractDetailPDF.page
@@ -164,11 +164,12 @@
<!-- <apex:outputText value="{!item.qli.NameForPrint__c}"/> -->
<c:PDFWbr targetStr="{!item.qli.NameForPrint__c}"/>
</apex:column>
- <apex:column styleClass="detailRowString" style="vertical-align:text-top;width: 131px">
- <apex:facet name="header">{!$Label.Quote_SFDA_Approbation_No}</apex:facet>
+ <apex:column styleClass="detailRowString" style="vertical-align:text-top;width: 80px">
+ <!-- <apex:facet name="header">{!$Label.Quote_SFDA_Approbation_No}</apex:facet> </br>-->
+ <apex:facet name="header">娉ㄥ唽璇佸彿/ 澶囨鍑瘉缂栧彿</apex:facet>
<apex:outputText value="{!item.ApprobationNo_c}"/>
</apex:column>
- <apex:column styleClass="detailRowString" style="vertical-align:text-top;width: 132px">
+ <apex:column styleClass="detailRowString" style="vertical-align:text-top;width: 160px">
<apex:facet name="header">{!$Label.Quote_ProduceCompany}</apex:facet>
<!-- <apex:outputText value="{!item.ProduceCompany_c}"/> -->
<c:PDFWbr targetStr="{!item.ProduceCompany_c}"/>
@@ -202,6 +203,14 @@
<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:column>
+ <!-- lt 20220223 CHAN-CBW9FX 鐗规畩浜よ揣鏈熷奖鍝嶇殑瀵瑰簲 end -->
+
</apex:dataTable>
</div>
@@ -310,15 +319,22 @@
<apex:facet name="header"></apex:facet>
</apex:column>
<apex:column styleClass="detailRowString">
- <apex:facet name="header">
+ <apex:facet name="header">
Description</apex:facet>
</apex:column>
<apex:column styleClass="detailRowNumeric">
- <apex:facet name="header"> Quantity</apex:facet>
+ <apex:facet name="header"> Quantity</apex:facet>
</apex:column>
<apex:column styleClass="detailRowNumeric">
- <apex:facet name="header">Special Warranty Period(year) </apex:facet>
+ <apex:facet name="header"> Special Warranty Period(year) </apex:facet>
</apex:column>
+
+ <!-- lt 20220223 CHAN-CBW9FX 鐗规畩浜よ揣鏈熷奖鍝嶇殑瀵瑰簲 start -->
+ <apex:column styleClass="detailRowNumeric">
+ <apex:facet name="header"> Delivery Date </apex:facet>
+ </apex:column>
+ <!-- lt 20220223 CHAN-CBW9FX 鐗规畩浜よ揣鏈熷奖鍝嶇殑瀵瑰簲 end -->
+
</apex:dataTable>
<!-- 2021/01/15 liying end -->
<!-- 澶氳〃澶� 绗簩鍒楄〃澶� -->
@@ -346,10 +362,18 @@
</apex:outputText>
</apex:column>
- <apex:column styleClass="detailRowNumeric">
+ <apex:column styleClass="detailRowNumeric">
<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:column>
+ <!-- lt 20220223 CHAN-CBW9FX 鐗规畩浜よ揣鏈熷奖鍝嶇殑瀵瑰簲 end -->
+
</apex:dataTable>
</div>
</apex:outputpanel>
--
Gitblit v1.9.1