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/OrderContract.page |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/force-app/main/default/pages/OrderContract.page b/force-app/main/default/pages/OrderContract.page
index 2d7904c..69b2598 100644
--- a/force-app/main/default/pages/OrderContract.page
+++ b/force-app/main/default/pages/OrderContract.page
@@ -489,6 +489,14 @@
                     <th style="text-align: right;">Port of Destination(鑻辨枃):</th>
                     <td><apex:inputField id="DestinationPortE" value="{!od.PDF_Sp_DestinationPort_E__c}"/></td>
                 </tr>
+                 <tr>
+                    <!-- <th style="text-align: right;">Shipment Term:</th>
+                    <td><apex:inputField id="Shipment" value="{!od.PDF_Sp_Shipment_Term__c}"/></td> -->
+                    <th style="text-align: right;">瑁呰繍鍙e哺:</th>
+                    <td><apex:inputField id="LOADING" value="{!od.PDF_Sp_LOADING__c}"/></td>
+                    <th style="text-align: right;">PORT OF LOADING(鑻辨枃):</th>
+                    <td><apex:inputField id="LOADING_E" value="{!od.PDF_Sp_LOADING_E__c}"/></td>
+                </tr>
                 <tr>
                     <th style="text-align: right;">瑁呰繍鏉′欢:</th>
                     <td><apex:inputField id="ShippingTerms" value="{!od.PDF_Sp_ShippingTerms__c}"/></td>
@@ -502,25 +510,25 @@
                     <td><apex:inputField id="SHIPPINGMARK" value="{!od.PDF_Sp_SHIPPINGMARK__c}" style="resize:none;width: 167px;"/></td>
                 </tr>
                 <tr>
-                    <apex:outputPanel rendered="{!IF(Opp.ProductSegment__c = 'BS' && Opp.TradeType__c = 'Tax Exemption', 'true', 'false')}" layout="none">
+                    <apex:outputPanel rendered="{!IF((Opp.ProductSegment__c = 'IE' || Opp.ProductSegment__c = 'RVI' || Opp.ProductSegment__c = 'BS') && Opp.TradeType__c = 'Tax Exemption', 'true', 'false')}" layout="none">
                     <th style="text-align: right;">璐ㄩ噺淇濊瘉:</th>
                     <td><apex:inputField id="qa" value="{!od.PDF_QA__c}"/></td>
                     </apex:outputPanel>
-                    <apex:outputPanel rendered="{!IF(Opp.ProductSegment__c = 'IE' || Opp.ProductSegment__c = 'RVI' || Opp.ProductSegment__c = 'NDT' || Opp.ProductSegment__c = 'ANI', 'true', 'false')}" layout="none">
+                    <apex:outputPanel rendered="{!IF(Opp.ProductSegment__c = 'NDT' || Opp.ProductSegment__c = 'ANI', 'true', 'false')}" layout="none">
                     <th style="text-align: right;">鐗逛环鎵瑰缂栧彿:</th>
                     <td><apex:inputField id="SpecNo" value="{!od.PDF_G_SpecNo__c}"/></td>
                     </apex:outputPanel>
                 </tr>
                 <tr>
-                    <apex:outputPanel rendered="{!IF(Opp.ProductSegment__c = 'BS' && Opp.TradeType__c = 'Tax Exemption', 'true', 'false')}" layout="none">
+                    <apex:outputPanel rendered="{!IF((Opp.ProductSegment__c = 'IE' || Opp.ProductSegment__c = 'RVI' || Opp.ProductSegment__c = 'BS') && Opp.TradeType__c = 'Tax Exemption', 'true', 'false')}" layout="none">
                     <th style="text-align: right;">涓嶈秴杩囧彂璐ф棩鍚庣殑:</th>
                     <td><apex:inputField id="qa2" value="{!od.PDF_QA2__c}"/></td>
                     </apex:outputPanel>
 
-                    <apex:outputPanel rendered="{!IF((Opp.ProductSegment__c = 'IE' || Opp.ProductSegment__c = 'RVI') && Opp.TradeType__c = 'Tax Exemption', 'true', 'false')}" layout="none">
+                    <!-- <apex:outputPanel rendered="{!IF(() && Opp.TradeType__c = 'Tax Exemption', 'true', 'false')}" layout="none">
                     <th style="text-align: right;">杩愪繚璐�:</th>
                     <td><apex:inputField id="TrAndPre1" value="{!od.PDF_G_TrAndPre__c}"/></td>
-                    </apex:outputPanel>
+                    </apex:outputPanel> -->
 
                     <apex:outputPanel rendered="{!IF((Opp.ProductSegment__c = 'NDT' || Opp.ProductSegment__c = 'ANI') && Opp.TradeType__c = 'Tax Exemption', 'true', 'false')}" layout="none">
                     <th style="text-align: right;">杩愪繚璐�:</th>

--
Gitblit v1.9.1