ProdBackup0513

buli

2022-05-13 2f4492ee18f90274582fcc2bb06f5e9bf64136e8

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

@@ -98,16 +98,16 @@
            </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>
@@ -635,10 +635,10 @@
                </td>
            </tr>
            <tr>
                <td colspan = "4">
                <td colspan = "2">
                    6.交货期:  <apex:outputField value="{!contra.order.DeliveryTimeText__c}" /><br/>
                    6.THE DELIVERY TIME: <apex:outputField value="{!contra.order.DeliveryTimeTextEn__c}" /><br/>
                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;by the Buyer.<br/>
                    <!-- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;by the Buyer.<br/> -->
                </td>
            </tr>
            <tr>
@@ -673,11 +673,11 @@
            </tr>

            <tr>
                <td colspan = "3">
                <td colspan = "4">
                    11. 付款方式: {!contra.order.PDF_PaymentTerms__c}；<br/>
                    所有因付款而在汇款方银行发生的手续费及其它费用，均由买方承担。<br/>
                    所有银行手续费，包括对方银行和中转行手续费及其它费用，均由买方承担。<br/>
                    11.  TERMS OF PAYMENT: {!contra.order.PDF_PaymentTerms_E__c}；<br/>
                    All the bank charges and other expenses arising from the payment at the remitting bank shall be borne by the Buyer.<br/>
                    All the bank charges and other expenses, including beneficiary bank and intermediary bank, arising from the payment shall be borne by the Buyer.<br/>
                </td>
            </tr>
            </table>
@@ -689,7 +689,7 @@
                <td>
                    12. 所需的文件: <br/>
                    <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">
                    1) {!contra.order.PDF_Bi_Quality__c}份由卖方出具的质量和数量证明;<br/>
                    1) {!contra.order.PDF_Bi_Quality__c}份由卖方出具的质量和数量证明;<br/>
                    2) {!contra.order.PDF_Bi_Origin__c}份卖方出具的原产地证明;及<br/>
                    3) {!contra.order.PDF_Bi_Non_Wooden__c}份非木质包装证明。<br/>
                    </apex:outputPanel>
@@ -699,7 +699,7 @@
                    2) 发票{!contra.order.PDF_Bi_invoice__c}份, 注明合同号和运输标识(如有一个以上运输标识, 应分别出具发票)及合同中其它细节;<br/>
                    3) 如保险由卖方负责的情况下，卖方需提供保险单{!contra.order.PDF_Bi_Insurance__c}套，投一切险， 按发票金额110％投保一切险;<br/>
                    4) {!contra.order.PDF_Bi_Packing__c}份由卖方出具的装箱单;<br/>
                    5) {!contra.order.PDF_Bi_Quality__c}份由卖方出具的质量和数量证明;<br/>
                    5) {!contra.order.PDF_Bi_Quality__c}份由卖方出具的质量和数量证明;<br/>
                    6) {!contra.order.PDF_Bi_Origin__c}份卖方出具的原产地证明;及<br/>
                    7) {!contra.order.PDF_Bi_Non_Wooden__c}份非木质包装证明。<br/>
                    <apex:outputPanel rendered="{!IF(Opp.ProductSegment__c = 'BS' || Opp.ProductSegment__c = 'ANI' ||Opp.ProductSegment__c = 'NDT', 'true', 'false')}" layout="none">
@@ -712,7 +712,7 @@
                     issued separately), made out in details as per relative contract;<br/>
                    3) Insurance Policy/Certificate in one original and {!contra.order.PDF_Bi_Insurance__c} copies for 110% of the invoice value if the insurance is bought by the Seller;<br/>
                    4) Packing list in {!contra.order.PDF_Bi_Packing__c} copies issued by the Seller;<br/>
                    5) Certificate of Quality and Quantity in {!contra.order.PDF_Bi_Quality__c} copies issued by the Seller; <br/>
                    5) Certificate of Quality and Quantity in {!contra.order.PDF_Bi_Quality__c} copies issued by the Seller; <br/>
                    6) Certificate of Origin in {!contra.order.PDF_Bi_Origin__c} copies issued by the Seller; and<br/>
                    7) {!contra.order.PDF_Bi_Non_Wooden__c} Certificate of Non-wood material packing.<br/>
                    <apex:outputPanel rendered="{!IF(Opp.ProductSegment__c = 'BS', 'true', 'false')}" layout="none">
@@ -1032,7 +1032,7 @@
                    </apex:outputPanel>
                    <apex:outputPanel rendered="{!IF((Opp.ProductSegment__c = 'NDT' || Opp.ProductSegment__c = 'ANI' ), 'true', 'true')}" layout="none"> -->
                    <td>
                    Name: &nbsp;&nbsp;Wei Liu
                    Name: &nbsp;&nbsp;Yoshito Sato
                    </td>
                    <!-- </apex:outputPanel> -->
                    <td>