外贸打印PDF页面修改。无影响。

GWY

2022-04-21 d46813ed27f074915b2d6bca8324d12335613c46

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

@@ -94,20 +94,20 @@
                <td colspan = "4" style="text-align: center;font-size: 14pt;">合同</td>
            </tr>
            <tr>
                <td colspan = "4" style="text-align: center;font-size: 14pt;">CONTRACT</td>
                <td colspan = "4" style="text-align: center;font-size: 12pt;">CONTRACT</td>
            </tr>

            <tr>
                <td style="font-size: 9pt;">买方:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!specialDeliveryAddress.Name}</td>
                <td style="font-size: 8pt;">买方:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!specialDeliveryAddress.Name}</td>
            </tr>
            <tr>
                <td style="font-size: 9pt;">THE BUYER:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!specialDeliveryAddress.EnglishName__c}</td>
                <td style="font-size: 8pt;">THE BUYER:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!specialDeliveryAddress.EnglishName__c}</td>
            </tr>
            <tr>
                <td style="font-size: 9pt;">地址:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!specialDeliveryAddress.Address1__c}</td>
                <td style="font-size: 8pt;">地址:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!specialDeliveryAddress.Address1__c}</td>
            </tr>
            <apex:outputPanel rendered="{!IF(Opp.TradeType__c != 'Taxation', 'true', 'false')}" layout="none">
            <tr>
@@ -126,36 +126,36 @@
            </tr>
            </apex:outputPanel>
            <tr>
                <td style="font-size: 9pt;">联系人:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!specialDeliveryContact.Name}</td>
                <td style="font-size: 8pt;">联系人:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!specialDeliveryContact.Name}</td>
            </tr>
            <tr>
                <td style="font-size: 9pt;">CONTACT PERSON:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_B_contactperson__c}</td>
                <td style="font-size: 8pt;">CONTACT PERSON:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_B_contactperson__c}</td>
            </tr>

            <apex:outputPanel rendered="{!IF((Opp.ProductSegment__c = 'IE' || Opp.ProductSegment__c = 'RVI'|| Opp.ProductSegment__c = 'NDT'|| Opp.ProductSegment__c = 'ANI' ) && Opp.TradeType__c = 'Tax Exemption', 'true', 'false')}" layout="none" >
            <tr>
                <td style="font-size: 9pt;">E-Mail:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!specialDeliveryContact.Email}</td>
                <td style="font-size: 8pt;">E-Mail:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!specialDeliveryContact.Email}</td>
            </tr>
            </apex:outputPanel>

            <apex:outputPanel rendered="{!IF(Opp.ProductSegment__c = 'IE', 'true', 'false')}" layout="none">
            <tr>
                <td style="font-size: 9pt;">用户属性:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_B_Attri__c}</td>
                <td style="font-size: 8pt;">用户属性:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_B_Attri__c}</td>
            </tr>
            <tr>
                <td style="font-size: 9pt;">用户产品:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.account.Sub_Use__c}</td>
                <td style="font-size: 8pt;">用户产品:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.account.Sub_Use__c}</td>
            </tr>
            </apex:outputPanel>

            <apex:outputPanel rendered="{!IF(Opp.ProductSegment__c = 'RVI', 'true', 'false')}" layout="none">
            <tr>
                <td style="font-size: 9pt;">市场:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.account.Sub_Use__c}</td>
                <td style="font-size: 8pt;">市场:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.account.Sub_Use__c}</td>
            </tr>
            </apex:outputPanel>

