blame | 历史 | 补丁 | 提交 | 提交对比 | show whitespace
unknown
2023-08-23 50ce6a5e5ae7ac6ce3e6281acca9a0db568306e6 
 force-app/main/default/pages/EquipmentSetShippmentReceived3.page


@@ -55,16 +55,24 @@


        return;


    }


    ShippmentDetail(resdid);


            // resetDetailDivMargintop();


}


function checkAllDetail() {


    j$('input[type="checkbox"]').prop("checked",true);


}


function ShippmentAddJs() {


    j$(escapeVfId('allPage:allForm:SlipNo')).prop("disabled", true);


    j$(escapeVfId('allPage:allForm:DeliveryType')).prop("disabled", true);


    j$(escapeVfId('allPage:allForm:DistributorMethod')).prop("disabled", true);


    j$(escapeVfId('allPage:allForm:DeliveryCompany')).prop("disabled", true);


            // 20230620 ljh start


            // j$(escapeVfId('allPage:allForm:SlipNo')).prop("disabled", true);


            // j$(escapeVfId('allPage:allForm:DeliveryType')).prop("disabled", true);


            // j$(escapeVfId('allPage:allForm:DistributorMethod')).prop("disabled", true);


            // j$(escapeVfId('allPage:allForm:DeliveryCompany')).prop("disabled", true);


            j$(escapeVfId('allPage:allForm:newHeader:SlipNo')).prop("disabled", true);


            j$(escapeVfId('allPage:allForm:newHeader:DeliveryType')).prop("disabled", true);


            j$(escapeVfId('allPage:allForm:newHeader:DistributorMethod')).prop("disabled", true);


            j$(escapeVfId('allPage:allForm:newHeader:DeliveryCompany')).prop("disabled", true);


            // 20230620 ljh end


    ShippmentAdd();


            // resetDetailDivMargintop();


}


function checkMessage() {


    if (j$(escapeVfId('allPage:allForm:done_flg')).val() == 'true') {


@@ -73,7 +81,10 @@


}




function fixDeliveryType() {


   j$(escapeVfId('allPage:allForm:DeliveryType')).children().each(function() {


            // 20230620 ljh start


            // j$(escapeVfId('allPage:allForm:DeliveryType')).children().each(function() {


            j$(escapeVfId('allPage:allForm:newHeader:DeliveryType')).children().each(function() {


            // 20230620 ljh end


      if (this.value == '回寄') j$(this).remove();


   })


}


@@ -97,14 +108,16 @@


        display: none


    }


    .menu div.m_title{


        width: 308px;


                /*width: 308px;*//*20230619 ljh*/


        text-align: left;


        margin: 0;


        background:#95aee5;


                /* background:#95aee5; */


                background:#dcdcdc;


        /*height: 42px;*/


                padding-left: 0.75rem;/*20230721 ljh  */


    }


    .menu div.m_titleg{


        width: 308px;


                /*width: 308px;*//*20230619 ljh*/


        text-align: left;


        margin: 0;


        background:#DCDCDC;


@@ -124,15 +137,19 @@


    }


    #Step_tab li {


        position: relative;


        /* 2023-04-23   zyh   lightning升级   start */


        width: 30%;


                /* 20230619 ljh*/


        /* width: 20%; */


        /* 2023-04-23   zyh   lightning升级   end */


                width: 50%;


                /* 20230619 ljh*/


        float: left;


        margin: 0;


        padding: 0;


        text-align: center;


        cursor: pointer;


                /*20230620 ljh*/


                height:30px;


                line-height: 30px;


                /*20230620 ljh*/


    }


    #Step_tab li span {


        margin: 0;


@@ -148,13 +165,14 @@


    #Step_tab li.selected span {


        color: #fff;


    }


    


    div#main {


            /*20230620 ljh*/


            /*div#main {


        width: 320px;


    }




            }*/


            /*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;}


@@ -168,7 +186,10 @@


        color: #fff;


        background-color: #fff;


        height: 1px;


        width: 90%;


                /*20230620 ljh start*/


                /*width: 90%;*/


                width: 98%;


                /*20230620 ljh end*/


    }


    .close {


        color: #aaaaaa;


@@ -188,6 +209,17 @@


        list-style: none;


        border-top: 1px solid #ddd;


    }


            /*20230621 ljh start*/


            .lookupInput{


                display: inline-block;


                position: relative;


                width: 145px;


                padding: 0;


            }


            .lookupInput input[type="text"]{


                padding: 0;


            }


            /*20230621 ljh end*/


