From e9e1806b0f4b5bae1fc36204ccc5d6fdad52d66f Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期一, 05 六月 2023 11:22:08 +0800
Subject: [PATCH] Merge branch 'master' into LightningUpgradeProject
---
force-app/main/default/pages/NewMCAgentPDF.page | 96 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 77 insertions(+), 19 deletions(-)
diff --git a/force-app/main/default/pages/NewMCAgentPDF.page b/force-app/main/default/pages/NewMCAgentPDF.page
index 7f303e0..3c3ac59 100644
--- a/force-app/main/default/pages/NewMCAgentPDF.page
+++ b/force-app/main/default/pages/NewMCAgentPDF.page
@@ -301,13 +301,14 @@
<tr><td><c:PDFWbr targetStr="{!targetMC.TermFive_Six}" /></td></tr>
<tr><td>
<!-- update wangweipeng 2021/12/10 start -->
- <apex:outputPanel rendered="{!!targetMC.MC.old_Is_RecognitionModel__c}">
+ <!--<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>
+ </apex:outputPanel>-->
<!-- update wangweipeng 2021/12/10 end -->
+ <c:PDFWbr targetStr="{!targetMC.TermFive_Seven2}" />
</td></tr>
<tr><td><c:PDFWbr targetStr="{!targetMC.TermFive_Eight}" /></td></tr>
<tr><td><c:PDFWbr targetStr="{!targetMC.TermFive_Nine}" /></td></tr>
@@ -316,6 +317,34 @@
<u> <c:PDFWbr targetStr="{!targetMC.Mc.Inspection_Time__c}" /> </u>
<c:PDFWbr targetStr="{!targetMC.TermFive_Ten2}" />
</td></tr>
+ <!-- XLIU-CEP8WW 銆愬鎵樸�戝悎鍚屾枃鏈洿鏂�/鏂板 XXF 20221031 start-->
+ <tr><td>
+ <c:PDFWbr targetStr="{!targetMC.TermFive_Eleven1}" />
+ <c:PDFWbr targetStr="{!targetMC.TermFive_Eleven2}" />
+ <c:PDFWbr targetStr="{!targetMC.TermFive_Eleven3}" />
+ <c:PDFWbr targetStr="{!targetMC.TermFive_Eleven4}" />
+ </td></tr>
+ <!-- XLIU-CEP8WW 銆愬鎵樸�戝悎鍚屾枃鏈洿鏂�/鏂板 XXF 20221031 end-->
+ <!-- XLIU-CEP8WW 銆愬鎵樸�戝悎鍚屾枃鏈洿鏂�/鏂板 LY 20220524 start-->
+ <tr><td><c:PDFWbr targetStr="{!targetMC.TermFive_Eleven}" /></td></tr>
+ <table border="2px" style="border-style: solid; border-bottom-style: none;" cellspacing="0" cellpadding="0">
+ <tr>
+ <td>{!targetMC.TermFive_Table11}</td><td>{!targetMC.TermFive_Table12}</td>
+ </tr>
+ <tr>
+ <td>{!targetMC.TermFive_Table21}</td><td>{!targetMC.TermFive_Table22}</td>
+ </tr>
+ <tr>
+ <td>{!targetMC.TermFive_Table31}</td><td>{!targetMC.TermFive_Table32}</td>
+ </tr>
+ <tr>
+ <td>{!targetMC.TermFive_Table41}</td><td>{!targetMC.TermFive_Table42}</td>
+ </tr>
+ <tr>
+ <td>{!targetMC.TermFive_Table51}</td><td>{!targetMC.TermFive_Table52}</td>
+ </tr>
+ </table>
+ <!-- XLIU-CEP8WW 銆愬鎵樸�戝悎鍚屾枃鏈洿鏂�/鏂板 LY 20220524 end-->
<!-- 鍏�� 鐢叉柟璐ｄ换鑼冨洿 -->
<tr><td height="15px"></td></tr>
@@ -331,6 +360,9 @@
<tr><td><c:PDFWbr targetStr="{!targetMC.TermSix_Eight}" /></td></tr>
<tr><td><c:PDFWbr targetStr="{!targetMC.TermSix_Nine}" /></td></tr>
<tr><td><c:PDFWbr targetStr="{!targetMC.TermSix_Ten}" /></td></tr>
+ <!-- 鏈嶅姟鍚堝悓鏂囨湰鏇存柊 20230411 start -->
+ <tr><td><c:PDFWbr targetStr="{!targetMC.TermSix_Eleven}" /></td></tr>
+ <!-- 鏈嶅姟鍚堝悓鏂囨湰鏇存柊 20230411 end -->
<!-- 涓冦�� 鐢蹭箼鍙屾柟鍚屾剰鏈悎鍚岃繘琛岀画绛� -->
<tr><td height="15px"></td></tr>
@@ -393,11 +425,37 @@
<!-- 鍏�� 鏈悎鍚岀殑瑙ｉ噴涓庢墽琛岄�傜敤涓崕浜烘皯鍏卞拰鍥芥硶寰� -->
<tr><td height="15px"></td></tr>
+ <!-- XLIU-CEP8WW 銆愬鎵樸�戝悎鍚屾枃鏈洿鏂�/鏂板 LY 20220524 start-->
<tr><td>
- <c:PDFWbr targetStr="{!targetMC.TermEight_Title}" />
+ <!--<c:PDFWbr targetStr="{!targetMC.TermEight_Title}" />-->
<!-- <u> <c:PDFWbr targetStr="{!targetMC.Mc.Negotiate_Mean__c}" /> </u> -->
- <c:PDFWbr targetStr="{!targetMC.TermEight_Title2}" />
+ <!--<c:PDFWbr targetStr="{!targetMC.TermEight_Title2}" />-->
+ <c:PDFWbr targetStr="{!targetMC.TermEight_Nine_Title}" />
</td></tr>
+ <tr><td><c:PDFWbr targetStr="{!targetMC.TermEight_Nine_One}" /></td></tr>
+ <tr><td><c:PDFWbr targetStr="{!targetMC.TermEight_Nine_Two}" /></td></tr>
+ <tr><td><c:PDFWbr targetStr="{!targetMC.TermEight_Nine_Three}" /></td></tr>
+ <tr><td><c:PDFWbr targetStr="{!targetMC.TermEight_Nine_Four}" /></td></tr>
+ <tr><td><c:PDFWbr targetStr="{!targetMC.TermEight_Nine_Four1}" /></td></tr>
+ <tr><td><c:PDFWbr targetStr="{!targetMC.TermEight_Nine_Four2}" /></td></tr>
+ <tr><td><c:PDFWbr targetStr="{!targetMC.TermEight_Nine_Four3}" /></td></tr>
+ <tr><td><c:PDFWbr targetStr="{!targetMC.TermEight_Nine_Four4}" /></td></tr>
+ <tr><td><c:PDFWbr targetStr="{!targetMC.TermEight_Nine_Four5}" /></td></tr>
+ <tr><td><c:PDFWbr targetStr="{!targetMC.TermEight_Nine_Four6}" /></td></tr>
+ <tr><td><c:PDFWbr targetStr="{!targetMC.TermEight_Nine_Four7}" /></td></tr>
+ <tr><td><c:PDFWbr targetStr="{!targetMC.TermEight_Nine_Four8}" /></td></tr>
+ <tr><td><c:PDFWbr targetStr="{!targetMC.TermEight_Nine_Five}" /></td></tr>
+
+ <!-- 鍗併�� 鏈悎鍚岀殑瑙ｉ噴涓庢墽琛岄�傜敤涓崕浜烘皯鍏卞拰鍥芥硶寰� -->
+ <tr><td height="15px"></td></tr>
+ <tr><td><c:PDFWbr targetStr="{!targetMC.TermNine_One}" /></td></tr>
+ <!-- 鍗佷竴銆� 鏈悎鍚岀敳鏂规墽 -->
+ <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>
+ <!-- XLIU-CEP8WW 銆愬鎵樸�戝悎鍚屾枃鏈洿鏂�/鏂板 LY 20220524 end-->
<!-- <tr><td><c:PDFWbr targetStr="{!targetMC.TermEight_One}" /></td></tr>
<tr><td><c:PDFWbr targetStr="{!targetMC.TermEight_Two}" /></td></tr>
<tr><td><c:PDFWbr targetStr="{!targetMC.TermEight_Three}" /></td></tr> -->
@@ -406,9 +464,9 @@
<tr><td height="100px"></td></tr>
</apex:outputPanel> -->
<!-- 鎵撳嵃澶氱暀鐧� 2021/04/12 绮剧悽鎶�鏈� wql end -->
- <apex:outputPanel rendered="{!targetMC.MC.Term_Of_Payment__c == '澶氭浠樻' && targetMC.Total_Payment_Time != null && targetMC.Total_Payment_Time == 1 }">
+ <!--<apex:outputPanel rendered="{!targetMC.MC.Term_Of_Payment__c == '澶氭浠樻' && targetMC.Total_Payment_Time != null && targetMC.Total_Payment_Time == 1 }">
<tr><td height="100px"></td></tr>
- </apex:outputPanel>
+ </apex:outputPanel>-->
<!-- <apex:outputPanel rendered="{!targetMC.MC.Term_Of_Payment__c == '澶氭浠樻' && targetMC.Total_Payment_Time != null && targetMC.Total_Payment_Time == 2 }">
<tr><td height="150px"></td></tr>
</apex:outputPanel>
@@ -421,19 +479,19 @@
<!-- LJPH-BUKD5A 銆婂鎵樸�嬪悎鍚屾枃鏈殑淇敼 绮剧悽鎶�鏈� wql 2020/10/23 start -->
<!-- 鏍规嵁缁忛攢鍟嗗悕鏄惁鏈夊�煎垽鏂槸鍚︽墦鍗版柊/鍚堝悓鐗堟湰 -->
<!-- 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')}">
+ <!--<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 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><c:PDFWbr targetStr="{!targetMC.TermEleven_Four}" /></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>
@@ -441,30 +499,30 @@
</td></tr>
<tr><td height="15px"></td></tr>
</apex:outputPanel>
- <apex:outputPanel rendered="{!targetMC.MC.old_Is_RecognitionModel__c}">
+ <apex:outputPanel rendered="{!targetMC.MC.old_Is_RecognitionModel__c}">-->
<!-- 鍘熺増鏈� -->
<!-- 涔濄�� 鏈悎鍚岀敳鏂规墽 浠� -->
- <tr><td height="15px"></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>
<c:PDFWbr targetStr="{!targetMC.TermNine_Two}" />
</td></tr>
- <tr><td height="15px"></td></tr>
+ <tr><td height="15px"></td></tr>-->
<!-- 鍘熺増鏈� -->
- </apex:outputPanel>
- </apex:outputPanel>
+ <!--</apex:outputPanel>
+ </apex:outputPanel>-->
<!-- LJPH-BUKD5A 銆婂鎵樸�嬪悎鍚屾枃鏈殑淇敼 绮剧悽鎶�鏈� wql 2020/10/23 end -->
- <apex:outputPanel rendered="{!targetMC.MC.old_Is_RecognitionModel__c}">
+ <!--<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>
+ <tr><td height="30px"></td></tr>
+ <!--</apex:outputPanel>-->
<!-- update wangweipeng 2021/12/10 end -->
</table>
<!-- 銉氥兗銈革紦 -->
--
Gitblit v1.9.1