From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte

---
 force-app/main/default/pages/NewMCHPDFLimit.page |  548 ++++++++++++++++++++++++++++--------------------------
 1 files changed, 283 insertions(+), 265 deletions(-)

diff --git a/force-app/main/default/pages/NewMCHPDFLimit.page b/force-app/main/default/pages/NewMCHPDFLimit.page
index c704be0..e9531c0 100644
--- a/force-app/main/default/pages/NewMCHPDFLimit.page
+++ b/force-app/main/default/pages/NewMCHPDFLimit.page
@@ -1,4 +1,4 @@
-<apex:page controller="NewMCHLimitPDFController" showHeader="false" sidebar="false" action="{!init}" renderAs="pdf" applyHtmlTag="false" >
+<apex:page controller="NewMCHLimitPDFController" 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>
@@ -63,13 +63,13 @@
         <tr><td> 
         </td></tr>
         <tr>
-        	<!-- <td class ='single'>&nbsp;</td> -->
+            <!-- <td class ='single'>&nbsp;</td> -->
             <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-            	<c:PDFWbr targetStr="{!targetMC.TermZero_One}"/>
-            	<!-- <u><c:PDFWbr targetStr="{!targetMC.MC.Department__r.Name}" />&nbsp;</u> -->
-            	<!-- <c:PDFWbr targetStr="{!targetMC.TermZero_Two}" /> -->
-            	<u>&nbsp;<c:PDFWbr targetStr="{!targetMC.AssetSize}" />&nbsp;</u>
-            	<c:PDFWbr targetStr="{!targetMC.TermZero_Three}" />
+                <c:PDFWbr targetStr="{!targetMC.TermZero_One}"/>
+                <!-- <u><c:PDFWbr targetStr="{!targetMC.MC.Department__r.Name}" />&nbsp;</u> -->
+                <!-- <c:PDFWbr targetStr="{!targetMC.TermZero_Two}" /> -->
+                <u>&nbsp;<c:PDFWbr targetStr="{!targetMC.AssetSize}" />&nbsp;</u>
+                <c:PDFWbr targetStr="{!targetMC.TermZero_Three}" />
             </td></tr>
         <tr><td height="15px"></td></tr>
     </table>
@@ -83,7 +83,7 @@
          <tr>
             <!-- <td></td> -->
             <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-            	<c:PDFWbr targetStr="{!targetMC.TermOne_Two}"/>
+                <c:PDFWbr targetStr="{!targetMC.TermOne_Two}"/>
             </td>
             
             <!-- <td>浠躲�傞檮浠舵槸鏈悎鍚屾湁鏁堢粍鎴愰儴鍒嗭紝涓庢湰鍚堝悓鍏锋湁鍚岀瓑娉曞緥鏁堝姏銆�</td> -->
@@ -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,276 +120,292 @@
                 <c:PDFWbr targetStr="{!targetMC.TermThree_Three}" />
             </td>
         </tr>
-
-        <tr><td height="15px"></td></tr>
-        <tr>
-            <td>
-                <c:PDFWbr targetStr="{!targetMC.TermTen_One}"/>
-                &nbsp;锟�<c:PDFWbr targetStr="{!targetMC.Amount_Warranty_Coverage}"/>&nbsp;
-                <c:PDFWbr targetStr="{!targetMC.TermTen_Two}"/><u>
-                &nbsp;<c:PDFWbr targetStr="{!targetMC.Amount_Warranty_Coverage_In_Word}"/>&nbsp;</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>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<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>
-        	<!-- <apex:outputPanel rendered="{!IF(targetMC.MC.Term_Of_Payment__c == '涓�娆℃�т粯娆�', 'true', 'false')}"> -->
-        		<!-- <c:PDFWbr targetStr="{!targetMC.TermFour_Two}" />
-        		<apex:outputField value="{!targetMC.MC.PayOneTime__c}"/>
-        		<c:PDFWbr targetStr="{!targetMC.TermFour_Once}" />&nbsp;&nbsp; -->
-        	<!-- </apex:outputPanel> -->
-        	<!-- <apex:outputPanel rendered="{!IF(targetMC.MC.Term_Of_Payment__c == '澶氭浠樻', 'true', 'false')}"> -->
-        		<!-- <c:PDFWbr targetStr="{!targetMC.TermFour_Two}" /> -->
-        		<!-- <apex:outputField value="{!targetMC.MC.MultiplePayments__c}"/>
-        		<c:PDFWbr targetStr="{!targetMC.TermFour_Much}" /> -->
-        	<!-- </apex:outputPanel> -->
+            <!-- <apex:outputPanel rendered="{!IF(targetMC.MC.Term_Of_Payment__c == '涓�娆℃�т粯娆�', 'true', 'false')}"> -->
+                <!-- <c:PDFWbr targetStr="{!targetMC.TermFour_Two}" />
+                <apex:outputField value="{!targetMC.MC.PayOneTime__c}"/>
+                <c:PDFWbr targetStr="{!targetMC.TermFour_Once}" />&nbsp;&nbsp; -->
+            <!-- </apex:outputPanel> -->
+            <!-- <apex:outputPanel rendered="{!IF(targetMC.MC.Term_Of_Payment__c == '澶氭浠樻', 'true', 'false')}"> -->
+                <!-- <c:PDFWbr targetStr="{!targetMC.TermFour_Two}" /> -->
+                <!-- <apex:outputField value="{!targetMC.MC.MultiplePayments__c}"/>
+                <c:PDFWbr targetStr="{!targetMC.TermFour_Much}" /> -->
+            <!-- </apex:outputPanel> -->
         </td></tr>
         <apex:outputPanel rendered="{!IF(targetMC.MC.Term_Of_Payment__c == '涓�娆℃�т粯娆�', 'true', 'false')}">
