换颜色，机身编码换地方

张宇恒

2023-08-08 8608db1542a909c147574767fd22dc1fedf2ddc9

 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>