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/EquipmentSetShippmentReceived3.page |   28 +++++++++++++++++++++-------
 1 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/force-app/main/default/pages/EquipmentSetShippmentReceived3.page b/force-app/main/default/pages/EquipmentSetShippmentReceived3.page
index 6ea6d89..dff61f0 100644
--- a/force-app/main/default/pages/EquipmentSetShippmentReceived3.page
+++ b/force-app/main/default/pages/EquipmentSetShippmentReceived3.page
@@ -111,7 +111,8 @@
                 /*width: 308px;*//*20230619 ljh*/
                 text-align: left;
                 margin: 0;
-                background:#95aee5;
+                /* background:#95aee5; */
+                background:#dcdcdc;
                 /*height: 42px;*/
                 padding-left: 0.75rem;/*20230721 ljh  */
             }
@@ -170,7 +171,8 @@
             }*/
             /*20230620 ljh*/
             div.rtop, div.rbottom {display:block; background: transparent; font-size:1px;}
-            div.rtop div {background:#95aee5;}
+            div.rtop div {background:#DCDCDC;}
+            /* div.rtop div {background:#95aee5;} */
             div.rtopg div {background:#DCDCDC;}
             div.r1, div.r2, div.r3, div.r4 {display:block; overflow:hidden;}
             div.r1, div.r2, div.r3 {height:1px;}
@@ -407,6 +409,9 @@
                             </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 -->
@@ -424,10 +429,12 @@
                                 <li><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>
-                                <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 -->
                             </ul>
                             </div>
                             <div class="rbottom">
@@ -483,7 +490,12 @@
                             </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-01 zyh 鏈鸿韩缂栫爜鎹綅缃� -->
+                                <span>(<apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;width:75px;"/>)</span>
+                                <!-- 2023-08-01 zyh 鏈鸿韩缂栫爜鎹綅缃� -->
+                                
+                            </div>
                             </h2>
                             </apex:outputPanel>
                             <!-- TODO 鍥炲簱銇疭et鍗樹綅銇с�佹槑绱颁竴銇や竴銇ゃ伄quickCheck瑕併倝銇亜銇屻�丼et銇畄uickCheck瑕併倠锛� -->
@@ -502,10 +514,12 @@
                                 <li><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>
-                                <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 -->
                             </ul>
                             </div>
                             <div class="rbottom">

--
Gitblit v1.9.1