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


@@ -7,6 +7,7 @@


<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>


<apex:includeScript value="{!URLFOR($Resource.instascan)}"/>


<apex:stylesheet value="{!URLFOR($Resource.EquipmentSetShippmentReceivedcss)}"/>




<apex:stylesheet value="{!URLFOR($Resource.jquery_confirm, 'jquery-confirm.min.css')}"/>


<apex:includeScript value="{!URLFOR($Resource.jquery_confirm, 'jquery-confirm.min.js')}"/>


<script type="text/javascript">


@@ -51,12 +52,21 @@


    deleteDetail(j$(ele).next().val());


}


function changeCheckLost(ele) {


    var ele1 = j$(ele).parent().parent().find('[name$="checkboxCDS"]');


    var ele2 = j$(ele).parent().parent().find('[name$="checkboxGiveUp"]');


    var ele3 = j$(ele).parent().parent().find('select[id$="checkLost"]');


    var ele4 = j$(ele).parent().parent().find('span[id$="checkLost3"]');


    var ele5 = j$(ele).parent().parent().find('input[id$="lostMemo"]');


    var ele6 = j$(ele).parent().parent().find('input[id$="lostMemo2"]');


    // 20230722 ljh start


    // var ele1 = j$(ele).parent().parent().find('[name$="checkboxCDS"]');


    // var ele2 = j$(ele).parent().parent().find('[name$="checkboxGiveUp"]');


    // var ele3 = j$(ele).parent().parent().find('select[id$="checkLost"]');


    // var ele4 = j$(ele).parent().parent().find('span[id$="checkLost3"]');


    // var ele5 = j$(ele).parent().parent().find('input[id$="lostMemo"]');


    // var ele6 = j$(ele).parent().parent().find('input[id$="lostMemo2"]');




    var ele1 = j$(ele).parent().parent().parent().find('[name$="checkboxCDS"]');


    var ele2 = j$(ele).parent().parent().parent().find('[name$="checkboxGiveUp"]');


    var ele3 = j$(ele).parent().parent().parent().find('select[id$="checkLost"]');


    var ele4 = j$(ele).parent().parent().parent().find('span[id$="checkLost3"]');


    var ele5 = j$(ele).parent().parent().parent().find('input[id$="lostMemo"]');


    var ele6 = j$(ele).parent().parent().parent().find('input[id$="lostMemo2"]');


    // 20230722 ljh end


    var lastken = ele3.val() == '欠品' || ele4.text() == '欠品';


    ele5.prop('disabled', true);


    ele6.prop('disabled', true);


@@ -96,8 +106,11 @@


}




function changeCheckCds(ele) {


    var ele1 = j$(ele).parent().parent().find('[name$="CDSChargement"]');


    var ele2 = j$(ele).parent().parent().find('[name$="CDSType"]');


    console.log(ele);


    // var ele1 = j$(ele).parent().parent().find('[name$="CDSChargement"]');


    // var ele2 = j$(ele).parent().parent().find('[name$="CDSType"]');


    var ele1 = j$(ele).parent().parent().parent().find('[name$="CDSChargement"]');


    var ele2 = j$(ele).parent().parent().parent().find('[name$="CDSType"]');


    if (ele1 != null && ele2 != null) {


        if (j$(ele).prop("checked") == true) {


            ele1.prop('disabled', false);


@@ -242,17 +255,29 @@


    changeCheckCds(cds);


}


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);


    // 20230621 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);


    // 20230621 ljh end


    ShippmentAdd();


}


function ShippmentDetailJs() {


   // 20230621 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);


    // 20230621 ljh end


    ShippmentDetail();


}




@@ -279,7 +304,10 @@


}




function fixDeliveryType() {


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


    // 20230621 ljh start


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


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


   // 20230621 ljh end


        if (this.value == '发货') j$(this).remove();


    })