-        	<tr><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	        	<c:PDFWbr targetStr="{!targetMC.TermFour_Once_One}" />
-	        	<u>&nbsp;<c:PDFWbr targetStr="{!targetMC.MC.one_off_payment_agreed_period__c}" />&nbsp;</u>
-	        	<c:PDFWbr targetStr="{!targetMC.TermFour_Once_Two}" />
-	        </td></tr>
-	        <tr><td>
-	        	<u>&nbsp;锟�<c:PDFWbr targetStr="{!targetMC.Contract_Amount}" />&nbsp;</u>
-	        	<c:PDFWbr targetStr="{!targetMC.TermFour_Once_Three}" />
-	        	<u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Total_Contract_Amount_In_Words}" />&nbsp;</u>
-	        	<c:PDFWbr targetStr="{!targetMC.TermFour_Once_Four}" />
-        	</td></tr>
+            <tr><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                <c:PDFWbr targetStr="{!targetMC.TermFour_Once_One}" />
+                <u>&nbsp;<c:PDFWbr targetStr="{!targetMC.MC.one_off_payment_agreed_period__c}" />&nbsp;</u>
+                <c:PDFWbr targetStr="{!targetMC.TermFour_Once_Two}" />
+            </td></tr>
+            <tr><td>
+                <u>&nbsp;锟�<c:PDFWbr targetStr="{!targetMC.Contract_Amount}" />&nbsp;</u>
+                <c:PDFWbr targetStr="{!targetMC.TermFour_Once_Three}" />
+                <u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Total_Contract_Amount_In_Words}" />&nbsp;</u>
+                <c:PDFWbr targetStr="{!targetMC.TermFour_Once_Four}" />
+            </td></tr>
         </apex:outputPanel>
 
         <apex:outputPanel rendered="{!IF(targetMC.MC.Term_Of_Payment__c == '澶氭浠樻', 'true', 'false')}">
