From b823c7f3569cf9368e2245846e918f78f32e903a Mon Sep 17 00:00:00 2001
From: GWY <guweiyiscp096@foxmail.com>
Date: 星期五, 15 四月 2022 11:38:47 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlympusSSBG

---
 force-app/main/default/pages/OrderPdf2.page |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/force-app/main/default/pages/OrderPdf2.page b/force-app/main/default/pages/OrderPdf2.page
index 9737a5a..6fff05d 100644
--- a/force-app/main/default/pages/OrderPdf2.page
+++ b/force-app/main/default/pages/OrderPdf2.page
@@ -45,7 +45,17 @@
             </apex:outputPanel>
         </tr>
 
-        <apex:outputPanel rendered="{!IF(productSegment == 'BS', true, false)}" layout="none">
+        <apex:outputPanel rendered="{!IF(productSegment == 'BS' && delivered == false, true, false)}" layout="none">
+            <tr>
+                <td style="text-align: right;" >浜岀被缁忚惀澶囨鍑瘉锛�</td>
+                <td style="text-align: left;">{!header.buyer_code}</td>
+                <td style="text-align: right;">&nbsp;</td>
+                <td style="text-align: left;">&nbsp;</td>
+                <!-- <td style="text-align: right;">浜岀被缁忚惀澶囨鍑瘉锛�</td>
+                <td style="text-align: left;">娌緪椋熻嵂鐩戞缁忚惀澶�20160318鍙�</td> -->
+            </tr>
+        </apex:outputPanel>
+        <apex:outputPanel rendered="{!IF(productSegment == 'BS' && delivered, true, false)}" layout="none">
             <tr>
                 <td style="text-align: right;" >浜岀被缁忚惀澶囨鍑瘉锛�</td>
                 <td style="text-align: left;">{!header.buyer_code}</td>

--
Gitblit v1.9.1