</style>


<div id="myModal" class="modal">




@@ -204,18 +236,21 @@




</div>


<apex:form id="allForm">


            <!-- 20230721 ljh resetDetailDivMargintop() -->


    <apex:actionFunction name="save" action="{!save}" rerender="allForm" onComplete="unblockUI();checkMessage();resetDetailDivMargintop();" />


    <apex:actionFunction name="filljsQRAction" action="{!filljsQRAction}" rerender="detail,message" oncomplete="unblockUI();resetDetailDivMargintop();">


        <apex:param name="firstParam" assignTo="{!ApplyId}" value="" />


        <apex:param name="secondParam" assignTo="{!CheckedId}" value="" />


    </apex:actionFunction>


    <apex:actionRegion >


        <apex:actionFunction name="deleteDetail" action="{!deleteDetail}" rerender="detail,message" oncomplete="unblockUI();">


                <apex:actionFunction name="deleteDetail" action="{!deleteDetail}" rerender="detail,message" oncomplete="unblockUI();resetDetailDivMargintop();">


            <apex:param name="firstParam" assignTo="{!UnCheckedId}" value="" />


        </apex:actionFunction>


    </apex:actionRegion>


    <!-- <apex:actionFunction name="Shippment" action="{!Shippment}" /> -->


            <!-- 20230722 ljh -->


    <apex:actionFunction name="searchSlip" action="{!searchSlip}" reRender="allForm" onComplete="unblockUI();fixDeliveryType();resetDetailDivMargintop();" />


            <!-- 20230722 ljh -->


    <apex:actionFunction name="ShippmentDetail" action="{!ShippmentDetail}" reRender="allForm" onComplete="unblockUI();fixDeliveryType();resetDetailDivMargintop();" >


        <apex:param name="firstParam" assignTo="{!CheckedId}" value="" />


    </apex:actionFunction>


@@ -228,27 +263,16 @@


            <apex:outputPanel id="message">


                <apex:pageMessages />


            </apex:outputPanel>


            <apex:outputPanel layout="none" rendered="{!IF(Step_status='明细', true, false)}">


                <div style="text-align: right;margin-top: 10px;">


                    <apex:commandButton styleClass="commandbutton" onclick="savejs();" value="保存" rerender="dummy" disabled="{!saveBtnDisabled}"/>


                </div>


                <apex:outputText id="saveBtnDisabled" value="{!saveBtnDisabled}" style="display: none;"/>


            </apex:outputPanel>


            <!-- <apex:outputText value="（出库指示后取消）" style="color:red;" rendered="{!IF(SR_status='Received' && es.cancel_after_loaner_arranged__c, true, false)}"/> -->


                    <apex:pageBlock id="newHeader">


            <table style="border-collapse: collapse; font-size:13px;">


                <colgroup>


                    <col width="150" />


                    <col width="170" />


                                <col width="20%" />


                                <col width="80%" />


                </colgroup>


                <tr>


                    <!-- 状态切换btn -->


                    <th colspan="2" style="font-size:20px;text-align: center;width:380px;">


                        <ul id="Step_tab">


                            <!-- <apex:outputPanel layout="none" rendered="{!IF(Step_status='运输单', true, false)}">


                                <li onclick="javascript:Shippment();return false" class="selected"><span>运输单</span></li>


                                <li onclick="javascript:ShippmentDetail();return false"><span>明细</span></li>


                                <li onclick="javascript:ShippmentAdd();return false"><span>追加</span></li>


                            </apex:outputPanel> -->


                                <th  style="font-size:20px;text-align: center;width:280px;height: 50px;" >


                                    <ul id="Step_tab" style="margin:0;">


                            <apex:outputPanel layout="none" rendered="{!IF(Step_status='明细', true, false)}">


                                <li onclick="javascript:ShippmentAddJs();return false"><span class="tabsize">追加</span></li>


                                <li class="selected"><span>明细</span></li>


