From 8608db1542a909c147574767fd22dc1fedf2ddc9 Mon Sep 17 00:00:00 2001
From: 张宇恒 <bxyun0@163.com>
Date: 星期二, 08 八月 2023 18:09:15 +0800
Subject: [PATCH] 换颜色,机身编码换地方

---
 force-app/main/default/pages/TransferShippmentReceived6.page |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/force-app/main/default/pages/TransferShippmentReceived6.page b/force-app/main/default/pages/TransferShippmentReceived6.page
index 1c304a6..cdafdfc 100644
--- a/force-app/main/default/pages/TransferShippmentReceived6.page
+++ b/force-app/main/default/pages/TransferShippmentReceived6.page
@@ -335,6 +335,10 @@
                     </apex:outputPanel>
                     <div class="menu">
                     <h2><div class="m_title">&nbsp;<apex:outputField value="{!esdInfo.rec.AssetName__c}" />&nbsp;&nbsp;<apex:outputPanel layout="none" rendered="{!esdInfo.rec.OneToOneAccessory__c}">(涓�瀵逛竴闄勫睘鍝�)</apex:outputPanel>
+                        <!-- 2023-08-02 zyh 鏈鸿韩缂栧彿鎹㈠湴鏂� -->
+                        <span>(<apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;width:75px;"/>)</span>
+                        <!-- 2023-08-02 zyh 鏈鸿韩缂栧彿鎹㈠湴鏂� -->
+
                     </div></h2>
                     <!-- 20230722 ljh -->
                     <ul style="padding: 1px 0.75rem;" >
@@ -380,10 +384,12 @@
                                 <span><apex:outputField value="{!esdInfo.rec.Asset__r.WH_location__c}" style="margin:3px;width:75px;"/></span>
                             </apex:outputPanel>
                         </li>
-                        <li>
+                        <!-- 2023-08-02 zyh 鏈鸿韩缂栧彿鎹㈠湴鏂� -->
+                        <!-- <li>
                             <span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.SerialNumber_F__c.label}锛� </span>
                             <span><apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;width:75px;"/></span>
-                        </li>
+                        </li> -->
+                        <!-- 2023-08-02 zyh 鏈鸿韩缂栧彿鎹㈠湴鏂� -->
                     </ul>
                     </div>
                 </apex:outputPanel>

--
Gitblit v1.9.1