From 559771a80cf779dc13a84ecd2f178e6ca5a8353a Mon Sep 17 00:00:00 2001
From: FUYU <fuyu@prec-tech.com>
Date: 星期五, 19 五月 2023 15:52:16 +0800
Subject: [PATCH] 备份省目标录入

---
 force-app/main/default/pages/NewMCAgentPDF.page |  173 +++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 135 insertions(+), 38 deletions(-)

diff --git a/force-app/main/default/pages/NewMCAgentPDF.page b/force-app/main/default/pages/NewMCAgentPDF.page
index 1dee69d..aab37f8 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>&nbsp;<c:PDFWbr targetStr="{!targetMC.Total_Contract_Amount_In_Words}" />&nbsp;</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>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-            <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>&nbsp;<c:PDFWbr targetStr="{!targetMC.Mc.Small_Repair_Time__c}" />&nbsp;</u>
@@ -278,7 +299,17 @@
         <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 -->
+            <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>
         <tr><td>
@@ -286,6 +317,34 @@
             <u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Mc.Inspection_Time__c}" />&nbsp;</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-->
 
         <!-- 鍏�� 鐢叉柟璐d换鑼冨洿  -->
         <tr><td height="15px"></td></tr>
@@ -363,11 +422,37 @@
         
         <!-- 鍏�� 鏈悎鍚岀殑瑙i噴涓庢墽琛岄�傜敤涓崕浜烘皯鍏卞拰鍥芥硶寰� -->
         <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>&nbsp;<c:PDFWbr targetStr="{!targetMC.Mc.Negotiate_Mean__c}" />&nbsp;</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>
+
+        <!-- 鍗併�� 鏈悎鍚岀殑瑙i噴涓庢墽琛岄�傜敤涓崕浜烘皯鍏卞拰鍥芥硶寰� -->
+        <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> -->
@@ -376,9 +461,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>
@@ -390,40 +475,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>&nbsp;<c:PDFWbr targetStr="{!targetMC.Mc.First_Party_Contract_Number__c}" />&nbsp;</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>&nbsp;<c:PDFWbr targetStr="{!targetMC.Mc.First_Party_Contract_Number__c}" />&nbsp;</u>
-                <c:PDFWbr targetStr="{!targetMC.TermNine_Two}" />
-            </td></tr>
-            <tr><td height="15px"></td></tr>
-            <!-- 鍘熺増鏈�  -->
-        </apex:outputPanel>
+                <!-- 涔濄�� 鏈悎鍚岀敳鏂规墽   浠� -->
+                <!--<tr><td height="15px"></td></tr>
+                <tr><td>
+                    <c:PDFWbr targetStr="{!targetMC.TermTen_One}" />
+                    <u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Mc.First_Party_Contract_Number__c}" />&nbsp;</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>&nbsp;<c:PDFWbr targetStr="{!targetMC.Mc.First_Party_Contract_Number__c}" />&nbsp;</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>&nbsp;<c:PDFWbr targetStr="{!targetMC.Mc.First_Party_Contract_Number__c}" />&nbsp;</u>
+                <c:PDFWbr targetStr="{!targetMC.TermTen_Two2}" />
+            </td></tr>
+            <tr><td height="30px"></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