-	        <!-- <tr><td><c:PDFWbr targetStr="{!targetMC.TermFour_Much}" /></td></tr> -->
-	        <tr><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	        	<c:PDFWbr targetStr="{!targetMC.TermFour_Much_One}" />
-	        	<u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Total_Payment_Time}" />&nbsp;</u>
-	        	<c:PDFWbr targetStr="{!targetMC.TermFour_Much_Two}" />
-	        </td></tr>
-	        <apex:outputPanel rendered="{!targetMC.Total_Payment_Time != null && targetMC.Total_Payment_Time >= 1}">
-		        <tr><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-		        	<c:PDFWbr targetStr="{!targetMC.TermFour_Much1}" />
-		        	<u>&nbsp;<c:PDFWbr targetStr="{!targetMC.First_Payment_Year}" />&nbsp;</u>骞�
-		        	<u>&nbsp;<c:PDFWbr targetStr="{!targetMC.First_Payment_Month}" />&nbsp;</u>鏈�
-		        	<u>&nbsp;<c:PDFWbr targetStr="{!targetMC.First_Payment_Day}" />&nbsp;</u>鏃�
-		        	
-		        	<c:PDFWbr targetStr="{!targetMC.TermFour_Much_Same1}" />
-		        	<u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Payment_Plan_Sum_First}" />&nbsp;</u>
-		        	<c:PDFWbr targetStr="{!targetMC.TermFour_Much_Same2}" />
-		        	<u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Payment_Plan_Sum_First_in_Word}" />&nbsp;</u>
-		        	<c:PDFWbr targetStr="{!targetMC.TermFour_Much_Same3}" />
-		        </td></tr>
-		    </apex:outputPanel>
+            <!-- <tr><td><c:PDFWbr targetStr="{!targetMC.TermFour_Much}" /></td></tr> -->
+            <tr><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                <c:PDFWbr targetStr="{!targetMC.TermFour_Much_One}" />
+                <u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Total_Payment_Time}" />&nbsp;</u>
+                <c:PDFWbr targetStr="{!targetMC.TermFour_Much_Two}" />
+            </td></tr>
+            <apex:outputPanel rendered="{!targetMC.Total_Payment_Time != null && targetMC.Total_Payment_Time >= 1}">
+                <tr><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                    <c:PDFWbr targetStr="{!targetMC.TermFour_Much1}" />
+                    <u>&nbsp;<c:PDFWbr targetStr="{!targetMC.First_Payment_Year}" />&nbsp;</u>骞�
+                    <u>&nbsp;<c:PDFWbr targetStr="{!targetMC.First_Payment_Month}" />&nbsp;</u>鏈�
+                    <u>&nbsp;<c:PDFWbr targetStr="{!targetMC.First_Payment_Day}" />&nbsp;</u>鏃�
+                    
+                    <c:PDFWbr targetStr="{!targetMC.TermFour_Much_Same1}" />
+                    <u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Payment_Plan_Sum_First}" />&nbsp;</u>
+                    <c:PDFWbr targetStr="{!targetMC.TermFour_Much_Same2}" />
+                    <u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Payment_Plan_Sum_First_in_Word}" />&nbsp;</u>
+                    <c:PDFWbr targetStr="{!targetMC.TermFour_Much_Same3}" />
+                </td></tr>
+            </apex:outputPanel>
 
