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 | 293 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 166 insertions(+), 127 deletions(-)
diff --git a/force-app/main/default/pages/OrderPDF.page b/force-app/main/default/pages/OrderPDF.page
index 6956537..6de56c6 100644
--- a/force-app/main/default/pages/OrderPDF.page
+++ b/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;">涔版柟: </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,109 +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 colspan = "3" style="font-size: 9pt;">{!contra.order.PDF_C_Consignee__c}</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;">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: 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>
@@ -330,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>
@@ -354,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>
@@ -389,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>
@@ -632,9 +635,10 @@
</td>
</tr>
<tr>
- <td colspan = "3">
+ <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/> -->
</td>
</tr>
<tr>
@@ -647,8 +651,8 @@
<tr>
<td colspan = "3">
- 8. 瑁呰繍鍙ｅ哺锛� 棣欐腐<br/>
- 8. PORT OF LOADING: Hong Kong <br/>
+ 8. 瑁呰繍鍙ｅ哺锛� {!contra.order.PDF_Sp_LOADING__c}<br/>
+ 8. PORT OF LOADING: {!contra.order.PDF_Sp_LOADING_E__c}<br/>
</td>
</tr>
<tr>
@@ -669,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>
@@ -685,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>
@@ -695,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">
@@ -708,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">
@@ -731,11 +735,45 @@
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.order.PDF_QA__c} 浣嗕笉瓒呰繃鍙戣揣鏃ュ悗鐨� {!contra.order.PDF_QA2__c} <br/>
+ 淇濊瘉鏈熶负鏈�缁堥獙鏀舵姤鍛婄缃蹭箣鏃ヨ捣鐨剓!contra.QAeng}浣嗕笉瓒呰繃鍙戣揣鏃ュ悗鐨剓!contra.QAeng4}銆�<br/>
+ 鍦ㄤ繚璇佹湡鍐咃紝濡備拱鏂规寜鐓ц揣鐗╀娇鐢ㄨ鏄庝功鍦ㄦ甯告潯浠朵笅浣跨敤锛岀敱浜庡崠鏂硅璁℃垨鍒堕�犱笂鐨勭己闄疯�屽彂鐢熺殑鎹熷潖锛岀敱鍗栨柟璐熻矗銆�<br/>
+ 鍦ㄤ繚璇佹湡鍐呭鏋滆揣鐗╃殑閲嶈闆堕儴浠堕渶瑕佹洿鎹紝鍒欒闆堕儴浠剁殑淇濊瘉鏈熶粠鏇存崲涔嬫棩璧烽噸鏂拌绠楋紝澶栬喘浠朵互鍘熶緵搴斿晢鐨勪繚璇佹湡涓哄噯銆�<br/>
+ B. 濡傛灉鍙屾柟鍏卞悓鍟嗗畾骞剁‘璁ょ殑渚涜揣鑼冨洿涓湁閬楁紡鐨勯儴浠跺拰璁惧骞舵湁鍙兘瀵艰嚧鏁村璐х墿涓嶈兘鎸夋椂楠屾敹鎶曚骇鎴栧奖鍝嶇敓浜э紝鍗栨柟<br/>
+ 鏈変箟鍔″拰璐ｄ换鍦ㄥ埗閫犺繃绋嬩腑涓庝拱鏂瑰晢閲忓仛鍑虹浉搴旂殑璋冩暣鍜岃ˉ鏁戯紝骞朵繚璇佹暣濂椾互涓婅揣鐗╄兘閫氳繃楠屾敹銆�<br/>
+ C. 鏈悎鍚屼腑鎵�杩扮殑淇濊瘉鏄�傜敤浜庢牴鎹悎鍚岃揣鐗╂彁渚涚殑鐨勫敮涓�淇濊瘉銆傛湰淇濊瘉鏉℃鍙栦唬骞舵帓闄ゆ硶寰嬨�佹儻渚嬨�佹硶浠ゆ垨鍏朵粬瑙勫畾鏂藉姞<br/>
+ 鎴栭粯绀虹殑浠讳綍鍏朵粬鎷呬繚銆佷繚璇佸拰/鎴栨潯浠跺拰/鎴栧洜姝よ�屼骇鐢熺殑璐ｄ换銆傚浜庝换浣曟湁缂洪櫡鐨勬垨涓嶇鍚堟爣鍑嗙殑璐х墿锛屼拱鏂规墍閫傜敤鐨勫彧鏈�<br/>
+ 鏈潯鐗瑰埆瑙勫畾鐨勬晳娴庛��<br/>
+ 14. WARRANTY锛�<br/>
+ A锛嶵he 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鈥檚 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锛嶪n case there鈥檚 any missing parts & 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/>
+ A. 鍗栨柟淇濊瘉鏈悎鍚屼箣璐х墿鏄敤鏈�濂界殑鏉愭枡浠ヤ笂绛夌殑宸ヨ壓鍒堕�狅紝宕柊鍙婃湭鐢ㄨ繃鐨勶紝鍏惰川閲忎笌瑙勬牸涓�鍒囨柟闈笌鏈悎鍚岀殑瑙勫畾鐩哥銆�<br/>
+ 淇濊瘉鏈熼厤浠朵负3涓湀锛屼富鏈轰负1骞磋嚦3骞达紝鏍规嵁浜у搧鍏蜂綋鍨嬪彿纭畾銆�<br/>
鍦ㄤ繚璇佹湡鍐咃紝濡備拱鏂规寜鐓ц揣鐗╀娇鐢ㄨ鏄庝功鍦ㄦ甯告潯浠朵笅浣跨敤锛岀敱浜庡崠鏂硅璁℃垨鍒堕�犱笂鐨勭己闄疯�屽彂鐢熺殑鎹熷潖锛岀敱鍗栨柟璐熻矗銆�<br/>
鍦ㄤ繚璇佹湡鍐呭鏋滆揣鐗╃殑閲嶈闆堕儴浠堕渶瑕佹洿鎹紝鍒欒闆堕儴浠剁殑淇濊瘉鏈熶粠鏇存崲涔嬫棩璧烽噸鏂拌绠楋紝澶栬喘浠朵互鍘熶緵搴斿晢鐨勪繚璇佹湡涓哄噯銆�<br/>
B. 濡傛灉鍙屾柟鍏卞悓鍟嗗畾骞剁‘璁ょ殑渚涜揣鑼冨洿涓湁閬楁紡鐨勯儴浠跺拰璁惧骞舵湁鍙兘瀵艰嚧鏁村璐х墿涓嶈兘鎸夋椂楠屾敹鎶曚骇鎴栧奖鍝嶇敓浜э紝鍗栨柟<br/>
@@ -746,7 +784,7 @@
14. WARRANTY锛�<br/>
A锛嶵he Seller warrant that the goods hereof is made of the best materials with first class workmanship, brand new and unused and<br/>
complies in all respects with the quality and specification stipulated in this Contract. <br/>
- The warranty period shall be {!contra.QAeng} <br/>
+ The warranty period shall be three months for accessory, 1-3 years for instrument.<br/>
counting from the date on which the goods have been accepted by the end user but limited to a maximum of<br/>
{!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/>
@@ -763,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;"/>
@@ -993,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