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/EquipmentSetShippmentReceived1.page |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/force-app/main/default/pages/EquipmentSetShippmentReceived1.page b/force-app/main/default/pages/EquipmentSetShippmentReceived1.page
index 3d2db17..594653a 100644
--- a/force-app/main/default/pages/EquipmentSetShippmentReceived1.page
+++ b/force-app/main/default/pages/EquipmentSetShippmentReceived1.page
@@ -93,8 +93,8 @@
         text-align: left;
         margin: 0;
         /*20230623 ljh start*/
-        /*background:#DCDCDC;*/
-        background:#95aee5;
+        background:#DCDCDC;
+        /* background:#95aee5; */
         /*20230623 ljh end*/
         /*height: 42px;*/
         padding-left: 0.75rem;/*20230628 ljh*/
@@ -150,8 +150,8 @@
     div.rtop, div.rbottom {display:block; background: transparent; font-size:1px;}
     div.rtop div {
         /*20230623 ljh start*/
-        /*background:#DCDCDC;*/
-        background:#95aee5;
+        background:#DCDCDC;
+        /* background:#95aee5; */
         /*20230623 ljh end*/
     }
     div.r1, div.r2, div.r3, div.r4 {display:block; overflow:hidden;}
@@ -303,9 +303,12 @@
                 </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瑕併倠锛� -->
-                <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}">
@@ -337,10 +340,12 @@
                             <span><apex:outputField value="{!esdInfo.rec.Asset__r.WH_location__c}" style="margin:3px;width:75px;"/></span>
                         </li>
                         <!-- 20230721 ljh 鏈鸿韩缂栫爜鎹綅缃� -->
-                        <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 -->
                         <li>
                             <span>涓婃鍥炴敹鍚庢娴嬫椂闂达細 </span>
                             <span><apex:outputField value="{!esdInfo.rec.Asset__r.Pre_Reserve_RAES_Detail__r.After_Inspection_time__c}" style="margin:3px;width:75px;"/></span>

--
Gitblit v1.9.1