@@ -257,9 +281,21 @@


                                <li class="selected"><span>追加</span></li>


                                <li onclick="javascript:ShippmentDetail();return false"><span class="tabsize">明细</span></li>


                            </apex:outputPanel>


        


                        </ul>


                    </th>


                                <th width="900px;" style="padding-left:50px;" class="myBtn">


                                    <apex:commandButton styleClass="commandbutton" onclick="qrsacn(0)" value="扫一扫申请书" rerender="dummy" rendered="{!IF(Step_status='追加', true, false)}"/>


                                    <apex:commandButton styleClass="commandbutton" onclick="checkAllDetail();return false" value="全选" rerender="dummy" rendered="{!IF(Step_status='追加', true, false)}"/>


                                    <apex:commandButton styleClass="commandbutton" onclick="addToDetail();return false" value="追加" rerender="dummy" rendered="{!IF(Step_status='追加', true, false)}"/>


                                    <apex:outputPanel layout="none" rendered="{!IF(Step_status='明细', true, false)}">


                                        <apex:commandButton styleClass="commandbutton" onclick="savejs();" value="保存" rerender="dummy" disabled="{!saveBtnDisabled}"/>


                                        <apex:outputText id="saveBtnDisabled" value="{!saveBtnDisabled}" style="display: none;"/>


                                    </apex:outputPanel>


                                </th>


                </tr>


                        </table>


                        <table style="border-collapse: collapse; font-size:13px;" width="80%">


                <apex:outputPanel layout="none" rendered="{!IF(Step_status='明细', true, false)}" id="slipPanel">


                    <tr>


                        <td colspan="2"><apex:outputPanel layout="none" rendered="{!IF(slip.Id=null, true, false)}"><span style="margin-left:30px;font-weight: bold;font-size: 15px;">新建</span></apex:outputPanel><apex:outputPanel layout="none" rendered="{!IF(slip.Id=null, false, true)}"><span style="margin-left:30px;font-weight: bold;">编辑：[{!slip.DeliveryCompany_SlipNo__c}]</span></apex:outputPanel></td>


