张宇恒
2023-08-08 8608db1542a909c147574767fd22dc1fedf2ddc9
force-app/main/default/pages/TransferShippmentReceived3.page
@@ -109,7 +109,8 @@
        /* width: 308px; *//* 20230718 ljh  */
        text-align: left;
        margin: 0;
        background:#95aee5;
        background:#DCDCDC;
        /* background:#95aee5; */
        border-radius:8px 8px 0 0;
        padding-left: 0.75rem;/*20230628 ljh*/
    }
@@ -387,6 +388,9 @@
                    </apex:outputPanel>
                    <div class="menu">
                    <h2><div class="m_title">&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;width:75px;"/>)</span>
                        <!-- 2023-08-02 zyh 机身编号换地方 -->
                    </div></h2>
                    <!-- TODO 回库はSet単位で、明細一つ一つのquickCheck要らないが、SetのquickCheck要る? -->
                    <!-- 20230718 ljh -->
@@ -404,10 +408,12 @@
                        <li><span>上次回收后检测时间: </span>
                            <span><apex:outputField rendered="{!IF(esdInfo.rec.Asset__r.Pre_Reserve_TAES_Detail__c==null, false, true)}" value="{!esdInfo.rec.Asset__r.Pre_Reserve_TAES_Detail__r.After_Inspection_time__c}" style="margin:3px;width:75px;"/></span>
                        </li>
                        <li>
                        <!-- 2023-08-02 zyh 机身编号换地方 -->
                        <!-- <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-02 zyh 机身编号换地方 -->
                    </ul>
                    </div>
                    </apex:outputPanel>
@@ -447,7 +453,11 @@
                    </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-02 zyh 机身编号换地方 -->
                        <span>(<apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;width:75px;"/>)</span>
                        <!-- 2023-08-02 zyh 机身编号换地方 -->
                    </div>
                    </h2>
                    </apex:outputPanel>
                    <!-- TODO 回库はSet単位で、明細一つ一つのquickCheck要らないが、SetのquickCheck要る? -->
@@ -466,10 +476,12 @@
                        <li><span>上次回收后检测时间: </span>
                            <span><apex:outputField rendered="{!IF(esdInfo.rec.Asset__r.Pre_Reserve_TAES_Detail__c==null, false, true)}" value="{!esdInfo.rec.Asset__r.Pre_Reserve_TAES_Detail__r.After_Inspection_time__c}" style="margin:3px;width:75px;"/></span>
                        </li>
                        <li>
                        <!-- 2023-08-02 zyh 机身编号换地方 -->
                        <!-- <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-02 zyh 机身编号换地方 -->
                    </ul>
                    </div>
                </apex:outputPanel>