-		    <apex:outputPanel rendered="{!targetMC.Total_Payment_Time != null && targetMC.Total_Payment_Time >= 2}">
-		        <tr><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-		        	<c:PDFWbr targetStr="{!targetMC.TermFour_Much2}" />
-		        	<u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Second_Payment_Year}" />&nbsp;</u>骞�
-		        	<u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Second_Payment_Month}" />&nbsp;</u>鏈�
-		        	<u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Second_Payment_Day}" />&nbsp;</u>鏃�
-		        	
-		        	<c:PDFWbr targetStr="{!targetMC.TermFour_Much_Same1}" />
-		        	<u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Payment_Plan_Sum_Second}" />&nbsp;</u>
-		        	<c:PDFWbr targetStr="{!targetMC.TermFour_Much_Same2}" />
-		        	<u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Payment_Plan_Sum_Second_in_Word}" />&nbsp;</u>
-		        	<c:PDFWbr targetStr="{!targetMC.TermFour_Much_Same3}" />
-		        </td></tr>
-		    </apex:outputPanel>
-		    <apex:outputPanel rendered="{!targetMC.Total_Payment_Time != null && targetMC.Total_Payment_Time >= 3}">
-		        <tr><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-		        	<c:PDFWbr targetStr="{!targetMC.TermFour_Much3}" />
-		        	<u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Third_Payment_Year}" />&nbsp;</u>骞�
-		        	<u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Third_Payment_Month}" />&nbsp;</u>鏈�
-		        	<u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Third_Payment_Day}" />&nbsp;</u>鏃�
-		        	
-		        	<c:PDFWbr targetStr="{!targetMC.TermFour_Much_Same1}" />
-		        	<u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Payment_Plan_Sum_Third}" />&nbsp;</u>
-		        	<c:PDFWbr targetStr="{!targetMC.TermFour_Much_Same2}" />
-		        	<u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Payment_Plan_Sum_Third_in_Word}" />&nbsp;</u>
-		        	<c:PDFWbr targetStr="{!targetMC.TermFour_Much_Same3}" />
-		        </td></tr>
-		    </apex:outputPanel>
-		    <apex:outputPanel rendered="{!targetMC.Total_Payment_Time != null && targetMC.Total_Payment_Time >= 4}">
-		        <tr><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-		        	<c:PDFWbr targetStr="{!targetMC.TermFour_Much4}" />
-		        	<u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Forth_Payment_Year}" />&nbsp;</u>骞�
-		        	<u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Forth_Payment_Month}" />&nbsp;</u>鏈�
-		        	<u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Forth_Payment_Day}" />&nbsp;</u>鏃�
-		        	
-		        	<c:PDFWbr targetStr="{!targetMC.TermFour_Much_Same1}" />
-		        	<u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Payment_Plan_Sum_Forth}" />&nbsp;</u>
-		        	<c:PDFWbr targetStr="{!targetMC.TermFour_Much_Same2}" />
-		        	<u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Payment_Plan_Sum_Forth_in_Word}" />&nbsp;</u>
-		        	<c:PDFWbr targetStr="{!targetMC.TermFour_Much_Same3}" />
-		        </td></tr>
-		    </apex:outputPanel>
-		    <apex:outputPanel rendered="{!targetMC.Total_Payment_Time != null && targetMC.Total_Payment_Time >= 5}">
-		        <tr><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-		        	<c:PDFWbr targetStr="{!targetMC.TermFour_Much5}" />
-		        	<u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Fifth_Payment_Year}" />&nbsp;</u>骞�
-		        	<u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Fifth_Payment_Month}" />&nbsp;</u>鏈�
-		        	<u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Fifth_Payment_Day}" />&nbsp;</u>鏃�
-		        	
-		        	<c:PDFWbr targetStr="{!targetMC.TermFour_Much_Same1}" />
-		        	<u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Payment_Plan_Sum_Fifth}" />&nbsp;</u>
-		        	<c:PDFWbr targetStr="{!targetMC.TermFour_Much_Same2}" />
-		        	<u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Payment_Plan_Sum_Fifth_in_Word}" />&nbsp;</u>
-		        	<c:PDFWbr targetStr="{!targetMC.TermFour_Much_Same3}" />
-		        </td></tr>
-		    </apex:outputPanel>
-		    <apex:outputPanel rendered="{!targetMC.Total_Payment_Time != null && targetMC.Total_Payment_Time >= 6}">
-		        <tr><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-		        	<c:PDFWbr targetStr="{!targetMC.TermFour_Much6}" />
-		        	<u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Sixth_Payment_Year}" />&nbsp;</u>骞�
-		        	<u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Sixth_Payment_Month}" />&nbsp;</u>鏈�
-		        	<u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Sixth_Payment_Day}" />&nbsp;</u>鏃�
-		        	
-		        	<c:PDFWbr targetStr="{!targetMC.TermFour_Much_Same1}" />
-		        	<u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Payment_Plan_Sum_Sixth}" />&nbsp;</u>
-		        	<c:PDFWbr targetStr="{!targetMC.TermFour_Much_Same2}" />
-		        	<u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Payment_Plan_Sum_Sixth_in_Word}" />&nbsp;</u>
-		        	<c:PDFWbr targetStr="{!targetMC.TermFour_Much_Same3}" />
-		        </td></tr>
-		    </apex:outputPanel>
-	    </apex:outputPanel>
+            <apex:outputPanel rendered="{!targetMC.Total_Payment_Time != null && targetMC.Total_Payment_Time >= 2}">
+                <tr><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                    <c:PDFWbr targetStr="{!targetMC.TermFour_Much2}" />
+                    <u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Second_Payment_Year}" />&nbsp;</u>骞�
+                    <u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Second_Payment_Month}" />&nbsp;</u>鏈�
+                    <u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Second_Payment_Day}" />&nbsp;</u>鏃�
+                    
+                    <c:PDFWbr targetStr="{!targetMC.TermFour_Much_Same1}" />
+                    <u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Payment_Plan_Sum_Second}" />&nbsp;</u>
+                    <c:PDFWbr targetStr="{!targetMC.TermFour_Much_Same2}" />
+                    <u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Payment_Plan_Sum_Second_in_Word}" />&nbsp;</u>
+                    <c:PDFWbr targetStr="{!targetMC.TermFour_Much_Same3}" />
+                </td></tr>
+            </apex:outputPanel>
+            <apex:outputPanel rendered="{!targetMC.Total_Payment_Time != null && targetMC.Total_Payment_Time >= 3}">
+                <tr><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                    <c:PDFWbr targetStr="{!targetMC.TermFour_Much3}" />
+                    <u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Third_Payment_Year}" />&nbsp;</u>骞�
+                    <u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Third_Payment_Month}" />&nbsp;</u>鏈�
+                    <u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Third_Payment_Day}" />&nbsp;</u>鏃�
+                    
+                    <c:PDFWbr targetStr="{!targetMC.TermFour_Much_Same1}" />
+                    <u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Payment_Plan_Sum_Third}" />&nbsp;</u>
+                    <c:PDFWbr targetStr="{!targetMC.TermFour_Much_Same2}" />
+                    <u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Payment_Plan_Sum_Third_in_Word}" />&nbsp;</u>
+                    <c:PDFWbr targetStr="{!targetMC.TermFour_Much_Same3}" />
+                </td></tr>
+            </apex:outputPanel>
+            <apex:outputPanel rendered="{!targetMC.Total_Payment_Time != null && targetMC.Total_Payment_Time >= 4}">
+                <tr><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                    <c:PDFWbr targetStr="{!targetMC.TermFour_Much4}" />
+                    <u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Forth_Payment_Year}" />&nbsp;</u>骞�
+                    <u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Forth_Payment_Month}" />&nbsp;</u>鏈�
+                    <u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Forth_Payment_Day}" />&nbsp;</u>鏃�
+                    
+                    <c:PDFWbr targetStr="{!targetMC.TermFour_Much_Same1}" />
+                    <u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Payment_Plan_Sum_Forth}" />&nbsp;</u>
+                    <c:PDFWbr targetStr="{!targetMC.TermFour_Much_Same2}" />
+                    <u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Payment_Plan_Sum_Forth_in_Word}" />&nbsp;</u>
+                    <c:PDFWbr targetStr="{!targetMC.TermFour_Much_Same3}" />
+                </td></tr>
+            </apex:outputPanel>
+            <apex:outputPanel rendered="{!targetMC.Total_Payment_Time != null && targetMC.Total_Payment_Time >= 5}">
+                <tr><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                    <c:PDFWbr targetStr="{!targetMC.TermFour_Much5}" />
+                    <u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Fifth_Payment_Year}" />&nbsp;</u>骞�
+                    <u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Fifth_Payment_Month}" />&nbsp;</u>鏈�
+                    <u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Fifth_Payment_Day}" />&nbsp;</u>鏃�
+                    
+                    <c:PDFWbr targetStr="{!targetMC.TermFour_Much_Same1}" />
+                    <u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Payment_Plan_Sum_Fifth}" />&nbsp;</u>
+                    <c:PDFWbr targetStr="{!targetMC.TermFour_Much_Same2}" />
+                    <u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Payment_Plan_Sum_Fifth_in_Word}" />&nbsp;</u>
+                    <c:PDFWbr targetStr="{!targetMC.TermFour_Much_Same3}" />
+                </td></tr>
+            </apex:outputPanel>
+            <apex:outputPanel rendered="{!targetMC.Total_Payment_Time != null && targetMC.Total_Payment_Time >= 6}">
+                <tr><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                    <c:PDFWbr targetStr="{!targetMC.TermFour_Much6}" />
+                    <u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Sixth_Payment_Year}" />&nbsp;</u>骞�
+                    <u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Sixth_Payment_Month}" />&nbsp;</u>鏈�
+                    <u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Sixth_Payment_Day}" />&nbsp;</u>鏃�
+                    
+                    <c:PDFWbr targetStr="{!targetMC.TermFour_Much_Same1}" />
+                    <u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Payment_Plan_Sum_Sixth}" />&nbsp;</u>
+                    <c:PDFWbr targetStr="{!targetMC.TermFour_Much_Same2}" />
+                    <u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Payment_Plan_Sum_Sixth_in_Word}" />&nbsp;</u>
+                    <c:PDFWbr targetStr="{!targetMC.TermFour_Much_Same3}" />
+                </td></tr>
+            </apex:outputPanel>
+        </apex:outputPanel>
 
