本地提交备份

沙世明

2022-09-13 bfca7a84bec815da594f1d12558535ed06d2490b

 force-app/main/default/pages/NewMCHPDF.page

@@ -267,6 +267,26 @@
          <u>&nbsp;<c:PDFWbr targetStr="{!targetMC.Mc.Inspection_Time__c}" />&nbsp;</u>
          <c:PDFWbr targetStr="{!targetMC.TermFive_Ten2}" />
       </td></tr>
       <!-- 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>
@@ -286,7 +306,7 @@
       <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 +314,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,7 +381,7 @@
       <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 }">
@@ -375,7 +395,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>
@@ -384,6 +404,13 @@
          <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>
        <!-- ページ３ -->
        <table width="100%" cellspacing="1" cellpadding="1" style="font-size:13pt;">