@@ -268,45 +304,38 @@


                        <td style="text-align: right;" class="deliveryslip">发货-运输单号 ： </td>


                        <td align="left">


                            <!-- 2023-04-23   zyh   lightning升级 -->


                            <apex:inputField value="{!slip.Name}" style="width:100px;float:left" id="SlipNo"/>


                                        <apex:inputField value="{!slip.Name}" style="width:145px;padding: 0;float:left" id="SlipNo"/>


                            <!-- <apex:inputField value="{!slip.Name}" style="width:120px;float:left" id="SlipNo"/> -->


                            <apex:commandButton styleClass="commandbutton" onclick="blockme();searchSlip();return false;" style="float:left" value="检索" rerender="dummy"/>


                                        <apex:commandButton styleClass="commandbutton" onclick="blockme();searchSlip();return false;" style="float:left;" value="检索" rerender="dummy"/>


                            <!-- <apex:commandButton styleClass="commandbutton" onclick="qrsacn(1)" value="扫运输单号" rerender="dummy"/> -->


                            <apex:commandButton styleClass="commandbutton" onclick="qrsacn(1)" value="扫运输单号" rerender="dummy" style="margin-left:0; "/>


                                        <apex:commandButton styleClass="commandbutton" onclick="qrsacn(1)" value="扫运输单号" rerender="dummy" style="margin-left:5px;"/>


                            <!-- 2023-04-23   zyh   lightning升级 -->


                        </td>


                    </tr>


                    <tr>


                                


                        <td style="text-align: right" class="deliveryslip">发货-{!$ObjectType.FixtureDeliverySlip__c.fields.DeliveryType__c.label} ： </td>


                        <td align="left"><apex:inputField value="{!slip.DeliveryType__c}" style="width:145px;" id="DeliveryType"/></td>


                                    <td align="left"><apex:inputField value="{!slip.DeliveryType__c}" style="width:145px;height: 30px;padding: 0;" id="DeliveryType"/></td>


                    </tr>


                    <tr>


                        <td style="text-align: right" class="deliveryslip">发货-{!$ObjectType.FixtureDeliverySlip__c.fields.Distributor_method__c.label} ： </td>


                        <td align="left"><apex:inputField value="{!slip.Distributor_method__c}" style="width:145px;" id="DistributorMethod"/></td>


                    </tr>


                    <tr>


                                    <td align="left"><apex:inputField value="{!slip.Distributor_method__c}" style="width:145px;height: 30px;padding: 0;" id="DistributorMethod"/></td>


                                


                        <td style="text-align: right" class="deliveryslip">发货-{!$ObjectType.FixtureDeliverySlip__c.fields.DeliveryCompany__c.label} ： </td>


                        <td align="left"><apex:inputField value="{!slip.DeliveryCompany__c}" style="width:145px;" id="DeliveryCompany"/></td>


                                    <td align="left"><apex:inputField value="{!slip.DeliveryCompany__c}" style="width:145px;height: 30px;padding: 0;" id="DeliveryCompany"/></td>


                    </tr>


                    <tr>


                        <td style="text-align: right" class="deliveryslip">发货-{!$ObjectType.FixtureDeliverySlip__c.fields.Wh_Staff__c.label} 　 </td>


                        <td align="left"><apex:inputField styleClass="hideDropdown" value="{!slip.Wh_Staff__c}" style="width:130px;" /></td>


                    </tr>


                    <tr>


                                    <td align="left"><apex:inputField styleClass="hideDropdown" value="{!slip.Wh_Staff__c}" style="width:130px;height: 30px;" /></td>


                               


                        <td style="text-align: right" class="deliveryslip">发货-{!$ObjectType.FixtureDeliverySlip__c.fields.Combine_Pack__c.label} 　 </td>


                        <td align="left"><apex:inputField styleClass="hideDropdown" value="{!slip.Combine_Pack__c}" style="width:130px;" /></td>


                                    <td align="left"><apex:inputField styleClass="hideDropdown" value="{!slip.Combine_Pack__c}" style="width:145px;" /></td>


                    </tr>


                    <!-- <tr>


                        <td colspan="2"><apex:inputField value="{!slip.Wh_Staff__c}" style="width:130px;" /></td>


                    </tr> -->


                </apex:outputPanel>


            </table>


        


            <div style="text-align: right">


                <apex:commandButton styleClass="commandbutton" onclick="qrsacn(0)" value="扫一扫申请书" rerender="dummy" rendered="{!IF(Step_status='追加', true, false)}"/>


                <apex:commandButton styleClass="commandbutton" onclick="checkAllDetail();return false" value="全选" rerender="dummy" rendered="{!IF(Step_status='追加', true, false)}"/>


                <apex:commandButton styleClass="commandbutton" onclick="addToDetail();return false" value="追加" rerender="dummy" rendered="{!IF(Step_status='追加', true, false)}"/>


            </div>


                    </apex:pageBlock>


                    <!-- 20230620 ljh  -->


        </div>


        <apex:outputPanel id="detail">


        <div id="detailDiv" class="detail">


@@ -322,13 +351,17 @@


                    <apex:variable var="SetName" value="{!IF(SetName='', esdInfo.rec.Rental_Apply_Equipment_Set__r.Rental_Apply__r.Name, SetName)}" />


                    <apex:variable var="SetName2" value="{!IF(SetName2='', esdInfo.rec.Rental_Apply_Equipment_Set__r.Id, SetName2)}" />


                    <apex:outputPanel layout="none" rendered="{!IF(SetName2=esdInfo.rec.Rental_Apply_Equipment_Set__r.Id && indexloop != 1, true, false)}">


                        <br/>


                                <!-- <br/> -->


                                <!-- 20230623 ljh -->


                    </apex:outputPanel>


                    


                    <apex:outputPanel layout="none" rendered="{!IF(SetName=esdInfo.rec.Rental_Apply_Equipment_Set__r.Rental_Apply__r.Name, false, true)}">


                        <hr/>


                        <h2 style="padding: 5px;" class="detailtab">{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Rental_Apply__r.Name}</h2>


                                <!-- 20230620 ljh start -->


                                <!-- <h2 style="padding: 5px;" class="detailtab">{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Rental_Apply__r.Name}</h2> -->


                                <span style="padding: 5px 0.75rem;font-weight: bold;" class="detailtab">{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Rental_Apply__r.Name}</span>


                        <br/>


                                <!-- 20230620 ljh end -->


                        <apex:variable var="SetName" value="{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Rental_Apply__r.Name}" />


                        <apex:variable var="applychange" value="{!1}" />


                        <input type="hidden" value="{!esdInfo.rec.Rental_Apply__r.Pre_inspection_ng_num__c}" data-ngnum="{!esdInfo.rec.Rental_Apply__c}"/>


