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/TransferShippmentReceived3.page |   24 ++++++++++++++++++------
 1 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/force-app/main/default/pages/TransferShippmentReceived3.page b/force-app/main/default/pages/TransferShippmentReceived3.page
index f837b5e..33a4d82 100644
--- a/force-app/main/default/pages/TransferShippmentReceived3.page
+++ b/force-app/main/default/pages/TransferShippmentReceived3.page
@@ -109,7 +109,8 @@
         /* width: 308px; *//* 20230718 ljh  */
         text-align: left;
         margin: 0;
-        background:#95aee5;
+        background:#DCDCDC;
+        /* background:#95aee5; */
         border-radius:8px 8px 0 0;
         padding-left: 0.75rem;/*20230628 ljh*/
     }
@@ -387,6 +388,9 @@
                     </apex:outputPanel>
                     <div class="menu">
                     <h2><div class="m_title">&nbsp;<apex:outputField value="{!esdInfo.rec.Fixture_Name_F__c}" />&nbsp;&nbsp;
+                        <!-- 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>
                     <!-- TODO 鍥炲簱銇疭et鍗樹綅銇с�佹槑绱颁竴銇や竴銇ゃ伄quickCheck瑕併倝銇亜銇屻�丼et銇畄uickCheck瑕併倠锛� -->
                     <!-- 20230718 ljh -->
@@ -404,10 +408,12 @@
                         <li><span>涓婃鍥炴敹鍚庢娴嬫椂闂达細 </span>
                             <span><apex:outputField rendered="{!IF(esdInfo.rec.Asset__r.Pre_Reserve_TAES_Detail__c==null, false, true)}" value="{!esdInfo.rec.Asset__r.Pre_Reserve_TAES_Detail__r.After_Inspection_time__c}" style="margin:3px;width:75px;"/></span>
                         </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>
@@ -447,7 +453,11 @@
                     </h2>
                     </apex:outputPanel>
                     <apex:outputPanel layout="none" rendered="{!NOT(esdInfo.hasSended)}">
-                    <h2><div class="m_title">&nbsp;<apex:outputField value="{!esdInfo.rec.Fixture_Name_F__c}" />&nbsp;&nbsp;</div>
+                    <h2><div class="m_title">&nbsp;<apex:outputField value="{!esdInfo.rec.Fixture_Name_F__c}" />&nbsp;&nbsp;
+                        <!-- 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>
                     </apex:outputPanel>
                     <!-- TODO 鍥炲簱銇疭et鍗樹綅銇с�佹槑绱颁竴銇や竴銇ゃ伄quickCheck瑕併倝銇亜銇屻�丼et銇畄uickCheck瑕併倠锛� -->
@@ -466,10 +476,12 @@
                         <li><span>涓婃鍥炴敹鍚庢娴嬫椂闂达細 </span>
                             <span><apex:outputField rendered="{!IF(esdInfo.rec.Asset__r.Pre_Reserve_TAES_Detail__c==null, false, true)}" value="{!esdInfo.rec.Asset__r.Pre_Reserve_TAES_Detail__r.After_Inspection_time__c}" style="margin:3px;width:75px;"/></span>
                         </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