-	    <tr><td height="15px"></td></tr>
-	    <tr><td><c:PDFWbr targetStr="{!targetMC.TermFive_Title}" /></td></tr>
-	    <tr><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	    	<c:PDFWbr targetStr="{!targetMC.TermFive_Head}" />
-	    </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_Two}" />
-	    	<u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Mc.Small_Repair_Time__c}" />&nbsp;</u>
-	    	<c:PDFWbr targetStr="{!targetMC.TermFive_Two2}" />
-	    </td></tr>
-	    <tr><td>
-	    	<c:PDFWbr targetStr="{!targetMC.TermFive_Three}" />
-	    	<u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Mc.Big_Repair_Time__c}" />&nbsp;</u>
-	    	<c:PDFWbr targetStr="{!targetMC.TermFive_Three1}" />
-	    </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_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>
-	    	<c:PDFWbr targetStr="{!targetMC.TermFive_Ten}" />
-	    	<u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Mc.Inspection_Time__c}" />&nbsp;</u>
-	    	<c:PDFWbr targetStr="{!targetMC.TermFive_Ten2}" />
-	    </td></tr>
+        <tr><td height="15px"></td></tr>
+        <tr><td><c:PDFWbr targetStr="{!targetMC.TermFive_Title}" /></td></tr>
+        <tr><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+            <c:PDFWbr targetStr="{!targetMC.TermFive_Head}" />
+        </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>&nbsp;<c:PDFWbr targetStr="{!targetMC.MC.Maintenance_Contract__r[0].Total_Number_Asset_P__c}" />&nbsp;</u>
+                <!-- URF闄愭鍚堝悓2鏈� xxf 2022/08/23 end -->
+                <c:PDFWbr targetStr="{!targetMC.TermFive_One4}" />
+                <!-- URF闄愭鍚堝悓2鏈� xxf 2022/08/23 start -->
+                <u>&nbsp;<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)}&nbsp;娆�</b> -->
+                <c:PDFWbr targetStr="{!targetMC.TermFive_One6Append}" />
+                <u>&nbsp;<c:PDFWbr targetStr="{!targetMC.MC.Maintenance_Contract__r[0].Total_Number_Asset_V__c}" />&nbsp;</u>
+                <!-- URF闄愭鍚堝悓2鏈� xxf 2022/08/23 end -->
+                <c:PDFWbr targetStr="{!targetMC.TermFive_One7}" />
+                <!-- URF闄愭鍚堝悓2鏈� xxf 2022/08/23 start -->
+                <u>&nbsp;<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>&nbsp;<c:PDFWbr targetStr="{!targetMC.Mc.Small_Repair_Time__c}" />&nbsp;</u>
+            <c:PDFWbr targetStr="{!targetMC.TermFive_Two2}" />
+        </td></tr>
+        <tr><td>
+            <c:PDFWbr targetStr="{!targetMC.TermFive_Three}" />
+            <u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Mc.Big_Repair_Time__c}" />&nbsp;</u>
+            <c:PDFWbr targetStr="{!targetMC.TermFive_Three1}" />
+        </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_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>
+            <c:PDFWbr targetStr="{!targetMC.TermFive_Ten}" />
+            <u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Mc.Inspection_Time__c}" />&nbsp;</u>
+            <c:PDFWbr targetStr="{!targetMC.TermFive_Ten2}" />
+        </td></tr> -->
 
