From 0f44cb1a0b7b36860e9ce81c1eac9e395d87f0b4 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期一, 05 六月 2023 13:53:18 +0800
Subject: [PATCH] mergecode into lex dtt
---
force-app/main/default/pages/NewMCHPDF.page | 49 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 41 insertions(+), 8 deletions(-)
diff --git a/force-app/main/default/pages/NewMCHPDF.page b/force-app/main/default/pages/NewMCHPDF.page
index f7f9816..e7339f9 100644
--- a/force-app/main/default/pages/NewMCHPDF.page
+++ b/force-app/main/default/pages/NewMCHPDF.page
@@ -1,4 +1,4 @@
-<apex:page controller="NewMCHPDFController" showHeader="false" sidebar="false" action="{!init}" renderAs="pdf" applyHtmlTag="false" >
+<apex:page controller="NewMCHPDFController" showHeader="false" sidebar="false" action="{!init}" renderAs="pdf" applyHtmlTag="false" lightningStylesheets="true">
<!--<apex:page standardController="Maintenance_Contract_Estimate__c" extensions="MceConfigPDFController" showHeader="false" sidebar="false" action="{!init}">-->
<html>
<head style="font-family: SimSun Arial Unicode MS;">
@@ -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>
@@ -267,6 +267,30 @@
<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}" /></td></tr>
+ <tr><td><c:PDFWbr targetStr="{!targetMC.TermFive_Eleven2}" /></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>
@@ -280,13 +304,15 @@
<tr><td><c:PDFWbr targetStr="{!targetMC.TermSix_Six}" /></td></tr>
<tr><td><c:PDFWbr targetStr="{!targetMC.TermSix_Seven}" /></td></tr>
<tr><td><c:PDFWbr targetStr="{!targetMC.TermSix_Eight}" /></td></tr>
-
+ <!-- 鏈嶅姟鍚堝悓鏂囨湰鏇存柊 20230411 start -->
+ <tr><td><c:PDFWbr targetStr="{!targetMC.TermSix_Nine}" /></td></tr>
+ <!-- 鏈嶅姟鍚堝悓鏂囨湰鏇存柊 20230411 end -->
<!-- 涓冦�� 鐢蹭箼鍙屾柟鍚屾剰鏈悎鍚岃繘琛岀画绛� -->
<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 style="display:none;">1銆�</td></tr> -->
- <apex:outputPanel rendered="{!targetMC.MC.Term_Of_Payment__c == '涓�娆℃�т粯娆�' }">
+ <!--<apex:outputPanel rendered="{!targetMC.MC.Term_Of_Payment__c == '涓�娆℃�т粯娆�' }">
<tr><td height="95px"></td></tr>
</apex:outputPanel>
<apex:outputPanel rendered="{!targetMC.MC.Term_Of_Payment__c == '澶氭浠樻' && targetMC.Total_Payment_Time != null && targetMC.Total_Payment_Time == 1 }">
@@ -294,7 +320,7 @@
</apex:outputPanel>
<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>
+ </apex:outputPanel>-->
<tr><td>1銆�</td></tr>
</table>
<table border="2px" style="border-style: solid; border-bottom-style: none;" cellspacing="0" cellpadding="0">
@@ -361,10 +387,10 @@
<tr><td><c:PDFWbr targetStr="{!targetMC.TermEight_Two}" /></td></tr>
<tr><td><c:PDFWbr targetStr="{!targetMC.TermEight_Three}" /></td></tr>
- <apex:outputPanel rendered="{!targetMC.MC.Term_Of_Payment__c == '涓�娆℃�т粯娆�' }">
+ <!--<apex:outputPanel rendered="{!targetMC.MC.Term_Of_Payment__c == '涓�娆℃�т粯娆�' }">
<tr><td height="150px"></td></tr>
</apex:outputPanel>
- <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="150px"></td></tr>
</apex:outputPanel>
<apex:outputPanel rendered="{!targetMC.MC.Term_Of_Payment__c == '澶氭浠樻' && targetMC.Total_Payment_Time != null && targetMC.Total_Payment_Time == 2 }">
@@ -375,7 +401,7 @@
</apex:outputPanel>
<apex:outputPanel rendered="{!targetMC.MC.Term_Of_Payment__c == '澶氭浠樻' && targetMC.Total_Payment_Time != null && targetMC.Total_Payment_Time == 4 }">
<tr><td height="100px"></td></tr>
- </apex:outputPanel>
+ </apex:outputPanel>-->
<!-- 鍗併�� 鏈悎鍚岀敳鏂规墽 浠� -->
<tr><td height="15px"></td></tr>
<tr><td>
@@ -383,6 +409,13 @@
<u> <c:PDFWbr targetStr="{!targetMC.Mc.First_Party_Contract_Number__c}" /> </u>
<c:PDFWbr targetStr="{!targetMC.TermNine_Two}" />
</td></tr>
+
+ <apex:outputPanel rendered="{!targetMC.MC.Term_Of_Payment__c == '涓�娆℃�т粯娆�' }">
+ <tr><td height="30px"></td></tr>
+ </apex:outputPanel>
+ <apex:outputPanel rendered="{!targetMC.MC.Term_Of_Payment__c == '澶氭浠樻' && targetMC.Total_Payment_Time != null }">
+ <tr><td height="30px"></td></tr>
+ </apex:outputPanel>
</table>
<!-- 銉氥兗銈革紦 -->
--
Gitblit v1.9.1