From 4cf305347ea6f6a73e03fa9427a3de80ca35ae7a Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期一, 25 四月 2022 14:37:30 +0800
Subject: [PATCH] SSBGEnhancement0425

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

diff --git a/force-app/main/default/pages/OrderPdf2.page b/force-app/main/default/pages/OrderPdf2.page
index e23f868..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>
@@ -58,14 +68,14 @@
                 <td style="text-align: right;">鍦板潃锛�</td>
                 <td style="text-align: left;">{!header.buyer_address}</td>
                 <td style="text-align: right;">鍦板潃锛�</td>
-                <td style="text-align: left;">涓婃捣甯傚緪姹囧尯娣捣涓矾1010鍙�1001-1006銆�</td>
+                <td style="text-align: left;">涓浗锛堜笂娴凤級鑷敱璐告槗璇曢獙鍖烘棩妯卞寳璺�199-9鍙�102鍙�302閮ㄤ綅</td>
             </tr>
-            <tr>
+            <!-- <tr>
                 <td style="text-align: right;">&nbsp;</td>
                 <td style="text-align: left;">&nbsp;</td>
                 <td style="text-align: right;">&nbsp;</td>
-                <td style="text-align: left;">1101銆�1102銆�1104-1106銆�1601瀹�</td>
-            </tr>
+                <td style="text-align: left;">&nbsp;</td>
+            </tr> -->
         </apex:outputPanel>
         <tr>
             <td style="text-align: right;">鍩庡競锛�</td>

--
Gitblit v1.9.1