-	    <!-- 涓冦��	鐢叉柟璐d换鑼冨洿  -->
-	    <tr><td height="15px"></td></tr>
-	    <tr><td><c:PDFWbr targetStr="{!targetMC.TermSix_Title}" /></td></tr>
-	    <tr><td><c:PDFWbr targetStr="{!targetMC.TermSix_One}" /></td></tr>
-	    <tr><td><c:PDFWbr targetStr="{!targetMC.TermSix_Two}" /></td></tr>
-	    <tr><td><c:PDFWbr targetStr="{!targetMC.TermSix_Three}" /></td></tr>
-	    <tr><td><c:PDFWbr targetStr="{!targetMC.TermSix_Four}" /></td></tr>
-	    <tr><td><c:PDFWbr targetStr="{!targetMC.TermSix_Five}" /></td></tr>
-	    <tr><td><c:PDFWbr targetStr="{!targetMC.TermSix_Five2}" /></td></tr>
-	    <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>
+        <!-- 涓冦�� 鐢叉柟璐d换鑼冨洿  -->
+        <tr><td height="15px"></td></tr>
+        <tr><td><c:PDFWbr targetStr="{!targetMC.TermSix_Title}" /></td></tr>
+        <tr><td><c:PDFWbr targetStr="{!targetMC.TermSix_One}" /></td></tr>
+        <tr><td><c:PDFWbr targetStr="{!targetMC.TermSix_Two}" /></td></tr>
+        <tr><td><c:PDFWbr targetStr="{!targetMC.TermSix_Three}" /></td></tr>
+        <tr><td><c:PDFWbr targetStr="{!targetMC.TermSix_Four}" /></td></tr>
+        <tr><td><c:PDFWbr targetStr="{!targetMC.TermSix_Five}" /></td></tr>
+        <tr><td><c:PDFWbr targetStr="{!targetMC.TermSix_Five2}" /></td></tr>
+        <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 == '涓�娆℃�т粯娆�' }">
+            <tr><td height="20px"></td></tr>
+        </apex:outputPanel> -->
+        <!-- <apex:outputPanel rendered="{!targetMC.MC.Term_Of_Payment__c == '澶氭浠樻' && targetMC.Total_Payment_Time != null && targetMC.Total_Payment_Time == 1 }">
+            <tr><td height="20px"></td></tr>
+        </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> -->
+        <!-- <tr><td>1銆�</td></tr>
+        </table>
+            <table border="2px" style="border-style: solid; border-bottom-style: none;" cellspacing="0" cellpadding="0">
+                <tr>
+                    <td  bgcolor="#ffcc22">鍚堝悓娑堣垂鐜囷紙X锛�</td><td  bgcolor="#ffcc22">璋冩暣姣斾緥%</td>
+                </tr>
+                <tr>
+                    <td>{!targetMC.TermSeven_Table11}</td><td>{!targetMC.TermSeven_Table12}</td>
+                </tr>
+                <tr>
+                    <td>{!targetMC.TermSeven_Table21}</td><td>{!targetMC.TermSeven_Table22}</td>
+                </tr>
+                <tr>
+                    <td>{!targetMC.TermSeven_Table31}</td><td>{!targetMC.TermSeven_Table32}</td>
+                </tr>
+                <tr>
+                    <td>{!targetMC.TermSeven_Table41}</td><td>{!targetMC.TermSeven_Table42}</td>
+                </tr>
+                <tr>
+                    <td>{!targetMC.TermSeven_Table51}</td><td>{!targetMC.TermSeven_Table52}</td>
+                </tr>
+                <tr>
+                    <td>{!targetMC.TermSeven_Table61}</td><td>{!targetMC.TermSeven_Table62}</td>
+                </tr>
+                <tr>
+                    <td>{!targetMC.TermSeven_Table101}</td><td>{!targetMC.TermSeven_Table102}</td>
+                </tr>
+                <tr>
+                    <td>{!targetMC.TermSeven_Table111}</td><td>{!targetMC.TermSeven_Table112}</td>
+                </tr>
+            </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 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 == '涓�娆℃�т粯娆�' }">
-	    	<tr><td height="20px"></td></tr>
-		</apex:outputPanel> -->
-		<!-- <apex:outputPanel rendered="{!targetMC.MC.Term_Of_Payment__c == '澶氭浠樻' && targetMC.Total_Payment_Time != null && targetMC.Total_Payment_Time == 1 }">
-	    	<tr><td height="20px"></td></tr>
-		</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> -->
-		<tr><td>1銆�</td></tr>
-		</table>
-	    	<table border="2px" style="border-style: solid; border-bottom-style: none;" cellspacing="0" cellpadding="0">
-	    		<tr>
-	    			<td  bgcolor="#ffcc22">鍚堝悓娑堣垂鐜囷紙X锛�</td><td  bgcolor="#ffcc22">璋冩暣姣斾緥%</td>
-	    		</tr>
-	    		<tr>
-	    			<td>{!targetMC.TermSeven_Table11}</td><td>{!targetMC.TermSeven_Table12}</td>
-	    		</tr>
-	    		<tr>
-	    			<td>{!targetMC.TermSeven_Table21}</td><td>{!targetMC.TermSeven_Table22}</td>
-	    		</tr>
-	    		<tr>
-	    			<td>{!targetMC.TermSeven_Table31}</td><td>{!targetMC.TermSeven_Table32}</td>
-	    		</tr>
-	    		<tr>
-	    			<td>{!targetMC.TermSeven_Table41}</td><td>{!targetMC.TermSeven_Table42}</td>
-	    		</tr>
-	    		<tr>
-	    			<td>{!targetMC.TermSeven_Table51}</td><td>{!targetMC.TermSeven_Table52}</td>
-	    		</tr>
-	    		<tr>
-	    			<td>{!targetMC.TermSeven_Table61}</td><td>{!targetMC.TermSeven_Table62}</td>
-	    		</tr>
-	    		<tr>
-	    			<td>{!targetMC.TermSeven_Table101}</td><td>{!targetMC.TermSeven_Table102}</td>
-	    		</tr>
-	    		<tr>
-	    			<td>{!targetMC.TermSeven_Table111}</td><td>{!targetMC.TermSeven_Table112}</td>
-	    		</tr>
-	    	</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>
+        <!-- HWAG-BLWFGC  杩藉姞绗叓鏉★紝鍘熷叓涔濇潯椤哄欢 2020-02-19 update by vivek start -->
+        <tr><td height="15px"></td></tr>
+        <tr><td><c:PDFWbr targetStr="{!targetMC.TermEightAppend_Title}" /></td></tr>
+        <tr><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<c:PDFWbr targetStr="{!targetMC.TermEightAppend_One}" /></td></tr>
+        <tr><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<c:PDFWbr targetStr="{!targetMC.TermEightAppend_Two}" /></td></tr>
+        <tr><td><c:PDFWbr targetStr="{!targetMC.TermEightAppend_Three}" /></td></tr>
+        <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>
+        <!-- HWAG-BLWFGC  杩藉姞绗叓鏉★紝鍘熷叓涔濇潯椤哄欢 2020-02-19 update by vivek end -->
 
