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/TransferShippmentReceived4.page |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/force-app/main/default/pages/TransferShippmentReceived4.page b/force-app/main/default/pages/TransferShippmentReceived4.page
index b738892..5511a4d 100644
--- a/force-app/main/default/pages/TransferShippmentReceived4.page
+++ b/force-app/main/default/pages/TransferShippmentReceived4.page
@@ -336,7 +336,8 @@
         /* width: 308px; */ /*20230722 ljh*/
         text-align: left;
         margin: 0;
-        background:#95aee5;
+        background:#DCDCDC;
+        /* background:#95aee5; */
         border-radius:8px 8px 0 0;
         /*height: 42px;*/
         padding-left: 0.75rem;/*20230721 ljh  */
@@ -554,6 +555,9 @@
                     <div class="m_title">
                         <h2>
                             &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;"/>)</span>
+                            <!-- 2023-08-02 zyh 鏈鸿韩缂栧彿鎹㈠湴鏂� -->
                         </h2>
                     </div>
                     </apex:outputPanel>
@@ -579,13 +583,13 @@
                         <!-- === -->
                         <apex:outputPanel layout="none" rendered="{!IF(OR(esdInfo.rec.Check_lost_Item__c='OK',esdInfo.rec.Check_lost_Item__c=''), true, false)}">
                             <li>
-                            <span>{!$ObjectType.TransferApplyDetail__c.fields.Check_lost_Item__c.label} 11锛� </span>
+                            <span>{!$ObjectType.TransferApplyDetail__c.fields.Check_lost_Item__c.label} 锛� 
                             <apex:outputPanel layout="none" rendered="{!(esdInfo.editable)}">
                                 <span><apex:inputField id="checkLost" value="{!esdInfo.rec.Check_lost_Item__c}" style="margin:3px;" onchange="changeCheckLost(this)"/> </span>
                             </apex:outputPanel>
                             <apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable))}">
                                 <span><apex:outputField value="{!esdInfo.rec.Check_lost_Item__c}" style="margin:3px;" /></span>
-                            </apex:outputPanel>
+                            </apex:outputPanel></span>
                             </li>
                         </apex:outputPanel>
                         <apex:outputPanel layout="none" rendered="{!IF(OR(esdInfo.rec.Check_lost_Item__c='OK',esdInfo.rec.Check_lost_Item__c=''), false, true   )}">
@@ -627,8 +631,8 @@
                         <input type="hidden" name="noSlip" value="1"/>
                         </apex:outputPanel>
                         <li>
-                        <span>{!$ObjectType.TransferApplyDetail__c.fields.NoItemReturn__c.label}锛� </span>
-                        <apex:outputField value="{!esdInfo.rec.NoItemReturn__c}" style="margin:3px;"/>
+                        <span>{!$ObjectType.TransferApplyDetail__c.fields.NoItemReturn__c.label}锛� 
+                        <apex:outputField value="{!esdInfo.rec.NoItemReturn__c}" style="margin:3px;"/></span>
                         </li>
                         
                         <!-- <apex:outputPanel layout="none" rendered="{!esdInfo.rec.Check_lost_Item__c != null && esdInfo.rec.Check_lost_Item__c != 'OK' }">
@@ -636,7 +640,7 @@
                             <span>{!$ObjectType.TransferApplyDetail__c.fields.Lost_item_Memo_Final__c.label}锛� </span>
                             <apex:outputPanel layout="none" rendered="{!esdInfo.editable && esdInfo.rec.Check_lost_Item_Final__c != '娑堣��'}">
                             <apex:inputField id="lostMemo2" value="{!esdInfo.rec.Lost_item_Memo_Final__c}" style="margin:3px;"/>
-                            </apex:outputPanel>
+                            </apex:outputPanel>s
                             <apex:outputPanel layout="none" rendered="{!NOT(esdInfo.editable) || esdInfo.rec.Check_lost_Item_Final__c == '娑堣��'}">
                             <apex:outputField value="{!esdInfo.rec.Lost_item_Memo_Final__c}" style="margin:3px;"/>
                             </apex:outputPanel>
@@ -671,10 +675,12 @@
                             <apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable) || esdInfo.rec.Check_lost_Item_Final__c == '娑堣��')}"><apex:outputField value="{!esdInfo.rec.CDSType__c}"/></apex:outputPanel>
                             </li>
                         </apex:outputPanel>
-                        <li>
+                            <!-- 2023-08-02 zyh 鏈鸿韩缂栧彿鎹㈠湴鏂� -->
+                        <!-- <li>
                         <span>{!$ObjectType.TransferApplyDetail__c.fields.SerialNumber_F__c.label}锛� </span>
                         <span><apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;"/></span>
-                        </li>
+                        </li> -->
+                            <!-- 2023-08-02 zyh 鏈鸿韩缂栧彿鎹㈠湴鏂� -->
                     </ul>
                     </div>
                 </apex:outputPanel>

--
Gitblit v1.9.1