From 1949e7ccb3bfab67ad2b16d7e0172851c3f823bb Mon Sep 17 00:00:00 2001
From: 李彤 <litong@prec-tech.com>
Date: 星期六, 02 四月 2022 14:06:49 +0800
Subject: [PATCH] 先款后修上线内容
---
force-app/main/default/pages/NewMCAgentPDF.page | 108 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 75 insertions(+), 33 deletions(-)
diff --git a/force-app/main/default/pages/NewMCAgentPDF.page b/force-app/main/default/pages/NewMCAgentPDF.page
index 1dee69d..7f303e0 100644
--- a/force-app/main/default/pages/NewMCAgentPDF.page
+++ b/force-app/main/default/pages/NewMCAgentPDF.page
@@ -162,6 +162,11 @@
<c:PDFWbr targetStr="{!targetMC.TermFour_Once_Three}" />
<u> <c:PDFWbr targetStr="{!targetMC.Total_Contract_Amount_In_Words}" /> </u>
<c:PDFWbr targetStr="{!targetMC.TermFour_Once_Four}" />
+ <!-- add wangweipeng 2021/12/10 start -->
+ <apex:outputPanel rendered="{!targetMC.MC.old_Is_RecognitionModel__c}">
+ <c:PDFWbr targetStr="{!targetMC.TermFour_Once_Five}" />
+ </apex:outputPanel>
+ <!-- add wangweipeng 2021/12/10 end -->
</td></tr>
</apex:outputPanel>
@@ -260,10 +265,26 @@
<tr><td height="15px"></td></tr>
<tr><td><c:PDFWbr targetStr="{!targetMC.TermFive_Title}" /></td></tr>
<tr><td>
- <c:PDFWbr targetStr="{!targetMC.TermFive_Head}" />
+ <!-- update wangweipeng 2021/12/10 start -->
+ <apex:outputPanel rendered="{!!targetMC.MC.old_Is_RecognitionModel__c}">
+ <c:PDFWbr targetStr="{!targetMC.TermFive_Head}" />
+ </apex:outputPanel>
+ <apex:outputPanel rendered="{!targetMC.MC.old_Is_RecognitionModel__c}">
+ <c:PDFWbr targetStr="{!targetMC.TermFive_Head2}" />
+ </apex:outputPanel>
+ <!-- update wangweipeng 2021/12/10 end -->
</td></tr>
<tr><td><c:PDFWbr targetStr="{!targetMC.TermFive_One}" /></td></tr>
- <tr><td><c:PDFWbr targetStr="{!targetMC.TermFive_One2}" /></td></tr>
+ <tr><td>
+ <!-- update wangweipeng 2021/12/10 start -->
+ <apex:outputPanel rendered="{!!targetMC.MC.old_Is_RecognitionModel__c}">
+ <c:PDFWbr targetStr="{!targetMC.TermFive_One2}" />
+ </apex:outputPanel>
+ <apex:outputPanel rendered="{!targetMC.MC.old_Is_RecognitionModel__c}">
+ <c:PDFWbr targetStr="{!targetMC.TermFive_One3}" />
+ </apex:outputPanel>
+ <!-- update wangweipeng 2021/12/10 end -->
+ </td></tr>
<tr><td>
<c:PDFWbr targetStr="{!targetMC.TermFive_Two}" />
<u> <c:PDFWbr targetStr="{!targetMC.Mc.Small_Repair_Time__c}" /> </u>
@@ -278,7 +299,16 @@
<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_Six}" /></td></tr>
- <tr><td><c:PDFWbr targetStr="{!targetMC.TermFive_Seven}" /></td></tr>
+ <tr><td>
+ <!-- update wangweipeng 2021/12/10 start -->
+ <apex:outputPanel rendered="{!!targetMC.MC.old_Is_RecognitionModel__c}">
+ <c:PDFWbr targetStr="{!targetMC.TermFive_Seven}" />
+ </apex:outputPanel>
+ <apex:outputPanel rendered="{!targetMC.MC.old_Is_RecognitionModel__c}">
+ <c:PDFWbr targetStr="{!targetMC.TermFive_Seven2}" />
+ </apex:outputPanel>
+ <!-- update wangweipeng 2021/12/10 end -->
+ </td></tr>
<tr><td><c:PDFWbr targetStr="{!targetMC.TermFive_Eight}" /></td></tr>
<tr><td><c:PDFWbr targetStr="{!targetMC.TermFive_Nine}" /></td></tr>
<tr><td>
@@ -390,40 +420,52 @@
</apex:outputPanel> -->
<!-- LJPH-BUKD5A 銆婂鎵樸�嬪悎鍚屾枃鏈殑淇敼 绮剧悽鎶�鏈� wql 2020/10/23 start -->
<!-- 鏍规嵁缁忛攢鍟嗗悕鏄惁鏈夊�煎垽鏂槸鍚︽墦鍗版柊/鍚堝悓鐗堟湰 -->
- <apex:outputPanel rendered="{!IF(targetMC.MC.Dealer__c != '', 'true', 'false')}">
- <!-- 鍗佷竴銆� 鑻ョ敳鏂规槸涔欐柟鐨勭壒绾︾粡閿�鍟� -->
- <tr><td height="15px"></td></tr>
- <tr><td>
- <c:PDFWbr targetStr="{!targetMC.TermEleven_One}" />
- </td></tr>
- <tr><td><c:PDFWbr targetStr="{!targetMC.TermEleven_Two}" /></td></tr>
- <tr><td><c:PDFWbr targetStr="{!targetMC.TermEleven_Three}" /></td></tr>
- <tr><td><c:PDFWbr targetStr="{!targetMC.TermEleven_Four}" /></td></tr>
+ <!-- update wangweipeng 2021/12/10 start -->
+ <apex:outputPanel rendered="{!!targetMC.MC.old_Is_RecognitionModel__c}">
+ <apex:outputPanel rendered="{!IF(targetMC.MC.Dealer__c != '', 'true', 'false')}">
+ <!-- 鍗佷竴銆� 鑻ョ敳鏂规槸涔欐柟鐨勭壒绾︾粡閿�鍟� -->
+ <tr><td height="15px"></td></tr>
+ <tr><td>
+ <c:PDFWbr targetStr="{!targetMC.TermEleven_One}" />
+ </td></tr>
+ <tr><td><c:PDFWbr targetStr="{!targetMC.TermEleven_Two}" /></td></tr>
+ <tr><td><c:PDFWbr targetStr="{!targetMC.TermEleven_Three}" /></td></tr>
+ <tr><td><c:PDFWbr targetStr="{!targetMC.TermEleven_Four}" /></td></tr>
- <!-- 涔濄�� 鏈悎鍚岀敳鏂规墽 浠� -->
- <tr><td height="15px"></td></tr>
- <tr><td>
- <c:PDFWbr targetStr="{!targetMC.TermTen_One}" />
- <u> <c:PDFWbr targetStr="{!targetMC.Mc.First_Party_Contract_Number__c}" /> </u>
- <c:PDFWbr targetStr="{!targetMC.TermTen_Two}" />
- </td></tr>
- <tr><td height="15px"></td></tr>
- </apex:outputPanel>
- <apex:outputPanel rendered="{!IF(targetMC.MC.Dealer__c != '', 'false', 'true')}">
- <!-- 鍘熺増鏈� -->
- <!-- 涔濄�� 鏈悎鍚岀敳鏂规墽 浠� -->
- <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>
- <c:PDFWbr targetStr="{!targetMC.TermNine_Two}" />
- </td></tr>
- <tr><td height="15px"></td></tr>
- <!-- 鍘熺増鏈� -->
+ <!-- 涔濄�� 鏈悎鍚岀敳鏂规墽 浠� -->
+ <tr><td height="15px"></td></tr>
+ <tr><td>
+ <c:PDFWbr targetStr="{!targetMC.TermTen_One}" />
+ <u> <c:PDFWbr targetStr="{!targetMC.Mc.First_Party_Contract_Number__c}" /> </u>
+ <c:PDFWbr targetStr="{!targetMC.TermTen_Two}" />
+ </td></tr>
+ <tr><td height="15px"></td></tr>
+ </apex:outputPanel>
+ <apex:outputPanel rendered="{!targetMC.MC.old_Is_RecognitionModel__c}">
+ <!-- 鍘熺増鏈� -->
+ <!-- 涔濄�� 鏈悎鍚岀敳鏂规墽 浠� -->
+ <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>
+ <c:PDFWbr targetStr="{!targetMC.TermNine_Two}" />
+ </td></tr>
+ <tr><td height="15px"></td></tr>
+ <!-- 鍘熺増鏈� -->
+ </apex:outputPanel>
</apex:outputPanel>
<!-- LJPH-BUKD5A 銆婂鎵樸�嬪悎鍚屾枃鏈殑淇敼 绮剧悽鎶�鏈� wql 2020/10/23 end -->
-
+ <apex:outputPanel rendered="{!targetMC.MC.old_Is_RecognitionModel__c}">
+ <tr><td height="15px"></td></tr>
+ <tr><td>
+ <c:PDFWbr targetStr="{!targetMC.TermTen_One2}" />
+ <u> <c:PDFWbr targetStr="{!targetMC.Mc.First_Party_Contract_Number__c}" /> </u>
+ <c:PDFWbr targetStr="{!targetMC.TermTen_Two2}" />
+ </td></tr>
+ <tr><td height="15px"></td></tr>
+ </apex:outputPanel>
+ <!-- update wangweipeng 2021/12/10 end -->
</table>
<!-- 銉氥兗銈革紦 -->
<table width="100%" cellspacing="1" cellpadding="1" style="font-size:13pt;">
--
Gitblit v1.9.1