@@ -163,16 +163,16 @@

            <apex:outputPanel rendered="{!IF((Opp.ProductSegment__c = 'BC' ) && Opp.TradeType__c = 'Tax Exemption', 'true', 'false')}" layout="none">
            <tr>
                <td style="font-size: 9pt;">卖方:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_SELLER__c}</td>
                <td style="font-size: 8pt;">卖方:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_SELLER__c}</td>
            </tr>
            <tr>
                <td style="font-size: 9pt;">THE SELLER:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_THE_SELLER__c}</td>
                <td style="font-size: 8pt;">THE SELLER:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_THE_SELLER__c}</td>
            </tr>
            <tr>
                <td style="font-size: 9pt;">地址:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_S_Adds__c}</td>
                <td style="font-size: 8pt;">地址:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_S_Adds__c}</td>
            </tr>
            <tr>
                <td style="font-size: 8pt;">ADD:&nbsp;</td>
@@ -182,30 +182,30 @@
            </apex:outputPanel>
            <apex:outputPanel rendered="{!IF((Opp.ProductSegment__c = 'IE' || Opp.ProductSegment__c = 'RVI' || Opp.ProductSegment__c = 'BS'|| Opp.ProductSegment__c = 'NDT'|| Opp.ProductSegment__c = 'ANI' ) &&Opp.TradeType__c = 'Taxation', 'true', 'false')}" layout="none">
            <tr>
                <td style="font-size: 9pt;">卖方:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_SELLER__c}</td>
                <td style="font-size: 8pt;">卖方:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_SELLER__c}</td>
            </tr>
            <tr>
                <td style="font-size: 9pt;">地址:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_S_Adds__c}</td>
                <td style="font-size: 8pt;">地址:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_S_Adds__c}</td>
            </tr>
            <tr>
                <td style="font-size: 9pt;">电话 (TEL):&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_S_TEL__c}</td>
                <td style="font-size: 8pt;">电话 (TEL):&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_S_TEL__c}</td>
            </tr>
            </apex:outputPanel>
            <apex:outputPanel rendered="{!IF((Opp.ProductSegment__c = 'IE' || Opp.ProductSegment__c = 'RVI' || Opp.ProductSegment__c = 'BS' || Opp.ProductSegment__c = 'NDT'|| Opp.ProductSegment__c = 'ANI')&& Opp.TradeType__c = 'Tax Exemption', 'true', 'false')}" layout="none">
            <tr>
                <td style="font-size: 9pt;">卖方:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_SELLER__c}</td>
                <td style="font-size: 8pt;">卖方:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_SELLER__c}</td>
            </tr>
            <tr>
                <td style="font-size: 9pt;">THE SELLER:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_THE_SELLER__c}</td>
                <td style="font-size: 8pt;">THE SELLER:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_THE_SELLER__c}</td>
            </tr>
            <tr>
                <td style="font-size: 9pt;">地址:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_S_Adds__c}</td>
                <td style="font-size: 8pt;">地址:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_S_Adds__c}</td>
            </tr>
            <tr>
                <td style="font-size: 8pt;">ADD:&nbsp;</td>
