From e15f4679a2b71a186aa9e87cd49b4ab9c249cc63 Mon Sep 17 00:00:00 2001
From: 张宇恒 <bxyun0@163.com>
Date: 星期二, 08 八月 2023 18:20:47 +0800
Subject: [PATCH] 新品收货样式、颜色、显示margin

---
 force-app/main/default/pages/EquipmentSetShippmentReceived2.page |   26 ++++++++++++++++++--------
 1 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/force-app/main/default/pages/EquipmentSetShippmentReceived2.page b/force-app/main/default/pages/EquipmentSetShippmentReceived2.page
index 0829f1a..0a77392 100644
--- a/force-app/main/default/pages/EquipmentSetShippmentReceived2.page
+++ b/force-app/main/default/pages/EquipmentSetShippmentReceived2.page
@@ -336,13 +336,17 @@
                 </div> -->
                 <div class="menu">
                 <h2><div class="m_title">&nbsp;<apex:outputField value="{!esdInfo.rec.Fixture_Name_F__c}" />&nbsp;&nbsp;
+                    <!-- 2023-08-01 zyh 鏈鸿韩缂栫爜鎹綅缃� start -->
+                    <span>(<apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;width:75px;"/>)</span>
+                    <!-- 2023-08-01 zyh 鏈鸿韩缂栫爜鎹綅缃� end -->
                 </div></h2>
                 <!-- TODO 鍥炲簱銇疭et鍗樹綅銇с�佹槑绱颁竴銇や竴銇ゃ伄quickCheck瑕併倝銇亜銇屻�丼et銇畄uickCheck瑕併倠锛� -->
                 <!-- 20230721 ljh -->
-                <ul style="padding: 1px 0.75rem;{!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}">
+                <ul style="padding: 1px 0.75rem;{!IF(esdInfo.quickCheck, 'background:#A3DE59;', '')}">
                     <apex:outputPanel layout="none" rendered="{!IF(Step_status='鍙戣揣鍓�', true, false)}">
                         <!-- <div style="position: relative; padding-left: 50px; background:{!IF(esdInfo.quickCheck, '#BBFF66', '')}"> -->
-                        <li data-qr="{!esdInfo.rec.Fixture_QRCode_F__c}" style="{!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}">
+                        <!-- <li data-qr="{!esdInfo.rec.Fixture_QRCode_F__c}" style="{!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}"> -->
+                        <li data-qr="{!esdInfo.rec.Fixture_QRCode_F__c}" style="{!IF(esdInfo.quickCheck, 'background:#A3DE59;', '')}">
                             <!-- 20210721 ljh 1719 start -->
                             <!-- <span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Inspection_result__c.label}锛� </span> -->
                             <span>鍙戣揣鍓�-妫�娴嬬粨鏋滐細 </span> 
@@ -354,7 +358,8 @@
                             <span><apex:outputField id="inspectionResult2" value="{!esdInfo.rec.Inspection_result__c}" style="margin:3px;width:75px;" /></span>
                             </apex:outputPanel>
                         </li>
-                        <li style="{!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}">
+                        <!-- <li style="{!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}"> -->
+                        <li style="{!IF(esdInfo.quickCheck, 'background:#A3DE59;', '')}">
                             <span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Inspection_result_NG__c.label}锛� </span>
                             <apex:outputPanel layout="none" rendered="{!(esdInfo.editable)}">
                             <span><apex:inputField id="inspectionResultNg" value="{!esdInfo.rec.Inspection_result_NG__c}" style="margin:3px;width:75px;"/></span>
@@ -364,7 +369,8 @@
                             </apex:outputPanel>
                         </li>
 
-                        <li style="{!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}">
+                        <!-- <li style="{!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}"> -->
+                        <li style="{!IF(esdInfo.quickCheck, 'background:#A3DE59;', '')}">
                             <span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Pre_NG_abord_reason__c.label}锛�</span>
                             <apex:outputPanel layout="none" rendered="{!(esdInfo.editable)}">
                             <span>
@@ -387,7 +393,8 @@
                             </apex:outputPanel>
                         </li>
 
-                        <li style="{!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}">
+                        <!-- <li style="{!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}"> -->
+                        <li style="{!IF(esdInfo.quickCheck, 'background:#A3DE59;', '')}">
                             <span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Pre_Inspection_Comment__c.label}锛� </span>
                             <apex:outputPanel layout="none" rendered="{!(esdInfo.editable)}" >
                                 <span>
@@ -403,7 +410,8 @@
                             </apex:outputPanel>
                         </li>
 
-                        <li style="{!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}">
+                        <!-- <li style="{!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}"> -->
+                        <li style="{!IF(esdInfo.quickCheck, 'background:#A3DE59;', '')}">
                             <span>涓婃鍥炴敹鍚庢娴嬫椂闂达細 </span>
                             <span><apex:outputField rendered="{!IF(esdInfo.rec.Asset__r.Pre_Reserve_RAES_Detail__c==null, false, true)}" value="{!esdInfo.rec.Asset__r.Pre_Reserve_RAES_Detail__r.After_Inspection_time__c}" style="margin:3px;width:75px;"/></span>
                         </li>
@@ -411,10 +419,12 @@
                             <span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Pre_After_Inspection_elapsed_days__c.label}锛� </span>
                             <span><apex:outputField value="{!esdInfo.rec.Pre_After_Inspection_elapsed_days__c}" style="margin:3px;width:75px;"/></span>
                         </li>
-                        <li>
+                        <!-- 2023-08-01 zyh 鏈鸿韩缂栫爜鎹綅缃� start -->
+                        <!-- <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-01 zyh 鏈鸿韩缂栫爜鎹綅缃� end -->
                         <!-- </div> -->
                     </apex:outputPanel>
                 </ul>

--
Gitblit v1.9.1