-	    <!-- HWAG-BLWFGC  杩藉姞绗叓鏉★紝鍘熷叓涔濇潯椤哄欢 2020-02-19 update by vivek start -->
-	    <tr><td height="15px"></td></tr>
-	    <tr><td><c:PDFWbr targetStr="{!targetMC.TermEightAppend_Title}" /></td></tr>
-	    <tr><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<c:PDFWbr targetStr="{!targetMC.TermEightAppend_One}" /></td></tr>
-	    <tr><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<c:PDFWbr targetStr="{!targetMC.TermEightAppend_Two}" /></td></tr>
-	    <tr><td><c:PDFWbr targetStr="{!targetMC.TermEightAppend_Three}" /></td></tr>
-	    <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>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<c:PDFWbr targetStr="{!targetMC.TermEightAppend_Six}" /></td></tr>
-	    <!-- HWAG-BLWFGC  杩藉姞绗叓鏉★紝鍘熷叓涔濇潯椤哄欢 2020-02-19 update by vivek end -->
+        <!-- 涔濄�� 鏈悎鍚岀殑瑙i噴涓庢墽琛岄�傜敤涓崕浜烘皯鍏卞拰鍥芥硶寰� -->
+        <tr><td height="15px"></td></tr>
+        <tr><td>
+            <c:PDFWbr targetStr="{!targetMC.TermEight_Title}" />
+            <u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Mc.Negotiate_Mean__c}" />&nbsp;</u>
+            <c:PDFWbr targetStr="{!targetMC.TermEight_Title2}" />
+        </td></tr>
+        <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>
 