@@ -297,81 +325,106 @@




    // j$("select[name$='checkLost2']").trigger('change');


    // j$("select[name$='checkLost']").trigger('change');




    // 20230722 ljh start parent() 相关 start


    // select checkLost  最初 select checkLost2  最终


    // 文本 span  checkLost3  最初 span checkLost4  最终


    j$("select[name$='checkLost2']").each(function() {


        if (j$(this).val() == '欠品' || j$(this).val() == '消耗' || j$(this).val() == '' ) {


            j$(this).parent().parent().find('[name$="checkboxCDS"]').prop('disabled',true);


            j$(this).parent().parent().find('[name$="CDSChargement"]').prop('disabled',true);


            j$(this).parent().parent().find('[name$="CDSType"]').prop('disabled',true);


            // j$(this).parent().parent().find('[name$="checkboxCDS"]').prop('disabled',true);


            // j$(this).parent().parent().find('[name$="CDSChargement"]').prop('disabled',true);


            // j$(this).parent().parent().find('[name$="CDSType"]').prop('disabled',true);


            j$(this).parent().parent().parent().find('[name$="checkboxCDS"]').prop('disabled',true);


            j$(this).parent().parent().parent().find('[name$="CDSChargement"]').prop('disabled',true);


            j$(this).parent().parent().parent().find('[name$="CDSType"]').prop('disabled',true);


        }


        if (j$(this).val() == '欠品' ) {


            j$(this).parent().parent().find('input[id$="lostMemo2"]').prop('disabled',false);


            // j$(this).parent().parent().find('input[id$="lostMemo2"]').prop('disabled',false);


            j$(this).parent().parent().parent().find('input[id$="lostMemo2"]').prop('disabled',false);


        } else {


            j$(this).parent().parent().find('input[id$="lostMemo2"]').prop('disabled',true);


            // j$(this).parent().parent().find('input[id$="lostMemo2"]').prop('disabled',true);


            j$(this).parent().parent().parent().find('input[id$="lostMemo2"]').prop('disabled',true);


        }


    })


    j$("select[name$='checkLost']").each(function() {


        if (j$(this).val() == '欠品' || j$(this).val() == '消耗' || j$(this).val() == '' ) {


            j$(this).parent().parent().find('[name$="checkboxCDS"]').prop('disabled',true);


            j$(this).parent().parent().find('[name$="CDSChargement"]').prop('disabled',true);


            j$(this).parent().parent().find('[name$="CDSType"]').prop('disabled',true);


            // j$(this).parent().parent().find('[name$="checkboxCDS"]').prop('disabled',true);


            // j$(this).parent().parent().find('[name$="CDSChargement"]').prop('disabled',true);


            // j$(this).parent().parent().find('[name$="CDSType"]').prop('disabled',true);


            j$(this).parent().parent().parent().find('[name$="checkboxCDS"]').prop('disabled',true);


            j$(this).parent().parent().parent().find('[name$="CDSChargement"]').prop('disabled',true);


            j$(this).parent().parent().parent().find('[name$="CDSType"]').prop('disabled',true);


        }


        if (j$(this).val() == '欠品' ) {


            j$(this).parent().parent().find('input[id$="lostMemo"]').prop('disabled',false);


            // j$(this).parent().parent().find('input[id$="lostMemo"]').prop('disabled',false);


            j$(this).parent().parent().parent().find('input[id$="lostMemo"]').prop('disabled',false);


        } else {


            j$(this).parent().parent().find('input[id$="lostMemo"]').prop('disabled',true);


            // j$(this).parent().parent().find('input[id$="lostMemo"]').prop('disabled',true);


            j$(this).parent().parent().parent().find('input[id$="lostMemo"]').prop('disabled',true);


        }


    })




    j$('span[id$="checkLost3"]').each(function() {


        if (j$(this).text() == '欠品') {


            j$(this).parent().find('[name$="checkboxGiveUp"]').prop('disabled',false)


            // j$(this).parent().find('[name$="checkboxGiveUp"]').prop('disabled',false)


            j$(this).parent().parent().find('[name$="checkboxGiveUp"]').prop('disabled',false)


        }


        j$(this).parent().find('[name$="lostMemo"]').prop('disabled',true)


        j$(this).parent().find('[name$="lostMemo"]').hide()


        // j$(this).parent().find('[name$="lostMemo"]').prop('disabled',true)


        // j$(this).parent().find('[name$="lostMemo"]').hide()


        j$(this).parent().parent().find('[name$="lostMemo"]').prop('disabled',true)


        j$(this).parent().parent().find('[name$="lostMemo"]').hide()


    })


    j$('select[id$="checkLost"]').each(function() {


        if (j$(this).val() == '欠品') {


            j$(this).parent().parent().find('[name$="checkboxGiveUp"]').prop('disabled',false)


            // j$(this).parent().parent().find('[name$="checkboxGiveUp"]').prop('disabled',false)


            j$(this).parent().parent().parent().find('[name$="checkboxGiveUp"]').prop('disabled',false)


        }


    })




    j$('span[id$="checkLost"]').each(function() {


        if (j$(this).children().text() == '欠品') {


            j$(this).parent().parent().find('[name$="checkboxGiveUp"]').prop('disabled',false)


            // j$(this).parent().parent().find('[name$="checkboxGiveUp"]').prop('disabled',false)


            j$(this).parent().parent().parent().find('[name$="checkboxGiveUp"]').prop('disabled',false)


        }


    })




    j$('span[id$="checkLost4"]').each(function() {


        if (j$(this).text() == '欠品') {


            j$(this).parent().find('input[id$="lostMemo2"]').prop('disabled',false);


            j$(this).parent().find('[name$="checkboxGiveUp"]').prop('disabled',false)


            // j$(this).parent().find('input[id$="lostMemo2"]').prop('disabled',false);


            // j$(this).parent().find('[name$="checkboxGiveUp"]').prop('disabled',false)


            j$(this).parent().parent().find('input[id$="lostMemo2"]').prop('disabled',false);


            j$(this).parent().parent().find('[name$="checkboxGiveUp"]').prop('disabled',false)


        } else if (j$(this).text() != '') {


            j$(this).parent().find('input[id$="lostMemo2"]').prop('disabled',true);


            j$(this).parent().find('[name$="checkboxGiveUp"]').prop('disabled',true)


            // j$(this).parent().find('input[id$="lostMemo2"]').prop('disabled',true);


            // j$(this).parent().find('[name$="checkboxGiveUp"]').prop('disabled',true)


            j$(this).parent().parent().find('input[id$="lostMemo2"]').prop('disabled',true);


            j$(this).parent().parent().find('[name$="checkboxGiveUp"]').prop('disabled',true)


        }


    })




    j$('span[id$="checkLost2"]').each(function() {


        if (j$(this).children().text() == '欠品') {


            j$(this).parent().find('[name$="checkboxGiveUp"]').prop('disabled',false)


            // j$(this).parent().find('[name$="checkboxGiveUp"]').prop('disabled',false)


            j$(this).parent().parent().find('[name$="checkboxGiveUp"]').prop('disabled',false)


        } else if (j$.trim(j$(this).text()) != '') {


            j$(this).parent().parent().find('[name$="checkboxGiveUp"]').prop('disabled',true)


            // j$(this).parent().parent().find('[name$="checkboxGiveUp"]').prop('disabled',true)


            j$(this).parent().parent().parent().find('[name$="checkboxGiveUp"]').prop('disabled',true)


        }


    })




    j$('select[id$="checkLost2"]').each(function() {


        if (j$(this).val() == '欠品') {


            j$(this).parent().find('[name$="checkboxGiveUp"]').prop('disabled',false)


            // j$(this).parent().find('[name$="checkboxGiveUp"]').prop('disabled',false)


            j$(this).parent().parent().find('[name$="checkboxGiveUp"]').prop('disabled',false)


        } else if (j$(this).val() != '') {


            j$(this).parent().parent().find('[name$="checkboxGiveUp"]').prop('disabled',true)


            // j$(this).parent().parent().find('[name$="checkboxGiveUp"]').prop('disabled',true)


            j$(this).parent().parent().parent().find('[name$="checkboxGiveUp"]').prop('disabled',true)


        }


    })




    j$('img[alt="チェック"]').each(function() {


        // j$(this).parent().parent().find('[name$="checkboxGiveUp"]').prop('disabled',false)


        j$(this).parent().parent().find('[name$="checkboxGiveUp"]').prop('disabled',false)


    })




    // 20230722 ljh start parent() 相关 end


    j$('input[id$="noitem"]').prop('disabled', true);


}