@@ -220,112 +220,112 @@
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_S_FAX__c}</td>
            </tr>
            <tr>
                <td style="font-size: 9pt;">Bank Name:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_S_Bank_Name__c}</td>
                <td style="font-size: 8pt;">Bank Name:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_S_Bank_Name__c}</td>
            </tr>
            <tr>
                <td style="font-size: 9pt;">Branch:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_S_Branch__c}</td>
                <td style="font-size: 8pt;">Branch:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_S_Branch__c}</td>
            </tr>
            <tr>
                <td style="font-size: 8pt;">Address:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_S_Bank_Address__c}</td>
            </tr>
            <!-- <tr>
                <td style="font-size: 9pt;">Address:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_S_Address__c}</td>
                <td style="font-size: 8pt;">Address:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_S_Address__c}</td>
            </tr> -->
            <tr>
                <td style="font-size: 9pt;">Account no:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_S_Account_No__c}</td>
                <td style="font-size: 8pt;">Account no:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_S_Account_No__c}</td>
            </tr>
            <tr>
                <td style="font-size: 9pt;">Swift code:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_S_Swift_Code__c}</td>
                <td style="font-size: 8pt;">Swift code:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_S_Swift_Code__c}</td>
            </tr>
            <tr>
                <td style="font-size: 9pt;">Account name:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_S_Account_Name__c}</td>
                <td style="font-size: 8pt;">Account name:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_S_Account_Name__c}</td>
            </tr>
            </apex:outputPanel>

            <tr style="line-height: 4px"><td height="1px">&nbsp;</td></tr>

            <apex:outputPanel rendered="{!IF((Opp.ProductSegment__c = 'IE' || Opp.ProductSegment__c = 'RVI' || Opp.ProductSegment__c = 'BS'|| Opp.ProductSegment__c = 'NDT'|| Opp.ProductSegment__c = 'ANI' ) && Opp.TradeType__c = 'Tax Exemption', 'true', 'false')}" layout="none">
            <!-- <tr>
                <td style="font-size: 8pt;">&nbsp;</td>
            </tr> -->
            <tr>
                <td style="font-size: 9pt;">&nbsp;</td>
                <td style="font-size: 8pt;">收货人:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_C_Consignee__c}</td>
            </tr>
            <tr>
                <td style="font-size: 9pt;">收货人:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_C_Consignee__c}</td>
                <td style="font-size: 8pt;">THE CONSIGNEE:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_C_THECONSIGNE__c}</td>
            </tr>
            <tr>
                <td style="font-size: 9pt;">THE CONSIGNEE:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_C_THECONSIGNE__c}</td>
            </tr>
            <tr>
                <td style="font-size: 9pt;">地址:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_C_Address__c}</td>
                <td style="font-size: 8pt;">地址:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_C_Address__c}</td>
            </tr>
            <tr>
                <td style="font-size: 8pt;">ADD:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_C_Add__c}</td>
            </tr>
            <tr>
                <td style="font-size: 9pt;">电话（Tel）:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_C_TEL__c}</td>
                <td style="font-size: 8pt;">电话（Tel）:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_C_TEL__c}</td>
            </tr>
            <tr>
                <td style="font-size: 9pt;">传真（Fax）:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_C_FAX__c}</td>
                <td style="font-size: 8pt;">传真（Fax）:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_C_FAX__c}</td>
            </tr>
            <tr>
                <td style="font-size: 9pt;">联系人:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_C_CONTACT__c}</td>
                <td style="font-size: 8pt;">联系人:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_C_CONTACT__c}</td>
            </tr>
            <tr>
                <td style="font-size: 9pt;">CONTACT PERSON:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_C_contactperson__c}</td>
                <td style="font-size: 8pt;">CONTACT PERSON:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_C_contactperson__c}</td>
            </tr>
            </apex:outputPanel>
<!--             <apex:outputPanel rendered="{!IF((Opp.ProductSegment__c = 'IE' || Opp.ProductSegment__c = 'RVI') && Opp.TradeType__c = 'Tax Exemption', 'true', 'false')}" layout="none">
            <tr>
                <td style="font-size: 9pt;">THE CONSIGNEE:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_C_THECONSIGNE__c}</td>
                <td style="font-size: 8pt;">THE CONSIGNEE:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_C_THECONSIGNE__c}</td>
            </tr>
            <tr>
                <td style="font-size: 8pt;">ADD:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_C_Add__c}</td>
            </tr>
            <tr>
                <td style="font-size: 9pt;">电话（Tel）:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.pdf_c_tel}</td>
                <td style="font-size: 8pt;">电话（Tel）:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.pdf_c_tel}</td>
            </tr>
            <tr>
                <td style="font-size: 9pt;">传真（Fax）:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.pdf_c_fax}</td>
                <td style="font-size: 8pt;">传真（Fax）:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.pdf_c_fax}</td>
            </tr>
            <tr>
                <td style="font-size: 9pt;">CONTACT PERSON:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_C_contactperson__c}</td>
                <td style="font-size: 8pt;">CONTACT PERSON:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_C_contactperson__c}</td>
            </tr>
            </apex:outputPanel> -->
            <apex:outputPanel rendered="{!IF((Opp.ProductSegment__c = 'IE' || Opp.ProductSegment__c = 'RVI' || Opp.ProductSegment__c = 'BS'|| Opp.ProductSegment__c = 'NDT'|| Opp.ProductSegment__c = 'ANI' ) && Opp.TradeType__c = 'Taxation', 'true', 'false')}" layout="none">
            <tr>
                <td style="font-size: 9pt;">收货人:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.pdf_c_consignee}</td>
                <td style="font-size: 8pt;">收货人:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.pdf_c_consignee}</td>
            </tr>
            <tr>
                <td style="font-size: 9pt;">地址:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.pdf_c_address}</td>
                <td style="font-size: 8pt;">地址:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.pdf_c_address}</td>
            </tr>
            <tr>
                <td style="font-size: 9pt;">电话（Tel）:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.pdf_c_tel}</td>
                <td style="font-size: 8pt;">电话（Tel）:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.pdf_c_tel}</td>
            </tr>
            <tr>
                <td style="font-size: 9pt;">联系人:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.pdf_c_contact}</td>
                <td style="font-size: 8pt;">联系人:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.pdf_c_contact}</td>
            </tr>
            </apex:outputPanel>