-	    <!-- 涔濄��	鏈悎鍚岀殑瑙i噴涓庢墽琛岄�傜敤涓崕浜烘皯鍏卞拰鍥芥硶寰� -->
-	    <tr><td height="15px"></td></tr>
-	    <tr><td>
-	    	<c:PDFWbr targetStr="{!targetMC.TermEight_Title}" />
-	    	<u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Mc.Negotiate_Mean__c}" />&nbsp;</u>
-	    	<c:PDFWbr targetStr="{!targetMC.TermEight_Title2}" />
-	    </td></tr>
-	    <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>
-
-	    <!-- 鍗併��	鏈悎鍚岀敳鏂规墽   浠� -->
-	    <tr><td height="15px"></td></tr>
-	    <tr><td>
-	    	<c:PDFWbr targetStr="{!targetMC.TermNine_One}" />
-	    	<u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Mc.First_Party_Contract_Number__c}" />&nbsp;</u>
-	    	<c:PDFWbr targetStr="{!targetMC.TermNine_Two}" />
-	    </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>
-		</apex:outputPanel>
-	    <apex:outputPanel rendered="{!targetMC.MC.Term_Of_Payment__c == '澶氭浠樻' && targetMC.Total_Payment_Time != null && targetMC.Total_Payment_Time == 4 }">
-	    	<tr><td height="80px"></td></tr>
-		</apex:outputPanel>
-		<apex:outputPanel rendered="{!targetMC.MC.Term_Of_Payment__c == '澶氭浠樻' && targetMC.Total_Payment_Time != null && targetMC.Total_Payment_Time == 5 }">
-	    	<tr><td height="60px"></td></tr>
-		</apex:outputPanel>
-		<apex:outputPanel rendered="{!targetMC.MC.Term_Of_Payment__c == '澶氭浠樻' && targetMC.Total_Payment_Time != null && targetMC.Total_Payment_Time == 6 }">
-	    	<tr><td height="15px"></td></tr>
-		</apex:outputPanel>
+        <!-- 涔濄�� 鏈悎鍚屼竴寮�    浠� -->
+        <tr><td height="15px"></td></tr>
+        <tr><td>
+            <c:PDFWbr targetStr="{!targetMC.TermNine_One}" />
+            <u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Mc.Total_Contract_Number__c}" />&nbsp;</u>
+            <c:PDFWbr targetStr="{!targetMC.TermNine_Two}" />
+            <u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Mc.First_Party_Contract_Number__c}" />&nbsp;</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>
+        </apex:outputPanel>
+        <apex:outputPanel rendered="{!targetMC.MC.Term_Of_Payment__c == '澶氭浠樻' && targetMC.Total_Payment_Time != null && targetMC.Total_Payment_Time == 4 }">
+            <tr><td height="80px"></td></tr>
+        </apex:outputPanel>
+        <apex:outputPanel rendered="{!targetMC.MC.Term_Of_Payment__c == '澶氭浠樻' && targetMC.Total_Payment_Time != null && targetMC.Total_Payment_Time == 5 }">
+            <tr><td height="60px"></td></tr>
+        </apex:outputPanel>
+        <apex:outputPanel rendered="{!targetMC.MC.Term_Of_Payment__c == '澶氭浠樻' && targetMC.Total_Payment_Time != null && targetMC.Total_Payment_Time == 6 }">
+            <tr><td height="15px"></td></tr>
+        </apex:outputPanel>
     </table>
         <!-- 銉氥兗銈革紦 -->
         <table width="100%" cellspacing="1" cellpadding="1" style="font-size:13pt;">

--
Gitblit v1.9.1