From cc266a1e4080bb3ecc47ea4a202dd549545111e1 Mon Sep 17 00:00:00 2001
From: 游畅 <youchang@prec-tech.com>
Date: 星期六, 29 四月 2023 16:10:52 +0800
Subject: [PATCH] 贸易合规20230429
---
force-app/main/default/pages/NewMCHPDFLimit.page | 74 ++++++++++++++++++++++--------------
1 files changed, 45 insertions(+), 29 deletions(-)
diff --git a/force-app/main/default/pages/NewMCHPDFLimit.page b/force-app/main/default/pages/NewMCHPDFLimit.page
index c704be0..53930af 100644
--- a/force-app/main/default/pages/NewMCHPDFLimit.page
+++ b/force-app/main/default/pages/NewMCHPDFLimit.page
@@ -39,7 +39,7 @@
<!-- 銉氥兗銈革紤 -->
<table width="100%" cellspacing="0" cellpadding="0" style="font-size:13pt;">
<!-- <tr><td style="text-align: center;font-size: 18pt"><span style="border-bottom:double 3px;">濂ユ灄宸存柉缁翠慨鏈嶅姟鍚堝悓</span></td></tr> -->
- <tr><td style="text-align: center;font-size: 18pt">濂ユ灄宸存柉鏈嶅姟鍚堝悓</td></tr>
+ <tr><td style="text-align: center;font-size: 18pt">濂ユ灄宸存柉杈撳翱绠¤偩鐩傞暅缁翠慨鍚堝悓</td></tr>
</table>
<table width="100%" cellspacing="0" cellpadding="0" style="font-size:13pt;">
<tr><td height="40px"></td></tr>
@@ -95,7 +95,9 @@
<tr>
<td><c:PDFWbr targetStr="{!targetMC.TermTwo_One}"/>{!targetMC.StartYear}骞磠!targetMC.StartMonth}鏈坽!targetMC.StartDay}鏃ヨ嚦
{!targetMC.EndYear}骞磠!targetMC.EndMonth}鏈坽!targetMC.EndDay}鏃ャ��
+ <c:PDFWbr targetStr="{!targetMC.TermTwo_Two}"/>
</td>
+
</tr>
</apex:outputPanel>
@@ -118,20 +120,7 @@
<c:PDFWbr targetStr="{!targetMC.TermThree_Three}" />
</td>
</tr>
-
- <tr><td height="15px"></td></tr>
- <tr>
- <td>
- <c:PDFWbr targetStr="{!targetMC.TermTen_One}"/>
- 锟�<c:PDFWbr targetStr="{!targetMC.Amount_Warranty_Coverage}"/>
- <c:PDFWbr targetStr="{!targetMC.TermTen_Two}"/><u>
- <c:PDFWbr targetStr="{!targetMC.Amount_Warranty_Coverage_In_Word}"/> </u><c:PDFWbr targetStr="{!targetMC.TermTen_Three}" />
- </td>
- </tr>
- <tr><td><c:PDFWbr targetStr="{!targetMC.TermTen_Four}" /></td></tr>
- <tr><td><c:PDFWbr targetStr="{!targetMC.TermTen_Four_one}" /></td></tr>
- <tr><td><c:PDFWbr targetStr="{!targetMC.TermTen_Four_two}" /></td></tr>
- <tr><td> <c:PDFWbr targetStr="{!targetMC.TermTen_Four_Three}" /></td></tr>
+
<tr><td height="15px"></td></tr>
<tr><td><c:PDFWbr targetStr="{!targetMC.TermFour_One}"/></td></tr>
<tr><td>
@@ -261,6 +250,31 @@
</td></tr>
<tr><td><c:PDFWbr targetStr="{!targetMC.TermFive_One}" /></td></tr>
<tr><td><c:PDFWbr targetStr="{!targetMC.TermFive_One2}" /></td></tr>
+ <tr><td><c:PDFWbr targetStr="{!targetMC.TermFive_One3}" />
+ <!-- URF闄愭鍚堝悓2鏈� xxf 2022/08/23 start -->
+ <!-- <b><c:PDFWbr targetStr="{!IF(targetMC.MC.Maintenance_Contract__r[0].URF_P_MaxRepairCount__c == 0, '/',targetMC.MC.Maintenance_Contract__r[0].URF_P_MaxRepairCount__c)}" /></b> -->
+ <b >{!IF(targetMC.MC.Maintenance_Contract__r[0].URF_P_MaxRepairCount__c == 0 || targetMC.MC.Maintenance_Contract__r[0].URF_P_MaxRepairCount__c == '0' || targetMC.MC.Maintenance_Contract__r[0].URF_P_MaxRepairCount__c == null, "/ ",targetMC.MC.Maintenance_Contract__r[0].URF_P_MaxRepairCount__c)}</b>
+ <c:PDFWbr targetStr="{!targetMC.TermFive_One3Append}" />
+ <u> <c:PDFWbr targetStr="{!targetMC.MC.Maintenance_Contract__r[0].Total_Number_Asset_P__c}" /> </u>
+ <!-- URF闄愭鍚堝悓2鏈� xxf 2022/08/23 end -->
+ <c:PDFWbr targetStr="{!targetMC.TermFive_One4}" />
+ <!-- URF闄愭鍚堝悓2鏈� xxf 2022/08/23 start -->
+ <u> <c:PDFWbr targetStr="{!IF(targetMC.MC.Maintenance_Contract__r[0].URF_P_MaxRepairCount__c == 0 || targetMC.MC.Maintenance_Contract__r[0].URF_P_MaxRepairCount__c == '0' || targetMC.MC.Maintenance_Contract__r[0].URF_P_MaxRepairCount__c == null, '/ ',targetMC.MC.Maintenance_Contract__r[0].URF_P_RepairTime__c)}" /></u>
+ <!-- URF闄愭鍚堝悓2鏈� xxf 2022/08/23 end -->
+ <c:PDFWbr targetStr="{!targetMC.TermFive_One5}" /></td></tr>
+ <tr><td><c:PDFWbr targetStr="{!targetMC.TermFive_One6}" />
+ <!-- URF闄愭鍚堝悓2鏈� xxf 2022/08/23 start -->
+ <b >{!IF(targetMC.MC.Maintenance_Contract__r[0].URF_V_MaxRepairCount__c == 0 || targetMC.MC.Maintenance_Contract__r[0].URF_V_MaxRepairCount__c == '0' || targetMC.MC.Maintenance_Contract__r[0].URF_V_MaxRepairCount__c == null, "/ ",targetMC.MC.Maintenance_Contract__r[0].URF_V_MaxRepairCount__c)}</b>
+ <!-- <b >{!IF(targetMC.MC.Maintenance_Contract__r[0].URF_V_MaxRepairCount__c == 0, "/ ",targetMC.MC.Maintenance_Contract__r[0].URF_V_MaxRepairCount__c)} 娆�</b> -->
+ <c:PDFWbr targetStr="{!targetMC.TermFive_One6Append}" />
+ <u> <c:PDFWbr targetStr="{!targetMC.MC.Maintenance_Contract__r[0].Total_Number_Asset_V__c}" /> </u>
+ <!-- URF闄愭鍚堝悓2鏈� xxf 2022/08/23 end -->
+ <c:PDFWbr targetStr="{!targetMC.TermFive_One7}" />
+ <!-- URF闄愭鍚堝悓2鏈� xxf 2022/08/23 start -->
+ <u> <c:PDFWbr targetStr="{!IF(targetMC.MC.Maintenance_Contract__r[0].URF_V_MaxRepairCount__c == 0 || targetMC.MC.Maintenance_Contract__r[0].URF_V_MaxRepairCount__c == '0' || targetMC.MC.Maintenance_Contract__r[0].URF_V_MaxRepairCount__c == null, '/ ',targetMC.MC.Maintenance_Contract__r[0].URF_V_RepairTime__c)}" /></u>
+ <!-- URF闄愭鍚堝悓2鏈� xxf 2022/08/23 end -->
+ <c:PDFWbr targetStr="{!targetMC.TermFive_One8}" /></td></tr>
+ <tr><td><c:PDFWbr targetStr="{!targetMC.TermFive_One9}" /></td></tr>
<tr><td>
<c:PDFWbr targetStr="{!targetMC.TermFive_Two}" />
<u> <c:PDFWbr targetStr="{!targetMC.Mc.Small_Repair_Time__c}" /> </u>
@@ -273,16 +287,16 @@
</td></tr>
<tr><td><c:PDFWbr targetStr="{!targetMC.TermFive_Four}" /></td></tr>
<tr><td><c:PDFWbr targetStr="{!targetMC.TermFive_Five}" /></td></tr>
- <tr><td><c:PDFWbr targetStr="{!targetMC.TermFive_Five2}" /></td></tr>
+ <!-- <tr><td><c:PDFWbr targetStr="{!targetMC.TermFive_Five2}" /></td></tr> -->
<tr><td><c:PDFWbr targetStr="{!targetMC.TermFive_Six}" /></td></tr>
- <tr><td><c:PDFWbr targetStr="{!targetMC.TermFive_Seven}" /></td></tr>
- <tr><td><c:PDFWbr targetStr="{!targetMC.TermFive_Eight}" /></td></tr>
- <tr><td><c:PDFWbr targetStr="{!targetMC.TermFive_Nine}" /></td></tr>
- <tr><td>
+ <!-- <tr><td><c:PDFWbr targetStr="{!targetMC.TermFive_Seven}" /></td></tr> -->
+ <!-- <tr><td><c:PDFWbr targetStr="{!targetMC.TermFive_Eight}" /></td></tr>
+ <tr><td><c:PDFWbr targetStr="{!targetMC.TermFive_Nine}" /></td></tr> -->
+ <!-- <tr><td>
<c:PDFWbr targetStr="{!targetMC.TermFive_Ten}" />
<u> <c:PDFWbr targetStr="{!targetMC.Mc.Inspection_Time__c}" /> </u>
<c:PDFWbr targetStr="{!targetMC.TermFive_Ten2}" />
- </td></tr>
+ </td></tr> -->
<!-- 涓冦�� 鐢叉柟璐ｄ换鑼冨洿 -->
<tr><td height="15px"></td></tr>
@@ -297,10 +311,10 @@
<tr><td><c:PDFWbr targetStr="{!targetMC.TermSix_Seven}" /></td></tr>
<tr><td><c:PDFWbr targetStr="{!targetMC.TermSix_Eight}" /></td></tr>
- <!-- 鍏�� 鐢蹭箼鍙屾柟鍚屾剰鏈悎鍚岃繘琛岀画绛� -->
- <tr><td height="15px"></td></tr>
+ <!--鍏�� 鐢蹭箼鍙屾柟鍚屾剰鏈悎鍚岃繘琛岀画绛� -->
+ <!-- <tr><td height="15px"></td></tr>
<tr><td><c:PDFWbr targetStr="{!targetMC.TermSeven_Title}" /></td></tr>
- <tr><td><c:PDFWbr targetStr="{!targetMC.TermSeven_One}" /></td></tr>
+ <tr><td><c:PDFWbr targetStr="{!targetMC.TermSeven_One}" /></td></tr> -->
<!-- <tr><td style="display:none;">1銆�</td></tr> -->
<!-- <apex:outputPanel rendered="{!targetMC.MC.Term_Of_Payment__c == '涓�娆℃�т粯娆�' }">
<tr><td height="20px"></td></tr>
@@ -311,7 +325,7 @@
<apex:outputPanel rendered="{!targetMC.MC.Term_Of_Payment__c == '澶氭浠樻' && targetMC.Total_Payment_Time != null && targetMC.Total_Payment_Time == 2 }">
<tr><td height="20px"></td></tr>
</apex:outputPanel> -->
- <tr><td>1銆�</td></tr>
+ <!-- <tr><td>1銆�</td></tr>
</table>
<table border="2px" style="border-style: solid; border-bottom-style: none;" cellspacing="0" cellpadding="0">
<tr>
@@ -344,7 +358,7 @@
</table>
<tr><td height="15px"></td></tr>
<table width="100%" cellspacing="0" cellpadding="0" style="font-size:13pt;">
- <tr><td><c:PDFWbr targetStr="{!targetMC.TermSeven_Two}" /></td></tr>
+ <tr><td><c:PDFWbr targetStr="{!targetMC.TermSeven_Two}" /></td></tr> -->
<!-- HWAG-BLWFGC 杩藉姞绗叓鏉★紝鍘熷叓涔濇潯椤哄欢 2020-02-19 update by vivek start -->
<tr><td height="15px"></td></tr>
@@ -355,7 +369,7 @@
<tr><td><c:PDFWbr targetStr="{!targetMC.TermEightAppend_Three1}" /></td></tr>
<tr><td><c:PDFWbr targetStr="{!targetMC.TermEightAppend_Four}" /></td></tr>
<tr><td><c:PDFWbr targetStr="{!targetMC.TermEightAppend_Five}" /></td></tr>
- <tr><td> <c:PDFWbr targetStr="{!targetMC.TermEightAppend_Six}" /></td></tr>
+ <tr><td><c:PDFWbr targetStr="{!targetMC.TermEightAppend_Six}" /></td></tr>
<!-- HWAG-BLWFGC 杩藉姞绗叓鏉★紝鍘熷叓涔濇潯椤哄欢 2020-02-19 update by vivek end -->
<!-- 涔濄�� 鏈悎鍚岀殑瑙ｉ噴涓庢墽琛岄�傜敤涓崕浜烘皯鍏卞拰鍥芥硶寰� -->
@@ -369,12 +383,14 @@
<tr><td><c:PDFWbr targetStr="{!targetMC.TermEight_Two}" /></td></tr>
<tr><td><c:PDFWbr targetStr="{!targetMC.TermEight_Three}" /></td></tr>
- <!-- 鍗併�� 鏈悎鍚岀敳鏂规墽 浠� -->
+ <!-- 涔濄�� 鏈悎鍚屼竴寮� 浠� -->
<tr><td height="15px"></td></tr>
<tr><td>
<c:PDFWbr targetStr="{!targetMC.TermNine_One}" />
- <u> <c:PDFWbr targetStr="{!targetMC.Mc.First_Party_Contract_Number__c}" /> </u>
+ <u> <c:PDFWbr targetStr="{!targetMC.Mc.Total_Contract_Number__c}" /> </u>
<c:PDFWbr targetStr="{!targetMC.TermNine_Two}" />
+ <u> <c:PDFWbr targetStr="{!targetMC.Mc.First_Party_Contract_Number__c}" /> </u>
+ <c:PDFWbr targetStr="{!targetMC.TermNine_Three}" />
</td></tr>
<apex:outputPanel rendered="{!targetMC.MC.Term_Of_Payment__c == '澶氭浠樻' && targetMC.Total_Payment_Time != null && targetMC.Total_Payment_Time == 3 }">
<tr><td height="80px"></td></tr>
--
Gitblit v1.9.1