From 7597e22d6dc731bc56ee0f411a50343ddebfc8bd Mon Sep 17 00:00:00 2001
From: GWY <guweiyi@prec-tech.com>
Date: 星期三, 18 五月 2022 10:12:55 +0800
Subject: [PATCH] 外贸pdf签名修改，无影响。

---
 force-app/main/default/pages/OrderPDF.page |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/force-app/main/default/pages/OrderPDF.page b/force-app/main/default/pages/OrderPDF.page
index a6003be..2d5db3f 100644
--- a/force-app/main/default/pages/OrderPDF.page
+++ b/force-app/main/default/pages/OrderPDF.page
@@ -141,7 +141,7 @@
                     </apex:outputPanel>
                     <tr>
                         <td style="font-size: 8pt;">鑱旂郴浜�:&nbsp;</td>
-                        <td colspan="3" style="font-size: 8pt;">{!specialDeliveryContact.Name}</td>
+                        <td colspan="3" style="font-size: 8pt;" id="LastName">{!specialDeliveryContact.Name}</td>
                     </tr>
                     <tr>
                         <td style="font-size: 8pt;">CONTACT PERSON:&nbsp;</td>
@@ -280,15 +280,15 @@
                     </tr> -->
                         <tr>
                             <td style="font-size: 8pt;">鏀惰揣浜�:&nbsp;</td>
-                            <td colspan="3" style="font-size: 8pt;">{!contra.order.PDF_C_Consignee__c}</td>
+                            <td colspan="3" style="font-size: 8pt;" id="PDF_C_Consignee__c">{!contra.order.PDF_C_Consignee__c}</td>
                         </tr>
                         <tr>
                             <td style="font-size: 8pt;">THE CONSIGNEE:&nbsp;</td>
-                            <td colspan="3" style="font-size: 8pt;">{!contra.order.PDF_C_THECONSIGNE__c}</td>
+                            <td colspan="3" style="font-size: 8pt;" id="PDF_C_THECONSIGNE__c">{!contra.order.PDF_C_THECONSIGNE__c}</td>
                         </tr>
                         <tr>
                             <td style="font-size: 8pt;">鍦板潃:&nbsp;</td>
-                            <td colspan="3" style="font-size: 8pt;">{!contra.order.PDF_C_Address__c}</td>
+                            <td colspan="3" style="font-size: 8pt;" id="PDF_C_Address__c">{!contra.order.PDF_C_Address__c}</td>
                         </tr>
                         <tr>
                             <td style="font-size: 8pt;">ADD:&nbsp;</td>
@@ -296,7 +296,7 @@
                         </tr>
                         <tr>
                             <td style="font-size: 8pt;">鐢佃瘽锛圱el锛�:&nbsp;</td>
-                            <td colspan="3" style="font-size: 8pt;">{!contra.order.PDF_C_TEL__c}</td>
+                            <td colspan="3" style="font-size: 8pt;" id="PDF_C_TEL__c">{!contra.order.PDF_C_TEL__c}</td>
                         </tr>
                         <tr>
                             <td style="font-size: 8pt;">浼犵湡锛團ax锛�:&nbsp;</td>
@@ -304,7 +304,7 @@
                         </tr>
                         <tr>
                             <td style="font-size: 8pt;">鑱旂郴浜�:&nbsp;</td>
-                            <td colspan="3" style="font-size: 8pt;">{!contra.order.PDF_C_CONTACT__c}</td>
+                            <td colspan="3" style="font-size: 8pt;" id="PDF_C_CONTACT__c">{!contra.order.PDF_C_CONTACT__c}</td>
                         </tr>
                         <tr>
                             <td style="font-size: 8pt;">CONTACT PERSON:&nbsp;</td>
@@ -769,13 +769,11 @@
                     </tr>
         
                     <tr>
-                        <td colspan="3">
-                            11. 浠樻鏂瑰紡: {!contra.order.PDF_PaymentTerms__c}锛�
-                            <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/>
+                        <td colspan = "4">
+                            11. 浠樻鏂瑰紡: {!contra.order.PDF_PaymentTerms__c}锛�<br/>
+                            鎵�鏈夐摱琛屾墜缁垂锛屽寘鎷鏂归摱琛屽拰涓浆琛屾墜缁垂鍙婂叾瀹冭垂鐢紝鍧囩敱涔版柟鎵挎媴銆�<br/>
+                            11.  TERMS OF PAYMENT: {!contra.order.PDF_PaymentTerms_E__c}锛�<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>
@@ -1239,11 +1237,12 @@
                             </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;YING HOU
                         </td>
                         <!-- </apex:outputPanel> -->
                         <td>
-                            Name: &nbsp;&nbsp;{!contra.order.PDF_Sign_Name__c}
+                            Name: &nbsp;&nbsp;
+                            <span id="PDF_Sign_Name__c">{!contra.order.PDF_Sign_Name__c}</span>
                         </td>
                     </tr>
                     <tr>
@@ -1548,7 +1547,8 @@
                     let pi = staticResource.PIDetails[index];
                     let e = document.getElementById(pi.SF_Field_API_Name__c);
                     if (e && data && data.object && data.object[pi.AWS_Field_API__c]) {
-                        e.innerHTML = data[pi.AWS_Field_API__c]
+                        console.log(pi.SF_Field_API_Name__c)
+                        e.innerHTML = data.object[pi.AWS_Field_API__c]
                     }
                 }
             }

--
Gitblit v1.9.1