From ddb0231ef7c5cf2bad9d3f1afc2f733674ad38a5 Mon Sep 17 00:00:00 2001
From: unknown <sunxia@prec-tech.com>
Date: 星期四, 24 八月 2023 14:50:51 +0800
Subject: [PATCH] 再修理按钮

---
 force-app/main/default/pages/EquipmentSetShippmentReceived6.page |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/force-app/main/default/pages/EquipmentSetShippmentReceived6.page b/force-app/main/default/pages/EquipmentSetShippmentReceived6.page
index fc12d19..1c9dcd0 100644
--- a/force-app/main/default/pages/EquipmentSetShippmentReceived6.page
+++ b/force-app/main/default/pages/EquipmentSetShippmentReceived6.page
@@ -127,8 +127,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;/*20230721 ljh  */
@@ -183,8 +183,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;}
@@ -360,6 +360,8 @@
                     </div>
                     <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.Fixture_Set_Detail__r.Is_OneToOne__c && !esdInfo.rec.Substitute_flag__c}">(涓�瀵逛竴闄勫睘鍝�)</apex:outputPanel>
+                        <span>(<apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;"/>)</span>
+
                     </div></h2>
                     <!-- TODO 鍥炲簱銇疭et鍗樹綅銇с�佹槑绱颁竴銇や竴銇ゃ伄quickCheck瑕併倝銇亜銇屻�丼et銇畄uickCheck瑕併倠锛� -->
                     <!-- 20230722 ljh -->
@@ -429,10 +431,10 @@
                                 <span><apex:outputField value="{!esdInfo.rec.Asset__r.WH_location__c}" style="margin:3px;"/></span>
                             </apex:outputPanel>
                         </li>
-                        <li>
+                        <!-- <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;"/></span>
-                        </li>
+                        </li> -->
                         <!-- </apex:outputPanel> -->
                         <!-- </div> -->
                     </ul>

--
Gitblit v1.9.1