@@ -340,7 +373,9 @@


                        </apex:outputPanel>


                        <apex:variable var="applychange" value="{!0}" />


                        <apex:outputPanel layout="none" rendered="{!IF(esdInfo.rec.Rental_Apply_Equipment_Set__r.Inspection_not_finish__c > 0, false, true)}">


                        <apex:inputCheckbox value="{!esdInfo.isChecked}"/><input type="hidden" value="{!esdInfo.rec.Rental_Apply_Equipment_Set__c}"/><input type="hidden" value="{!esdInfo.rec.Rental_Apply__c}"/>


                                <!-- 20230721 ljh -->


                                <apex:inputCheckbox value="{!esdInfo.isChecked}"  style="margin:0 0 0 0.75rem;"/>


                                <input type="hidden" value="{!esdInfo.rec.Rental_Apply_Equipment_Set__c}"/><input type="hidden" value="{!esdInfo.rec.Rental_Apply__c}"/>


                          </apex:outputPanel>


                        <!-- 2023-04-26   zyh   lightning升级   start -->


                        <!-- <h2 style="padding: 5px;" class="detailtab">{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Name}：{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Fixture_Set__r.Name}</h2> -->


@@ -353,14 +388,16 @@


                        <!-- 2023-04-26   zyh   lightning升级   start -->


                        <!-- <h2 style="padding: 5px;" class="detailtab">{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Rental_Apply__r.Name}</h2>


                        <br/> -->


                        <div style="padding: 5px;font-weight: bold;" class="detailtab">{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Rental_Apply__r.Name}</div>


                                <div style="padding: 5px 0.75rem;font-weight: bold;" class="detailtab">{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Rental_Apply__r.Name}</div>


                        <!-- 2023-04-26   zyh   lightning升级   end -->


                        <input type="hidden" value="{!esdInfo.rec.Rental_Apply__r.Pre_inspection_ng_num__c}" data-ngnum="{!esdInfo.rec.Rental_Apply__c}"/>


                        <apex:outputPanel layout="none" rendered="{!IF(esdInfo.rec.Rental_Apply_Equipment_Set__r.Inspection_not_finish__c > 0, false, true)}">


                        <apex:inputCheckbox value="{!esdInfo.isChecked}"/><input type="hidden" value="{!esdInfo.rec.Rental_Apply_Equipment_Set__c}"/><input type="hidden" value="{!esdInfo.rec.Rental_Apply__c}"/>


                                <!-- 20230721 ljh -->


                                <apex:inputCheckbox value="{!esdInfo.isChecked}"  style="margin:0 0 0 0.75rem;"/>


                                <input type="hidden" value="{!esdInfo.rec.Rental_Apply_Equipment_Set__c}"/><input type="hidden" value="{!esdInfo.rec.Rental_Apply__c}"/>


                       </apex:outputPanel>


                        <!-- 2023-04-26   zyh   lightning升级   start -->


                        <span style="padding: 5px; font-weight: blod;" class="detailtab">{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Name}：{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Fixture_Set__r.Name}</span>


                                <span style="padding: 5px; font-weight: bold;" class="detailtab">{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Name}：{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Fixture_Set__r.Name}</span>


                        <!-- <h3 style="padding: 5px;" class="detailtab">{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Name}：{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Fixture_Set__r.Name}</h3> -->


                        <!-- 2023-04-26   zyh   lightning升级   end -->


                    </apex:outputPanel>


@@ -372,9 +409,13 @@


                    </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 回库はSet単位で、明細一つ一つのquickCheck要らないが、SetのquickCheck要る？ -->


                    <ul>


                            <!-- 20230721 ljh -->


                            <ul style="padding: 1px 0.75rem;" >


                        <li>


                            <!-- 20210721 ljh 1719 start -->


                            <!-- <span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Inspection_result__c.label}： </span> -->


@@ -388,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">