@@ -380,7 +433,8 @@


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


        alert("保存完了");


        if (need_redirect){


            window.location.href = window.location.href + '&done=1';


            // window.location.href = window.location.href + '&done=1';


            window.location.reload(false);


        }


    } else if (checked_raes) {


        var carray = checked_raes.split(",");


@@ -404,8 +458,6 @@


    // j$("[name$='checkLost']").each(function() {


    //  changeCheckLost(this);


    // });






}




</script>


@@ -414,14 +466,16 @@


        display: none


    }


    .menu div.m_title{


        width: 308px;


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


        text-align: left;


        margin: 0;


        background:#95aee5;


        background:#DCDCDC;


        /* background:#95aee5; */


        /*height: 42px;*/


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


    }


    .menu div.m_titleg{


        width: 308px;


        /*width: 308px;*/


        text-align: left;


        margin: 0;


        background:#DCDCDC;


@@ -441,15 +495,19 @@


    }


    #Step_tab li {


        position: relative;


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


        /* 20230619 ljh*/


        /* width: 20%; */


        width: 30%;


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


@@ -465,14 +523,15 @@


    #Step_tab li.selected span {


        color: #fff;


    }




    div#main {


    /*20230620 ljh start*/


    /*div#main {


        width: 320px;


    }




    }*/


    /*20230620 ljh end*/


    div.rtop, div.rbottom {display:block; background: transparent; font-size:1px;}


    div.rtopg div {background:#DCDCDC;}


    div.rtop div {background:#95aee5;}


    div.rtop div {background:#DCDCDC;}


    /* div.rtop div {background:#95aee5;} */


    div.r1, div.r2, div.r3, div.r4 {display:block; overflow:hidden;}


    div.r1, div.r2, div.r3 {height:1px;}


    div.r2, div.r3, div.r4 {border-left:1px solid silver; border-right:1px solid silver;}


@@ -485,7 +544,10 @@


        color: #fff;


        background-color: #fff;


        height: 1px;


        width: 90%;


        /*20230620 ljh start*/


        /*width: 90%;*/


        width: 98%;


        /*20230620 ljh end*/


    }


    .close {


        color: #aaaaaa;


@@ -525,6 +587,23 @@


    #alertbox > div > #alertboxbody{ background:white; padding:10px; color:red; }


    #alertbox > div > #alertboxbody1{ background:white; padding:10px; color:blue; }


    #alertbox > div > #alertboxfoot{ background:white; padding:3px; text-align:right; }


    /*20230621 ljh start*/


    .lookupInput{


       display: inline-block;


       position: relative;


       width: 145px;


       padding: 0;


    }


    .lookupInput input[type="text"]{


       padding: 0;


    }


    .errorMsg{


        width: 140px;


    }


    .mytable tr{


        height: 35px;


    }


    /*20230621 ljh end*/


</style>


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




@@ -553,7 +632,7 @@




<apex:form id="allForm">


    <!-- OCM_OLY-435 追加 window.location.reload(false) 保存后刷新画面 しないと、triggerにて更新した値がVFに反映されない -->


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


    <apex:actionFunction name="save" action="{!save}" rerender="allForm" onComplete="checkMessage(true);unblockUI();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="" />


@@ -565,7 +644,8 @@


    </apex:actionRegion>


    <apex:actionFunction name="saveToSlip" action="{!ShippmentDetail}"  />


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


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


    <!-- 20230722 ljh -->


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


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


    </apex:actionFunction>


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


@@ -576,24 +656,18 @@


            <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();return false;" value="保存"/>


                </div>


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


            </apex:outputPanel>


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


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


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


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


        <!-- </div> -->


        <!-- 20230621 ljh start -->


            <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">


                    <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 class="tabsize">欠品</span></li>


@@ -606,7 +680,29 @@


                            </apex:outputPanel>


                        </ul>


                    </th>


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


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


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


                              <apex:commandButton styleClass="commandbutton" onclick="savejs();return false;" value="保存"/>


                          </div>


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


                      </apex:outputPanel> -->


                      <apex:outputPanel rendered="{!Step_status='追加' && !isSameCity}">


                          <apex:commandButton styleClass="commandbutton" onclick="qrsacn()" value="扫一扫申请书" rerender="dummy" />


                          <apex:commandButton styleClass="commandbutton" onclick="checkAllDetail();return false" value="全选" rerender="dummy" rendered="{! (!showTab2 || isEquipmentCenter)}"/>


                          <apex:commandButton styleClass="commandbutton" onclick="addToDetail();return false" value="保存" rerender="dummy" rendered="{! (!showTab2 || isEquipmentCenter)}"/>


                      </apex:outputPanel>


                      <apex:outputPanel rendered="{!Step_status!='追加'}">


                          <apex:commandButton styleClass="commandbutton" onclick="qrsacnDetail()" value="扫一扫备品" rerender="dummy" />


                          <apex:commandButton styleClass="commandbutton" onclick="checkAllDetail2();return false" value="全部OK" rerender="dummy" />


                          <apex:commandButton styleClass="commandbutton" onclick="savejs();return false;" value="保存"/>


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


                      </apex:outputPanel>


                      <input type="hidden" id="QRType" value="1"/>


                    </th>


                </tr>


            </table>


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


                <apex:outputPanel layout="none" rendered="{!Step_status='追加' && !isSameCity }" 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;">新建</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>


@@ -614,41 +710,31 @@


                    <apex:actionRegion >


                    <tr>


                        <td style="text-align: right">回寄-运输单号 ： </td>


                        <td align="left"><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="检索"/></td>


                        <td align="left">


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


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


                        </td>


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




                    </tr>


                    <tr>


                        <td style="text-align: right">回寄-{!$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;" id="DeliveryType"/></td>


                    </tr>


                    <tr>


                        <td style="text-align: right">回寄-{!$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">回寄-{!$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>


                    </apex:actionRegion>


                    <tr>


                        <td style="text-align: right">回寄-{!$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>


                        <td colspan="2"></td>


                    </tr>


                </apex:outputPanel>


            </table>




            <apex:outputPanel style="float: right;" rendered="{!Step_status='追加' && !isSameCity}">


                <apex:commandButton styleClass="commandbutton" onclick="qrsacn()" value="扫一扫申请书" rerender="dummy" />


                <apex:commandButton styleClass="commandbutton" onclick="checkAllDetail();return false" value="全选" rerender="dummy" rendered="{! (!showTab2 || isEquipmentCenter)}"/>


                <apex:commandButton styleClass="commandbutton" onclick="addToDetail();return false" value="保存" rerender="dummy" rendered="{! (!showTab2 || isEquipmentCenter)}"/>


            </apex:outputPanel>


            <apex:outputPanel style="float: right;" rendered="{!Step_status!='追加'}">


                <apex:commandButton styleClass="commandbutton" onclick="qrsacnDetail()" value="扫一扫备品" rerender="dummy" />


                <apex:commandButton styleClass="commandbutton" onclick="checkAllDetail2();return false" value="全部OK" rerender="dummy" />


            </apex:outputPanel>


            <input type="hidden" id="QRType" value="1"/>


           </apex:pageBlock>


        </div>


        <!-- 20230621 ljh end -->


        <apex:outputPanel id="detail">


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


            <apex:inputHidden value="{!ApplyId}" id="applyId"/>


@@ -663,12 +749,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}" />


                    </apex:outputPanel>


@@ -679,19 +770,32 @@


                        </apex:outputPanel>


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


                        <apex:outputPanel layout="none" rendered="{!esdInfo.showRaesCheck && !isSameCity}">


                        <input type="checkbox" name="raesCheck" data-resid2="{!esdInfo.rec.Rental_Apply_Equipment_Set__c}" onchange="checkDetail(this, '{!esdInfo.rec.Rental_Apply_Equipment_Set__c}')" /><input type="hidden" value="{!esdInfo.overtime}"/>


                            <!-- 20230722 ljh -->


                            <input type="checkbox" name="raesCheck" data-resid2="{!esdInfo.rec.Rental_Apply_Equipment_Set__c}" onchange="checkDetail(this, '{!esdInfo.rec.Rental_Apply_Equipment_Set__c}')" style="margin:0 0 0 0.75rem;" />


                            <input type="hidden" value="{!esdInfo.overtime}"/>


                        </apex:outputPanel>


                        <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>


                        <!-- 20230620 ljh 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> -->


                        <span style="padding: 5px 0.75rem;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>


                        <br/>


                        <!-- 20230620 ljh end -->


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


                    </apex:outputPanel>




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


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


                       <!-- 20230621 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>


                        <!-- 20230621 ljh end --> 


                        <br/>


                        <apex:outputPanel layout="none" rendered="{!esdInfo.showRaesCheck && !isSameCity}">


                        <input type="checkbox" name="raesCheck" data-resid2="{!esdInfo.rec.Rental_Apply_Equipment_Set__c}" onchange="checkDetail(this, '{!esdInfo.rec.Rental_Apply_Equipment_Set__c}')"/><input type="hidden" value="{!esdInfo.overtime}"/>


                        <input type="checkbox" name="raesCheck" data-resid2="{!esdInfo.rec.Rental_Apply_Equipment_Set__c}" onchange="checkDetail(this, '{!esdInfo.rec.Rental_Apply_Equipment_Set__c}')" style="margin:0 0 0 0.75rem;"/>


                        <input type="hidden" value="{!esdInfo.overtime}"/>


                        </apex:outputPanel>


                        <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>


                        <!-- lightning升级start   zyh   title -->


                        <span style="padding: 5px 0.75rem; 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> -->


                        <!-- lightning升级end   zyh   title -->


                    </apex:outputPanel>


                    <div class="rtop">


                        <div class="r1"></div>


@@ -704,9 +808,13 @@


                        <apex:outputPanel layout="none" rendered="{!esdInfo.rec.Return_DeliverySlip__c == null && esdInfo.rec.Lost_item_giveup__c == false && esdInfo.rec.Check_lost_Item_F__c != '消耗'}">


                            <input disabled="disabled" type="checkbox" data-resid="{!esdInfo.rec.Rental_Apply_Equipment_Set__c}" name="raesdCheck" value="{!esdInfo.rec.Id}" data-lost="{!esdInfo.rec.Check_lost_Item_Final__c == '欠品' || esdInfo.rec.Check_lost_Item__c == '欠品'}" style="float: right;"/>


                        </apex:outputPanel>


                        <!-- 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>


                    <!-- TODO 回库はSet単位で、明細一つ一つのquickCheck要らないが、SetのquickCheck要る？ -->


                    <ul>


                    <!-- 20230721 ljh -->


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


                        <li><span>{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.Received_Confirm__c.label}： </span>


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


                        </li>


@@ -715,14 +823,23 @@


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


                        </li>


                        </apex:outputPanel>


                        <li>


                        <!-- 2023-08-01 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-01 zyh 机身编码换位置 -->


                        <li>


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


                            <apex:inputField rendered="{!NOT(esdInfo.rec.Return_DeliverySlip__c != null)}" id="noitem" value="{!esdInfo.rec.NoItemReturn__c}" style="margin:3px;width:75px;" onchange="checkNoItem(this, '{!esdInfo.rec.Id}')"/>


                            <span><apex:outputField rendered="{!esdInfo.rec.Return_DeliverySlip__c != null}" value="{!esdInfo.rec.NoItemReturn__c}" style="margin:3px;width:75px;"/></span>


                            <!-- 20230621 ljh start-->


                            <!-- <apex:inputField rendered="{!NOT(esdInfo.rec.Return_DeliverySlip__c != null)}" id="noitem" value="{!esdInfo.rec.NoItemReturn__c}" style="margin:3px;width:75px;" onchange="checkNoItem(this, '{!esdInfo.rec.Id}')"/> -->


                            <apex:outputPanel layout="none" rendered="{!NOT(esdInfo.rec.Return_DeliverySlip__c != null)}">


                            <span><apex:inputField id="noitem" value="{!esdInfo.rec.NoItemReturn__c}"  onchange="checkNoItem(this, '{!esdInfo.rec.Id}')"/></span>


                            </apex:outputPanel>


                            <!-- 20230621 ljh end -->


                            <apex:outputPanel layout="none" rendered="{!esdInfo.rec.Return_DeliverySlip__c != null}">


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


                            </apex:outputPanel>


                        </li>


                    </ul>


                    </div>


@@ -743,16 +860,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/> -->


                    </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>


                        <!-- 20230722 ljh -->


                        <!-- <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> -->


                        <span style="padding: 5px 0.75rem;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>


                        <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>


                        <!-- <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> -->


                        <span style="padding: 5px 0.75rem;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>


                    </apex:outputPanel>


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


                    <div class="rtop">


@@ -772,84 +892,180 @@


                    </apex:outputPanel>


                    <div class="menu">


                    <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;<!-- <apex:commandButton styleClass="commandbutton" onclick="deleteDetailJs(this)" style="float:right;margin-top: -2px;" value="删除" rerender="dummy"/><input type="hidden" value="{!esdInfo.rec.Id}"/> --></div>


                    <h2><div class="m_title">&nbsp;<apex:outputField value="{!esdInfo.rec.Fixture_Name_F__c}" />


                   &nbsp;&nbsp;<!-- <apex:commandButton styleClass="commandbutton" onclick="deleteDetailJs(this)" style="float:right;margin-top: -2px;" value="删除" rerender="dummy"/><input type="hidden" value="{!esdInfo.rec.Id}"/> -->


                        <!-- 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>


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


                    <h2><div class="m_titleg">&nbsp;<apex:outputField value="{!esdInfo.rec.Fixture_Name_F__c}" />&nbsp;&nbsp;<!-- <apex:commandButton styleClass="commandbutton" onclick="deleteDetailJs(this)" style="float:right;margin-top: -2px;" value="删除" rerender="dummy"/><input type="hidden" value="{!esdInfo.rec.Id}"/>已回收 --></div>


                    <h2><div class="m_titleg">&nbsp;<apex:outputField value="{!esdInfo.rec.Fixture_Name_F__c}" />&nbsp;&nbsp;<!-- <apex:commandButton styleClass="commandbutton" onclick="deleteDetailJs(this)" style="float:right;margin-top: -2px;" value="删除" rerender="dummy"/><input type="hidden" value="{!esdInfo.rec.Id}"/>已回收 -->


                        <!-- 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>


                    <!-- 20230620 ljh 欠品 -------------- -->


                    <!-- TODO 回库はSet単位で、明細一つ一つのquickCheck要らないが、SetのquickCheck要る？ -->


                    <ul data-qr="{!esdInfo.rec.Fixture_QRCode_F__c}" style="font-size:14px;">


                    <!-- 20230721 ljh -->


                    <ul data-qr="{!esdInfo.rec.Fixture_QRCode_F__c}" style="font-size:14px;padding: 1px 0.75rem;">


                        <apex:inputField value="{!esdInfo.rec.Loaner_accsessary__c}" style="display:none"/>


                        <apex:outputPanel layout="none" rendered="{!IF(OR(esdInfo.rec.Check_lost_Item__c='OK',esdInfo.rec.Check_lost_Item__c=''), true, false)}">


                        <span>&nbsp;&nbsp;&nbsp;&nbsp;{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Check_lost_Item__c.label} ： </span>


                        <apex:outputPanel layout="none" rendered="{!(esdInfo.editable)}"><apex:inputField id="checkLost" value="{!esdInfo.rec.Check_lost_Item__c}" style="margin:3px;width:75px" onchange="changeCheckLost(this)"/></apex:outputPanel>


                        <apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable))}"><apex:outputField value="{!esdInfo.rec.Check_lost_Item__c}" style="margin:3px;width:75px" /></apex:outputPanel>


                        <li>


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


                           <span>欠品结果（最初）：</span>


                           <apex:outputPanel layout="none" rendered="{!(esdInfo.editable)}">


                              <apex:inputField id="checkLost" value="{!esdInfo.rec.Check_lost_Item__c}"  onchange="changeCheckLost(this)"/>


                        </apex:outputPanel>


                           <apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable))}">


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


                          </apex:outputPanel>


                        </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   )}">


                        <span>&nbsp;&nbsp;&nbsp;&nbsp;{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Check_lost_Item__c.label} ： </span>


                        <apex:outputField id="checkLost3" value="{!esdInfo.rec.Check_lost_Item__c}" style="margin:3px;width:75px"/><br/>


                        <span>&nbsp;&nbsp;&nbsp;&nbsp;{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Check_lost_Item_Final__c.label} ： </span>


                        <apex:outputPanel layout="none" rendered="{!(esdInfo.editable && esdInfo.rec.Check_lost_Item_Final__c != '消耗')}"><apex:inputField id="checkLost2" value="{!esdInfo.rec.Check_lost_Item_Final__c}" style="margin:3px;width:75px" onchange="changeCheckLost(this)"/></apex:outputPanel>


                        <apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable) || esdInfo.rec.Check_lost_Item_Final__c == '消耗')}"><apex:outputField id="checkLost4" value="{!esdInfo.rec.Check_lost_Item_Final__c}" style="margin:3px;width:75px" /></apex:outputPanel>


                        <li>


                           <!-- 20230623 ljh  start-->


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


                           <span>欠品结果（最初）：</span>


                           <!-- 20230623 ljh  end-->


                           <apex:outputField id="checkLost3" value="{!esdInfo.rec.Check_lost_Item__c}" style="margin:3px;width:75px"/>


                        </li>


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


                        <!-- <li> 


                           <span>欠品结果（最终）：</span>


                           <apex:outputPanel layout="none" rendered="{!(esdInfo.editable && esdInfo.rec.Check_lost_Item_Final__c != '消耗')}">


                              <span><apex:inputField id="checkLost2" value="{!esdInfo.rec.Check_lost_Item_Final__c}" style="margin:3px;width:75px" onchange="changeCheckLost(this)"/></span>


                          </apex:outputPanel>


                           <apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable) || esdInfo.rec.Check_lost_Item_Final__c == '消耗')}">


                              <span><apex:outputField id="checkLost4" value="{!esdInfo.rec.Check_lost_Item_Final__c}" style="margin:3px;width:75px" /></span>


                          </apex:outputPanel>


                       </li> -->


                        </apex:outputPanel>


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


                        <input type="hidden" name="noSlip" value="1"/>


                        </apex:outputPanel>


                        <br/>


                        <span>&nbsp;&nbsp;&nbsp;&nbsp;{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.NoItemReturn__c.label}： </span>


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


                        <br/>


                        <span>&nbsp;&nbsp;&nbsp;&nbsp;{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Lost_item_Memo__c.label}： </span>


                        <!-- <li>


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


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


                       </li> -->


                       <li>


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


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


                        <apex:inputField id="lostMemo" value="{!esdInfo.rec.Lost_item_Memo__c}" style="margin:3px;width:75px;"/>


                              <span><apex:inputField id="lostMemo" value="{!esdInfo.rec.Lost_item_Memo__c}" style="width:75px;"/>


                              </span>


                        </apex:outputPanel>


                        <apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable) || (esdInfo.rec.Check_lost_Item__c != null && esdInfo.rec.Check_lost_Item__c != 'OK'))}">


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


                              <span><apex:outputField value="{!esdInfo.rec.Lost_item_Memo__c}" style="width:75px;"/></span>


                           </apex:outputPanel>


                        </li>


                        <!-- 20230722 ljh 最终一对 start -->


                        <apex:outputPanel layout="none" rendered="{!IF(OR(esdInfo.rec.Check_lost_Item__c='OK',esdInfo.rec.Check_lost_Item__c=''), false, true)}">


                       <li> 


                           <span>欠品结果（最终）：</span>


                           <apex:outputPanel layout="none" rendered="{!(esdInfo.editable && esdInfo.rec.Check_lost_Item_Final__c != '消耗')}">


                              <apex:inputField id="checkLost2" value="{!esdInfo.rec.Check_lost_Item_Final__c}" style="margin:3px;width:75px" onchange="changeCheckLost(this)"/>


                          </apex:outputPanel>


                           <apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable) || esdInfo.rec.Check_lost_Item_Final__c == '消耗')}">


                              <span><apex:outputField id="checkLost4" value="{!esdInfo.rec.Check_lost_Item_Final__c}" style="margin:3px;width:75px" /></span>


                          </apex:outputPanel>


                      </li>


                        </apex:outputPanel>


                        <apex:outputPanel layout="none" rendered="{!esdInfo.rec.Check_lost_Item__c != null && esdInfo.rec.Check_lost_Item__c != 'OK' }">


                            <br/>


                            <span>&nbsp;&nbsp;&nbsp;&nbsp;{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Lost_item_Memo_Final__c.label}： </span>


                           <li>


                               <span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__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;width:75px;"/>


                                  <span><apex:inputField id="lostMemo2" value="{!esdInfo.rec.Lost_item_Memo_Final__c}" style="width:75px;"/></span>


                            </apex:outputPanel>


                            <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;width:75px;"/>


                                  <span><apex:outputField value="{!esdInfo.rec.Lost_item_Memo_Final__c}" style="width:75px;"/></span>


                            </apex:outputPanel>


                           </li>


                        </apex:outputPanel>


                        <br/>


                        <!-- 20230722 ljh 最终一对end-->


                        <li>


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


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


                       </li>


                        <!-- <apex:outputPanel layout="none" rendered="{!esdInfo.rec.Check_lost_Item__c != null && esdInfo.rec.Check_lost_Item__c != 'OK' }">


                           <li>


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


                               <apex:outputPanel layout="none" rendered="{!esdInfo.editable && esdInfo.rec.Check_lost_Item_Final__c != '消耗'}">


                                  <span><apex:inputField id="lostMemo2" value="{!esdInfo.rec.Lost_item_Memo_Final__c}" style="width:75px;"/></span>


                               </apex:outputPanel>


                               <apex:outputPanel layout="none" rendered="{!NOT(esdInfo.editable) || esdInfo.rec.Check_lost_Item_Final__c == '消耗'}">


                                  <span><apex:outputField value="{!esdInfo.rec.Lost_item_Memo_Final__c}" style="width:75px;"/></span>


                               </apex:outputPanel>


                           </li>


                        </apex:outputPanel> -->


                        <apex:outputPanel layout="none" rendered="{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Lost_item_giveup__c.accessible}">


                        &nbsp;&nbsp;&nbsp;&nbsp;{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Lost_item_giveup__c.label} ： <apex:outputPanel layout="none" rendered="{!(esdInfo.editable && NOT(esdInfo.rec.Lost_item_giveup__c) && esdInfo.rec.Check_lost_Item_Final__c != '消耗')}"><apex:inputField id="checkboxGiveUp" value="{!esdInfo.rec.Lost_item_giveup__c}"/></apex:outputPanel>


                        <apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable) || esdInfo.rec.Lost_item_giveup__c || esdInfo.rec.Check_lost_Item_Final__c == '消耗')}"><apex:outputField value="{!esdInfo.rec.Lost_item_giveup__c}"/></apex:outputPanel>


                        <br/>


                        <li>


                           <span>


                              {!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Lost_item_giveup__c.label} ： 


                          </span>


                           <apex:outputPanel layout="none" rendered="{!(esdInfo.editable && NOT(esdInfo.rec.Lost_item_giveup__c) && esdInfo.rec.Check_lost_Item_Final__c != '消耗')}">


                              <span><apex:inputField id="checkboxGiveUp" value="{!esdInfo.rec.Lost_item_giveup__c}"/></span>


                        </apex:outputPanel>


                        <span>&nbsp;&nbsp;&nbsp;&nbsp;{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.CDS_complete__c.label} ： </span>


                           <apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable) || esdInfo.rec.Lost_item_giveup__c || esdInfo.rec.Check_lost_Item_Final__c == '消耗')}">


                              <span><apex:outputField value="{!esdInfo.rec.Lost_item_giveup__c}"/></span>


                          </apex:outputPanel>


                       </li>


                        </apex:outputPanel>


                        <li>


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


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


                            <apex:outputPanel layout="none" rendered="{!(esdInfo.editable && esdInfo.rec.Check_lost_Item_Final__c != '消耗')}"><apex:inputField id="checkboxCDS" value="{!esdInfo.rec.CDS_complete__c}" onchange="changeCheckCds(this);"/></apex:outputPanel>


                            <apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable) || esdInfo.rec.Check_lost_Item_Final__c == '消耗')}"><apex:outputField value="{!esdInfo.rec.CDS_complete__c}"/></apex:outputPanel>


                               <apex:outputPanel layout="none" rendered="{!(esdInfo.editable && esdInfo.rec.Check_lost_Item_Final__c != '消耗')}">


                                  <span><apex:inputField id="checkboxCDS" value="{!esdInfo.rec.CDS_complete__c}" onchange="changeCheckCds(this);"/></span>


                        </apex:outputPanel>


                               <apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable) || esdInfo.rec.Check_lost_Item_Final__c == '消耗')}">


                                  <span><apex:outputField value="{!esdInfo.rec.CDS_complete__c}"/></span>


                              </apex:outputPanel>


                           </apex:outputPanel>


                       </li>


                        <apex:outputPanel layout="none" rendered="{!IF(esdInfo.rec.Return_DeliverySlip__c=null, false, esdInfo.rec.Is_Body__c)}">


                            <br/>


                            <span>&nbsp;&nbsp;&nbsp;&nbsp;{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.CDSChargement__c.label} ： </span>


                            <apex:outputPanel layout="none" rendered="{!(esdInfo.editable && esdInfo.rec.Check_lost_Item_Final__c != '消耗')}"><apex:inputField id="CDSChargement" value="{!esdInfo.rec.CDSChargement__c}"/></apex:outputPanel>


                            <apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable) || esdInfo.rec.Check_lost_Item_Final__c == '消耗')}"><apex:outputField value="{!esdInfo.rec.CDSChargement__c}"/></apex:outputPanel>


                            <br/>


                            <span>&nbsp;&nbsp;&nbsp;&nbsp;{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.CDSType__c.label} ： </span>


                            <apex:outputPanel layout="none" rendered="{!(esdInfo.editable && esdInfo.rec.Check_lost_Item_Final__c != '消耗')}"><apex:inputField id="CDSType" value="{!esdInfo.rec.CDSType__c}"/></apex:outputPanel>


                            <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>


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


                               <apex:outputPanel layout="none" rendered="{!(esdInfo.editable && esdInfo.rec.Check_lost_Item_Final__c != '消耗')}">


                                  <span><apex:inputField id="CDSChargement" value="{!esdInfo.rec.CDSChargement__c}"/></span>


                        </apex:outputPanel>


                        <br/>


                        <span>&nbsp;&nbsp;&nbsp;&nbsp;{!$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>


                               <apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable) || esdInfo.rec.Check_lost_Item_Final__c == '消耗')}">


                                  <span><apex:outputField value="{!esdInfo.rec.CDSChargement__c}"/></span>


                              </apex:outputPanel>


                            </li>


                            <li>


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


                               <apex:outputPanel layout="none" rendered="{!(esdInfo.editable && esdInfo.rec.Check_lost_Item_Final__c != '消耗')}">


                                  <span><apex:inputField id="CDSType" value="{!esdInfo.rec.CDSType__c}"/></span>


                              </apex:outputPanel>


                               <apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable) || esdInfo.rec.Check_lost_Item_Final__c == '消耗')}">


                                  <span><apex:outputField value="{!esdInfo.rec.CDSType__c}"/>


                              </span>


                              </apex:outputPanel>


                          </li>


                        </apex:outputPanel>


                        <!-- 2023-08-01 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> -->


                        <!-- 2023-08-01 zyh 机身编码换位置 -->


                    </ul>


                    </div>


                    <div class="rbottom">


                    <!-- <div class="rbottom">


                        <div class="r4"></div>


                        <div class="r3"></div>


                        <div class="r2"></div>


                        <div class="r1"></div>


                    </div>


                    </div> -->


                </apex:outputPanel>


                <apex:inputCheckbox Id="bbbaaa" value="{!esdInfo.isChecked}" style="display: none"/>


                </apex:repeat>