Merge branch 'master' into LightningUpgradeProject

buli

2023-06-05 e9e1806b0f4b5bae1fc36204ccc5d6fdad52d66f

 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>&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-->

        <!-- 六、 甲方责任范围  -->
        <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>&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>

        <!-- 十、 本合同的解释与执行适用中华人民共和国法律 -->
        <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>&nbsp;<c:PDFWbr targetStr="{!targetMC.Mc.First_Party_Contract_Number__c}" />&nbsp;</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>&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>
                <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>&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>
            <tr><td height="30px"></td></tr>
        <!--</apex:outputPanel>-->
        <!-- update      wangweipeng            2021/12/10               end -->
    </table>
        <!-- ページ３ -->