From 2f4492ee18f90274582fcc2bb06f5e9bf64136e8 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 13 五月 2022 17:32:14 +0800
Subject: [PATCH] ProdBackup0513
---
force-app/main/default/pages/OrderPDF.page | 252 +++++++++++++++++++++++++-------------------------
1 files changed, 126 insertions(+), 126 deletions(-)
diff --git a/force-app/main/default/pages/OrderPDF.page b/force-app/main/default/pages/OrderPDF.page
index 0bc77c3..6de56c6 100644
--- a/force-app/main/default/pages/OrderPDF.page
+++ b/force-app/main/default/pages/OrderPDF.page
@@ -98,16 +98,16 @@
</tr>
<tr>
- <td style="font-size: 9pt;">涔版柟: </td>
- <td colspan = "3" style="font-size: 9pt;">{!specialDeliveryAddress.Name}</td>
+ <td style="font-size: 8pt;">涔版柟: </td>
+ <td colspan = "3" style="font-size: 8pt;">{!specialDeliveryAddress.Name}</td>
</tr>
<tr>
- <td style="font-size: 9pt;">THE BUYER: </td>
- <td colspan = "3" style="font-size: 9pt;">{!specialDeliveryAddress.EnglishName__c}</td>
+ <td style="font-size: 8pt;">THE BUYER: </td>
+ <td colspan = "3" style="font-size: 8pt;">{!specialDeliveryAddress.EnglishName__c}</td>
</tr>
<tr>
- <td style="font-size: 9pt;">鍦板潃: </td>
- <td colspan = "3" style="font-size: 9pt;">{!specialDeliveryAddress.Address1__c}</td>
+ <td style="font-size: 8pt;">鍦板潃: </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;">鑱旂郴浜�: </td>
- <td colspan = "3" style="font-size: 9pt;">{!specialDeliveryContact.Name}</td>
+ <td style="font-size: 8pt;">鑱旂郴浜�: </td>
+ <td colspan = "3" style="font-size: 8pt;">{!specialDeliveryContact.Name}</td>
</tr>
<tr>
- <td style="font-size: 9pt;">CONTACT PERSON: </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_B_contactperson__c}</td>
+ <td style="font-size: 8pt;">CONTACT PERSON: </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: </td>
- <td colspan = "3" style="font-size: 9pt;">{!specialDeliveryContact.Email}</td>
+ <td style="font-size: 8pt;">E-Mail: </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;">鐢ㄦ埛灞炴��: </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_B_Attri__c}</td>
+ <td style="font-size: 8pt;">鐢ㄦ埛灞炴��: </td>
+ <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_B_Attri__c}</td>
</tr>
<tr>
- <td style="font-size: 9pt;">鐢ㄦ埛浜у搧: </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.account.Sub_Use__c}</td>
+ <td style="font-size: 8pt;">鐢ㄦ埛浜у搧: </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;">甯傚満: </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.account.Sub_Use__c}</td>
+ <td style="font-size: 8pt;">甯傚満: </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;">鍗栨柟: </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_SELLER__c}</td>
+ <td style="font-size: 8pt;">鍗栨柟: </td>
+ <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_SELLER__c}</td>
</tr>
<tr>
- <td style="font-size: 9pt;">THE SELLER: </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_THE_SELLER__c}</td>
+ <td style="font-size: 8pt;">THE SELLER: </td>
+ <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_THE_SELLER__c}</td>
</tr>
<tr>
- <td style="font-size: 9pt;">鍦板潃: </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_S_Adds__c}</td>
+ <td style="font-size: 8pt;">鍦板潃: </td>
+ <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_S_Adds__c}</td>
</tr>
<tr>
<td style="font-size: 8pt;">ADD: </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;">鍗栨柟: </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_SELLER__c}</td>
+ <td style="font-size: 8pt;">鍗栨柟: </td>
+ <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_SELLER__c}</td>
</tr>
<tr>
- <td style="font-size: 9pt;">鍦板潃: </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_S_Adds__c}</td>
+ <td style="font-size: 8pt;">鍦板潃: </td>
+ <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_S_Adds__c}</td>
</tr>
<tr>
- <td style="font-size: 9pt;">鐢佃瘽 (TEL): </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_S_TEL__c}</td>
+ <td style="font-size: 8pt;">鐢佃瘽 (TEL): </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;">鍗栨柟: </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_SELLER__c}</td>
+ <td style="font-size: 8pt;">鍗栨柟: </td>
+ <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_SELLER__c}</td>
</tr>
<tr>
- <td style="font-size: 9pt;">THE SELLER: </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_THE_SELLER__c}</td>
+ <td style="font-size: 8pt;">THE SELLER: </td>
+ <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_THE_SELLER__c}</td>
</tr>
<tr>
- <td style="font-size: 9pt;">鍦板潃: </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_S_Adds__c}</td>
+ <td style="font-size: 8pt;">鍦板潃: </td>
+ <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_S_Adds__c}</td>
</tr>
<tr>
<td style="font-size: 8pt;">ADD: </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: </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_S_Bank_Name__c}</td>
+ <td style="font-size: 8pt;">Bank Name: </td>
+ <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_S_Bank_Name__c}</td>
</tr>
<tr>
- <td style="font-size: 9pt;">Branch: </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_S_Branch__c}</td>
+ <td style="font-size: 8pt;">Branch: </td>
+ <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_S_Branch__c}</td>
</tr>
<tr>
<td style="font-size: 8pt;">Address: </td>
<td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_S_Bank_Address__c}</td>
</tr>
<!-- <tr>
- <td style="font-size: 9pt;">Address: </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_S_Address__c}</td>
+ <td style="font-size: 8pt;">Address: </td>
+ <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_S_Address__c}</td>
</tr> -->
<tr>
- <td style="font-size: 9pt;">Account no: </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_S_Account_No__c}</td>
+ <td style="font-size: 8pt;">Account no: </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: </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_S_Swift_Code__c}</td>
+ <td style="font-size: 8pt;">Swift code: </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: </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_S_Account_Name__c}</td>
+ <td style="font-size: 8pt;">Account name: </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"> </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;"> </td>
+ </tr> -->
<tr>
- <td style="font-size: 9pt;"> </td>
+ <td style="font-size: 8pt;">鏀惰揣浜�: </td>
+ <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_C_Consignee__c}</td>
</tr>
<tr>
- <td style="font-size: 9pt;">鏀惰揣浜�: </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_C_Consignee__c}</td>
+ <td style="font-size: 8pt;">THE CONSIGNEE: </td>
+ <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_C_THECONSIGNE__c}</td>
</tr>
<tr>
- <td style="font-size: 9pt;">THE CONSIGNEE: </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_C_THECONSIGNE__c}</td>
- </tr>
- <tr>
- <td style="font-size: 9pt;">鍦板潃: </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_C_Address__c}</td>
+ <td style="font-size: 8pt;">鍦板潃: </td>
+ <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_C_Address__c}</td>
</tr>
<tr>
<td style="font-size: 8pt;">ADD: </td>
<td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_C_Add__c}</td>
</tr>
<tr>
- <td style="font-size: 9pt;">鐢佃瘽锛圱el锛�: </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_C_TEL__c}</td>
+ <td style="font-size: 8pt;">鐢佃瘽锛圱el锛�: </td>
+ <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_C_TEL__c}</td>
</tr>
<tr>
- <td style="font-size: 9pt;">浼犵湡锛團ax锛�: </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_C_FAX__c}</td>
+ <td style="font-size: 8pt;">浼犵湡锛團ax锛�: </td>
+ <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_C_FAX__c}</td>
</tr>
<tr>
- <td style="font-size: 9pt;">鑱旂郴浜�: </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_C_CONTACT__c}</td>
+ <td style="font-size: 8pt;">鑱旂郴浜�: </td>
+ <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_C_CONTACT__c}</td>
</tr>
<tr>
- <td style="font-size: 9pt;">CONTACT PERSON: </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_C_contactperson__c}</td>
+ <td style="font-size: 8pt;">CONTACT PERSON: </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: </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_C_THECONSIGNE__c}</td>
+ <td style="font-size: 8pt;">THE CONSIGNEE: </td>
+ <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_C_THECONSIGNE__c}</td>
</tr>
<tr>
<td style="font-size: 8pt;">ADD: </td>
<td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_C_Add__c}</td>
</tr>
<tr>
- <td style="font-size: 9pt;">鐢佃瘽锛圱el锛�: </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.pdf_c_tel}</td>
+ <td style="font-size: 8pt;">鐢佃瘽锛圱el锛�: </td>
+ <td colspan = "3" style="font-size: 8pt;">{!contra.pdf_c_tel}</td>
</tr>
<tr>
- <td style="font-size: 9pt;">浼犵湡锛團ax锛�: </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.pdf_c_fax}</td>
+ <td style="font-size: 8pt;">浼犵湡锛團ax锛�: </td>
+ <td colspan = "3" style="font-size: 8pt;">{!contra.pdf_c_fax}</td>
</tr>
<tr>
- <td style="font-size: 9pt;">CONTACT PERSON: </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_C_contactperson__c}</td>
+ <td style="font-size: 8pt;">CONTACT PERSON: </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;">鏀惰揣浜�: </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.pdf_c_consignee}</td>
+ <td style="font-size: 8pt;">鏀惰揣浜�: </td>
+ <td colspan = "3" style="font-size: 8pt;">{!contra.pdf_c_consignee}</td>
</tr>
<tr>
- <td style="font-size: 9pt;">鍦板潃: </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.pdf_c_address}</td>
+ <td style="font-size: 8pt;">鍦板潃: </td>
+ <td colspan = "3" style="font-size: 8pt;">{!contra.pdf_c_address}</td>
</tr>
<tr>
- <td style="font-size: 9pt;">鐢佃瘽锛圱el锛�: </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.pdf_c_tel}</td>
+ <td style="font-size: 8pt;">鐢佃瘽锛圱el锛�: </td>
+ <td colspan = "3" style="font-size: 8pt;">{!contra.pdf_c_tel}</td>
</tr>
<tr>
- <td style="font-size: 9pt;">鑱旂郴浜�: </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.pdf_c_contact}</td>
+ <td style="font-size: 8pt;">鑱旂郴浜�: </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;">閫氱煡浜�: </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_N_NotifyParty__c}</td>
+ <td style="font-size: 8pt;">閫氱煡浜�: </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: </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_NOTIFY_PARTY__c}</td>
+ <td style="font-size: 8pt;">THE NOTIFY PARTY: </td>
+ <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_NOTIFY_PARTY__c}</td>
</tr>
<tr>
- <td style="font-size: 9pt;">鍦板潃: </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_N_Address__c}</td>
+ <td style="font-size: 8pt;">鍦板潃: </td>
+ <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_N_Address__c}</td>
</tr>
<tr>
<td style="font-size: 8pt;">ADD: </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;">鑱旂郴浜�: </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_N_CONTACT__c}</td>
+ <td style="font-size: 8pt;">鑱旂郴浜�: </td>
+ <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_N_CONTACT__c}</td>
</tr>
<tr>
- <td style="font-size: 9pt;">CONTACT PERSON: </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_N_CONTACTPERSON__c}</td>
+ <td style="font-size: 8pt;">CONTACT PERSON: </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: </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_NOTIFY_PARTY__c}</td>
+ <td style="font-size: 8pt;">THE NOTIFY PARTY: </td>
+ <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_NOTIFY_PARTY__c}</td>
</tr>
<tr>
<td style="font-size: 8pt;">ADD: </td>
<td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_N_Add__c}</td>
</tr>
<tr>
- <td style="font-size: 9pt;">鐢佃瘽锛圱el锛�: </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_N_TEL__c}</td>
+ <td style="font-size: 8pt;">鐢佃瘽锛圱el锛�: </td>
+ <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_N_TEL__c}</td>
</tr>
<tr>
- <td style="font-size: 9pt;">浼犵湡锛團ax锛�: </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_N_FAX__c}</td>
+ <td style="font-size: 8pt;">浼犵湡锛團ax锛�: </td>
+ <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_N_FAX__c}</td>
</tr>
<tr>
- <td style="font-size: 9pt;">CONTACT PERSON: </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_N_CONTACTPERSON__c}</td>
+ <td style="font-size: 8pt;">CONTACT PERSON: </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;">杞繍鍟� (鑻辨枃): </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_Forwarder__c}</td>
+ <td style="font-size: 8pt;">杞繍鍟� (鑻辨枃): </td>
+ <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_Forwarder__c}</td>
</tr>
<tr>
<td style="font-size: 8pt;">ADD: </td>
<td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_F_Add__c}</td>
</tr>
<tr>
- <td style="font-size: 9pt;">鐢佃瘽锛圱el锛�: </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_F_TEL__c}</td>
+ <td style="font-size: 8pt;">鐢佃瘽锛圱el锛�: </td>
+ <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_F_TEL__c}</td>
</tr>
<tr>
- <td style="font-size: 9pt;">浼犵湡锛團ax锛�: </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_F_FAX__c}</td>
+ <td style="font-size: 8pt;">浼犵湡锛團ax锛�: </td>
+ <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_F_FAX__c}</td>
</tr>
<tr>
- <td style="font-size: 9pt;">鑱旂郴浜� (涓枃): </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_F_ContactPerson__c}</td>
+ <td style="font-size: 8pt;">鑱旂郴浜� (涓枃): </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;">涓棿鍟嗗叕鍙�: </td>
- <td colspan = "3" style="font-size: 9pt;">{!Opp.SubDealer__c}</td>
+ <td style="font-size: 8pt;">涓棿鍟嗗叕鍙�: </td>
+ <td colspan = "3" style="font-size: 8pt;">{!Opp.SubDealer__c}</td>
</tr>
<tr>
- <td style="font-size: 9pt;">鍏徃鍚嶇О: </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_F_Add__c}</td>
+ <td style="font-size: 8pt;">鍏徃鍚嶇О: </td>
+ <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_F_Add__c}</td>
</tr>
<tr>
- <td style="font-size: 9pt;">鍦板潃: </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_F_TEL__c}</td>
+ <td style="font-size: 8pt;">鍦板潃: </td>
+ <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_F_TEL__c}</td>
</tr>
<tr>
- <td style="font-size: 9pt;">鐢佃瘽: </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_F_FAX__c}</td>
+ <td style="font-size: 8pt;">鐢佃瘽: </td>
+ <td colspan = "3" style="font-size: 8pt;">{!contra.order.PDF_F_FAX__c}</td>
</tr>
<tr>
- <td style="font-size: 9pt;">绯荤粺缂栧彿: </td>
- <td colspan = "3" style="font-size: 9pt;">{!contra.order.Id}</td>
+ <td style="font-size: 8pt;">绯荤粺缂栧彿: </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/>
- by the Buyer.<br/>
+ <!-- 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: Wei Liu
+ Name: Yoshito Sato
</td>
<!-- </apex:outputPanel> -->
<td>
--
Gitblit v1.9.1