@@ -411,16 +454,19 @@


                    <apex:variable var="indexloop" value="{!indexloop+1}"/>


                    <apex:variable var="SetName" value="{!IF(SetName='', esdInfo.rec.Rental_Apply_Equipment_Set__r.Id, SetName)}" />


                    <apex:outputPanel layout="none" rendered="{!IF(SetName=esdInfo.rec.Rental_Apply_Equipment_Set__r.Id && indexloop != 1, true, false)}">


                        <br/>


                                <!-- <br/> -->


                                <!-- 20230623 ljh -->


                    </apex:outputPanel>


                    <apex:outputPanel layout="none" rendered="{!IF(SetName=esdInfo.rec.Rental_Apply_Equipment_Set__r.Id, false, true)}">


                        <hr/>


                        <h3 style="padding: 5px;" class="detailtab">{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Name}：{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Fixture_Set__r.Name}</h3><apex:outputPanel layout="none" rendered="{!NOT(esdInfo.hasSended)}"><apex:commandButton styleClass="commandbutton" onclick="deleteDetailJs(this)" style="float:right;margin-top: -2px;" value="删除" rerender="dummy"/></apex:outputPanel><input type="hidden" value="{!esdInfo.rec.Rental_Apply_Equipment_Set__c}"/>


                                <!-- 20230721 ljh -->


                                <h3 style="padding: 5px 0.75rem;" class="detailtab">{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Name}：{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Fixture_Set__r.Name}</h3><apex:outputPanel layout="none" rendered="{!NOT(esdInfo.hasSended)}"><apex:commandButton styleClass="commandbutton" onclick="deleteDetailJs(this)" style="float:right;margin-top: -2px;" value="删除" rerender="dummy"/></apex:outputPanel><input type="hidden" value="{!esdInfo.rec.Rental_Apply_Equipment_Set__c}"/>


                        <apex:variable var="SetName" value="{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Id}" />


                    </apex:outputPanel>




                    <apex:outputPanel layout="none" rendered="{!IF(indexloop == 1, true, false)}">


                        <h3 style="padding: 5px;" class="detailtab">{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Name}：{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Fixture_Set__r.Name}</h3><apex:outputPanel layout="none" rendered="{!NOT(esdInfo.hasSended)}"><apex:commandButton styleClass="commandbutton" onclick="deleteDetailJs(this)" style="float:right;margin-top: -2px;" value="删除" rerender="dummy"/></apex:outputPanel><input type="hidden" value="{!esdInfo.rec.Rental_Apply_Equipment_Set__c}"/>


                                <!-- 20230721 ljh -->


                                <h3 style="padding: 5px 0.75rem;" class="detailtab">{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Name}：{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Fixture_Set__r.Name}</h3><apex:outputPanel layout="none" rendered="{!NOT(esdInfo.hasSended)}"><apex:commandButton styleClass="commandbutton" onclick="deleteDetailJs(this)" style="float:right;margin-top: -2px;" value="删除" rerender="dummy"/></apex:outputPanel><input type="hidden" value="{!esdInfo.rec.Rental_Apply_Equipment_Set__c}"/>


                    </apex:outputPanel>


                    <apex:outputPanel layout="none" rendered="{!esdInfo.hasSended}">


                    <div class="rtopg">


@@ -444,12 +490,22 @@


                    </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 回库はSet単位で、明細一つ一つのquickCheck要らないが、SetのquickCheck要る？ -->


                    <ul>


                        <li><span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Inspection_result__c.label}： </span>


                            <!-- 20230721 ljh -->


                            <ul style="padding: 1px 0.75rem;">


                                <li>


                                    <!-- 20230626 ljh  start-->


                                    <!-- <span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Inspection_result__c.label}： </span> -->


                                    <span>发货前-检测结果： </span> 


                                    <!-- 20230626 ljh  end-->


                            <span><apex:outputField value="{!esdInfo.rec.Inspection_result__c}" style="margin:3px;width:150px" /></span>


                        </li>


                        <li><span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Inspection_result_NG__c.label}： </span>


@@ -458,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">


@@ -482,7 +540,13 @@


            userAgent = window.navigator.userAgent.toLowerCase(),


            safari = /safari/.test( userAgent ),


            ios = /iphone|ipod|ipad/.test( userAgent ),


                    // 20230619 ljh


                    // ver = (navigator.userAgent).match(/OS (\d)?\d_\d(_\d)?/i)[0].split('_')[0].replace("OS ","");


                    ver = '';


                    if (ios) {


            ver = (navigator.userAgent).match(/OS (\d)?\d_\d(_\d)?/i)[0].split('_')[0].replace("OS ","");


                    }


                    // 20230619 ljh


        let scanner = new Instascan.Scanner({ video: document.getElementById('preview'), scanPeriod: 5 ,mirror: false});


        scanner.addListener('scan', function (content) {


          filljsQR(content);