先款后修上线内容

李彤

2022-04-02 1949e7ccb3bfab67ad2b16d7e0172851c3f823bb

 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;
            <!-- 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,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,6 +420,8 @@
        </apex:outputPanel> -->
        <!-- 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')}">
            <!-- 十一、  若甲方是乙方的特约经销商 -->
            <tr><td height="15px"></td></tr>
@@ -409,7 +441,7 @@
            </td></tr>
            <tr><td height="15px"></td></tr>
        </apex:outputPanel>
        <apex:outputPanel rendered="{!IF(targetMC.MC.Dealer__c != '', 'false', 'true')}">
            <apex:outputPanel rendered="{!targetMC.MC.old_Is_RecognitionModel__c}">
            <!-- 原版本 -->
            <!-- 九、 本合同甲方执   份 -->
            <tr><td height="15px"></td></tr>
@@ -421,9 +453,19 @@
            <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="15px"></td></tr>
        </apex:outputPanel>
        <!-- update      wangweipeng            2021/12/10               end -->
    </table>
        <!-- ページ３ -->
        <table width="100%" cellspacing="1" cellpadding="1" style="font-size:13pt;">