From 84e5b11bfd57b0a581a4f5d8dc65f577e8d331cf Mon Sep 17 00:00:00 2001
From: GWY <guweiyiscp096@foxmail.com>
Date: 星期三, 20 四月 2022 17:33:29 +0800
Subject: [PATCH] 修改，不能保存客户。无影响。
---
force-app/main/default/pages/OrderPDF.page | 41 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/force-app/main/default/pages/OrderPDF.page b/force-app/main/default/pages/OrderPDF.page
index 779dc72..0bc77c3 100644
--- a/force-app/main/default/pages/OrderPDF.page
+++ b/force-app/main/default/pages/OrderPDF.page
@@ -94,7 +94,7 @@
<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>
@@ -651,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>
@@ -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锛嶵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/>
@@ -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;"/>
--
Gitblit v1.9.1