@@ -333,16 +333,16 @@

            <apex:outputPanel rendered="{!IF(Opp.TradeType__c = 'Tax Exemption' && (Opp.ProductSegment__c = 'BS'||Opp.ProductSegment__c = 'NDT'||Opp.ProductSegment__c = 'ANI'||Opp.ProductSegment__c = 'IE'||Opp.ProductSegment__c = 'RVI'), 'true', 'false')}" layout="none">
            <tr>
                <td style="font-size: 9pt;">通知人:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_N_NotifyParty__c}</td>
                <td style="font-size: 8pt;">通知人:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_N_NotifyParty__c}</td>
            </tr>
            <tr>
                <td style="font-size: 9pt;">THE NOTIFY PARTY:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_NOTIFY_PARTY__c}</td>
                <td style="font-size: 8pt;">THE NOTIFY PARTY:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_NOTIFY_PARTY__c}</td>
            </tr>
            <tr>
                <td style="font-size: 9pt;">地址:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_N_Address__c}</td>
                <td style="font-size: 8pt;">地址:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_N_Address__c}</td>
            </tr>
            <tr>
                <td style="font-size: 8pt;">ADD:&nbsp;</td>
@@ -357,34 +357,34 @@
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_N_FAX__c}</td>
            </tr>
            <tr>
                <td style="font-size: 9pt;">联系人:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_N_CONTACT__c}</td>
                <td style="font-size: 8pt;">联系人:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_N_CONTACT__c}</td>
            </tr>
            <tr>
                <td style="font-size: 9pt;">CONTACT PERSON:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_N_CONTACTPERSON__c}</td>
                <td style="font-size: 8pt;">CONTACT PERSON:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_N_CONTACTPERSON__c}</td>
            </tr>
            </apex:outputPanel>
            <apex:outputPanel rendered="{!IF(Opp.TradeType__c = 'Tax Exemption' && (Opp.ProductSegment__c = 'ABC'), 'true', 'false')}" layout="none">
            <tr>
                <td style="font-size: 9pt;">THE NOTIFY PARTY:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_NOTIFY_PARTY__c}</td>
                <td style="font-size: 8pt;">THE NOTIFY PARTY:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_NOTIFY_PARTY__c}</td>
            </tr>
            <tr>
                <td style="font-size: 8pt;">ADD:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_N_Add__c}</td>
            </tr>
            <tr>
                <td style="font-size: 9pt;">电话（Tel）:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_N_TEL__c}</td>
                <td style="font-size: 8pt;">电话（Tel）:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_N_TEL__c}</td>
            </tr>
            <tr>
                <td style="font-size: 9pt;">传真（Fax）:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_N_FAX__c}</td>
                <td style="font-size: 8pt;">传真（Fax）:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_N_FAX__c}</td>
            </tr>
            <tr>
                <td style="font-size: 9pt;">CONTACT PERSON:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_N_CONTACTPERSON__c}</td>
                <td style="font-size: 8pt;">CONTACT PERSON:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_N_CONTACTPERSON__c}</td>
            </tr>
            </apex:outputPanel>

@@ -392,46 +392,46 @@
            
            <apex:outputPanel rendered="{!IF((Opp.ProductSegment__c = 'IE' || Opp.ProductSegment__c = 'RVI' ) && Opp.TradeType__c = 'Tax Exemption', 'true', 'false')}" layout="none">
            <tr>
                <td style="font-size: 9pt;">转运商 (英文):&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_Forwarder__c}</td>
                <td style="font-size: 8pt;">转运商 (英文):&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_Forwarder__c}</td>
            </tr>
            <tr>
                <td style="font-size: 8pt;">ADD:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_F_Add__c}</td>
            </tr>
            <tr>
                <td style="font-size: 9pt;">电话（Tel）:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_F_TEL__c}</td>
                <td style="font-size: 8pt;">电话（Tel）:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_F_TEL__c}</td>
            </tr>
            <tr>
                <td style="font-size: 9pt;">传真（Fax）:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_F_FAX__c}</td>
                <td style="font-size: 8pt;">传真（Fax）:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_F_FAX__c}</td>
            </tr>
            <tr>
                <td style="font-size: 9pt;">联系人 (中文):&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_F_ContactPerson__c}</td>
                <td style="font-size: 8pt;">联系人 (中文):&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_F_ContactPerson__c}</td>
            </tr>
            </apex:outputPanel>
            <apex:outputPanel rendered="{!IF((Opp.ProductSegment__c = 'IE' || Opp.ProductSegment__c = 'RVI' || Opp.ProductSegment__c = 'BS'|| Opp.ProductSegment__c = 'NDT'|| Opp.ProductSegment__c = 'ANI' ) && Opp.TradeType__c = 'Taxation', 'true', 'false')}" layout="none">
            <tr>
                <td style="font-size: 9pt;">中间商公司:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!Opp.SubDealer__c}</td>
                <td style="font-size: 8pt;">中间商公司:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!Opp.SubDealer__c}</td>
            </tr>
            <tr>
                <td style="font-size: 9pt;">公司名称:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_F_Add__c}</td>
                <td style="font-size: 8pt;">公司名称:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_F_Add__c}</td>
            </tr>
            <tr>
                <td style="font-size: 9pt;">地址:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_F_TEL__c}</td>
                <td style="font-size: 8pt;">地址:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_F_TEL__c}</td>
            </tr>
            <tr>
                <td style="font-size: 9pt;">电话:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_F_FAX__c}</td>
                <td style="font-size: 8pt;">电话:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_F_FAX__c}</td>
            </tr>
            <tr>
                <td style="font-size: 9pt;">系统编号:&nbsp;</td>
                <td colspan = "3" style="font-size: 9pt;">{!contra.order.Id}</td>
                <td style="font-size: 8pt;">系统编号:&nbsp;</td>
                <td colspan = "3" style="font-size: 8pt;">{!contra.order.Id}</td>
            </tr>
            </apex:outputPanel>
        </table>
@@ -651,8 +651,8 @@

            <tr>
                <td colspan = "3">
                    8. 装运口岸：&nbsp;香港<br/>
                    8.  PORT OF LOADING:&nbsp;Hong Kong <br/>
                    8. 装运口岸：&nbsp;{!contra.order.PDF_Sp_LOADING__c}<br/>
                    8.  PORT OF LOADING:&nbsp;{!contra.order.PDF_Sp_LOADING_E__c}<br/>
                </td>
            </tr>
            <tr>
@@ -735,6 +735,40 @@
                    quantity,  weight loaded, number of packages, invoice value, flight number and date, air waybill number etc. by fax or email.<br/>
                </td>
            </tr>
            <apex:outputPanel rendered="{!IF(Opp.ProductSegment__c = 'BS' || Opp.ProductSegment__c = 'IE' || Opp.ProductSegment__c = 'RVI', 'true', 'false')}" layout="none">
            <tr>
                <td>
                    14. 质量保证：<br/>
                    A. 卖方保证本合同之货物是用最好的材料以上等的工艺制造，崭新及未用过的，其质量与规格一切方面与本合同的规定相符。<br/>
                    保证期为最终验收报告签署之日起的{!contra.QAeng}但不超过发货日后的{!contra.QAeng4}。<br/>
                    在保证期内，如买方按照货物使用说明书在正常条件下使用，由于卖方设计或制造上的缺陷而发生的损坏，由卖方负责。<br/>
                    在保证期内如果货物的重要零部件需要更换，则该零部件的保证期从更换之日起重新计算，外购件以原供应商的保证期为准。<br/>
                    B. 如果双方共同商定并确认的供货范围中有遗漏的部件和设备并有可能导致整套货物不能按时验收投产或影响生产，卖方<br/>
                    有义务和责任在制造过程中与买方商量做出相应的调整和补救，并保证整套以上货物能通过验收。<br/>
                    C. 本合同中所述的保证是适用于根据合同货物提供的的唯一保证。本保证条款取代并排除法律、惯例、法令或其他规定施加<br/>
                    或默示的任何其他担保、保证和/或条件和/或因此而产生的责任。对于任何有缺陷的或不符合标准的货物，买方所适用的只有<br/>
                    本条特别规定的救济。<br/>
                    14. WARRANTY：<br/>
                    A．The Seller warrant that the goods hereof is made of the best materials with first class workmanship, brand new and<br/>
                    unused and complies in all respects with the quality and specification stipulated in this Contract.<br/>
                    The warranty period shall be {!contra.QAeng3}counting from the date on which the goods have been accepted by the end user<br/>
                    but limited to a maximum of {!contra.QAeng2} from the date of shipment. <br/>
                    Within the warranty period, the Seller shall be liable for the damage incurred on account of the defects attributable to the design<br/>
                     and emerging during the course of manufacturing of the Seller’s side if the Buyer operate under regular conditions in accordance<br/>
                     with the instruction to the equipments or the machines. Within the warranty period, if some important units and parts of the goods<br/>
                     need to change, the warranty period of the new units and parts should be counted from the changing date. If the new units and<br/>
                      parts are bought from the third party, the warranty period of the new units and parts should be counted according to the original suppliers.<br/>
                    B．In case there’s any missing parts &amp; machines which are out of the agreed scope of supply and most possibly would influence <br/>
                    the commissioning or production on time, the Seller has the obligation and responsibility to discuss with Buyer to make concerned <br/>
                    adjustments and amendments to warrant the acceptance of the goods.<br/>
                    C. The warranty set out in this Contract is the only warranty applicable to the goods supplied pursuant to this Contract. This<br/>
                    warranty replaces and excludes any other guarantee, warranty and/or condition imposed or implied by law, custom, statute or <br/>
                    otherwise and/or resulting liabilities. Only those remedies specifically set out in this clause are available to the Buyer<br/>
                    in respect of any defective or non-conforming goods.<br/>
                </td>
            </tr>
        </apex:outputPanel>
        <apex:outputPanel rendered="{!IF(Opp.ProductSegment__c = 'NDT' || Opp.ProductSegment__c = 'ANI', 'true', 'false')}" layout="none">
            <tr>
                <td>
                    14. 质量保证：<br/>
@@ -767,6 +801,7 @@
                    in respect of any defective or non-conforming goods.<br/>
                </td>
            </tr>
        </apex:outputPanel>
        </table>
        <!--<apex:outputPanel layout="none">
            <div style="page-break-after: always;"/>