Merge branch 'LEX_dev' of http://47.92.229.245:8089/r/lightningupdate into ...

zhangqian

2023-07-19 c93907a931ee119592587eface8d730f80d9ef18

Merge branch 'LEX_dev' of http://47.92.229.245:8089/r/lightningupdate into LEX_dev

 force-app/main/default/pages/TransferApplyResponse.page

@@ -7,14 +7,14 @@
    //blockme();
    window.open('/apex/TransferApplyResponsePopUp?raid=' + '{!URLENCODE(TransferApply__c.Id)}' + '&type=responsebefore',
                'TransferApplyDate',
                'height=400,width=600,top=0,left=0,toolbar=no,menubar=no,scrollbars=no,resizable=no,location=no,status=no');
                'height=600,width=600,top=0,left=0,toolbar=no,menubar=no,scrollbars=no,resizable=no,location=no,status=no');
}

function touserjs() {
    //blockme();
    window.open('/apex/TransferApplyResponsePopUp?raid=' + '{!URLENCODE(TransferApply__c.Id)}' + '&type=responseafter',
                'TransferApplyDate',
                'height=400,width=600,top=0,left=0,toolbar=no,menubar=no,scrollbars=no,resizable=no,location=no,status=no');
                'height=600,width=600,top=0,left=0,toolbar=no,menubar=no,scrollbars=no,resizable=no,location=no,status=no');
}
function reloadjs() {
    //blockme();

 force-app/main/default/pages/TransferApplyResponsePopUp.page

@@ -30,6 +30,12 @@
    // 20211123 ljh 应答沟通 update end
}
</script>
<!-- 20230718 ljh add -->
<style type="text/css">
    table.mytable tr{
        height:35px;
    }
</style>
    <apex:form id="allForm">
        <!-- 20211105 ljh 应答沟通 update start -->
        <!-- <apex:actionFunction name="savebtn" action="{!saveBtn}" rerender="allPanel,message" onComplete="unblockUI();refreshparent();"> -->
@@ -43,7 +49,8 @@
        <apex:outputPanel id="allPanel">
            <apex:pageBlock title="{!$ObjectType.TransferApply__c.fields.Response__c.label}" id="allBlock">
                <apex:pageBlockButtons location="top">
                    <apex:commandButton onclick="j$(this).prop('disabled', true).addClass('btnDisabled'); savejs(); return false;" value="发送" rerender="dummy"/>
                    <!-- 20230718 ljh add style="margin-right:10px" -->
                    <apex:commandButton onclick="j$(this).prop('disabled', true).addClass('btnDisabled'); savejs(); return false;" value="发送" rerender="dummy" style="margin-right:10px"/>
                    <apex:commandButton onclick="canceljs(); return false;" value="取消" rerender="dummy"/>
                </apex:pageBlockButtons>
                <!-- 20211105 ljh 应答沟通 update start -->
@@ -54,7 +61,7 @@
                <apex:outputText id="raid" value="{!raid}" style="display:none"/>
                <!-- <apex:outputText id="hasError" value="{!hasError}" style="display:none"/> -->
                <!-- 20211105 ljh 应答沟通 update end -->
                <table>
                <table class="mytable">
                    <tr>
                        <td>To：</td>
                        <td>

 force-app/main/default/pages/TransferApplySelectDetail.page

@@ -3,7 +3,38 @@
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:includeScript value="{!URLFOR($Resource.RelationListPagingCmpJS)}"/>

<apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/><!-- 20230619 ljh lightning  -->    
<!-- 20230703 ljh add -->
<style type="text/css">
    table.list .col_Fixture_Model_No__c  {width:100px;} 
    table.list .col_SerialNumber__c  {width:100px;} 
    table.list .col_Internal_Asset_number_key__c  {width:150px;} 
    table.list .col_Internal_asset_location__c  {width:100px;} 
    table.list .col_Product_category__c  {width:150px;} 
    table.list .col_Salesdepartment__c  {width:100px;} 
    table.list .col_Salesdepartment_After__c  {width:150px;} 
    table.list .col_SalesProvince__c  {width:100px;} 
    table.list .col_SalesProvince_After__c  {width:150px;} 
    table.list .col_Equipment_Type__c  {width:100px;} 
    table.list .col_Equipment_Type_After__c  {width:150px;} 
    table.list .col_EquipmentSet_Managment_Code__c  {width:100px;} 
    table.list .col_EquipmentSet_Managment_Code_After__c  {width:150px;} 
    table.list .col_Main_OneToOne__c  {width:100px;} 
    table.list .col_OneToOneAccessory__c  {width:100px;} 
    table.list .col_Manage_type__c  {width:100px;} 
    table.list .col_Loaner_accsessary__c  {width:100px;} 
    table.list .col_VF_You_Xiao_Ku_Cun__c  {width:100px;} 
    table.list .col_VF_TransferCount__c  {width:100px;} 
    table.list .col_VF_Abandoned_RealThing__c {width:100px;} 
    table.list .col_VF_TransferCount_Abandoned__c {width:100px;} 
    table.list .col_VF_CountForRepair__c  {width:100px;}
    table.list .col_VF_TransferCount_Repair__c  {width:100px;}
    table.list .col_VF_Abandoned_Inventory__c  {width:100px;}
    table.list .col_VF_TransferCount_Lost__c {width:100px;}
    .mySearch tr{
        height: 40px;
    }
</style>
<script type="text/javascript">
    var heightAjustment = 120;
    var widthAjustment = 30;
@@ -148,6 +179,7 @@
            <apex:outputPanel id="popupBox" layout="block">
                <input type="file" id="file_input" name="attFile" accept=".csv" /><br/>
                <center>
                    <input type="hidden" name="hidden" /> <!-- 20230710 ljh 为了按钮对齐 -->
                    <apex:commandButton value="确认" onclick="remoteLocationPost(); return false;" style="width: 20%; margin: 20px 10px 0px 10px" />
                    <apex:commandButton value="取消" onclick="popupBox.hide();" style="width: 20%; margin: 20px 10px 0px 10px" />
                </center>
@@ -156,10 +188,12 @@
        <apex:outputPanel id="pageallPanel">
            <apex:pageBlock id="searchBlock" tabStyle="Report">
                <apex:outputPanel layout="none" rendered="{!!isComeFromRa}">
                <table>
                <!-- 20230710 ljh  -->
                <table class="mySearch">
                    <tr>
                        <td colspan="3" style="padding-top:2px;">关键字<apex:inputText value="{!keyword}"/> </td>
                        <td colspan="3" style="padding-top:2px;">固定资产编号(Key)<apex:inputText value="{!assetnumber}" /></td>
                        <!-- 20230710 ljh  align="right" -->
                        <td colspan="3" style="padding-top:2px;" align="right">固定资产编号(Key)<apex:inputText value="{!assetnumber}" /></td>
                        <td style="padding-left:5px;padding-top:2px;"><apex:commandButton disabled="{!readonly}" value="检索" onclick="searchOppJs(); return false;"/></td>
                        <td style="padding-left:5px;padding-top:2px;"><apex:commandButton action="{!turnback}" value="返回" rerender="allForm,checEventFrame"/></td>
                        <td style="padding-left:5px;padding-top:2px;"><apex:commandButton disabled="{!readonly}" onclick="openPopupCSV(); return false;" value="批量导入" rerender="allForm,checEventFrame"/></td>
@@ -177,7 +211,8 @@
                                <apex:selectOptions value="{!salesProvinceOpts}"/>
                            </apex:selectList>
                        </td>
                        <td colspan="2" style="padding-top:2px;">备品分类
                        <!-- 20230710 ljh  align="right" -->
                        <td colspan="2" style="padding-top:2px;" align="right" >备品分类
                            <apex:selectList id="equipmentTypeOpts" size="1">
                                <apex:selectOptions value="{!equipmentTypeOpts}"/>
                            </apex:selectList>

 force-app/main/default/pages/TransferApplySelectDetailSub.page

@@ -5,7 +5,31 @@
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:includeScript value="{!URLFOR($Resource.RelationListPagingCmpJS)}"/>

<apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/><!-- 20230619 ljh lightning  -->    
<!-- 20230718 ljh add -->
<style type="text/css">
    table.list .col_Fixture_Model_No__c  {width:100px;} 
    table.list .col_SerialNumber__c  {width:100px;} 
    table.list .col_Internal_Asset_number_key__c  {width:150px;} 
    table.list .col_Internal_asset_location__c  {width:100px;} 
    table.list .col_Product_category__c  {width:150px;} 
    table.list .col_Salesdepartment__c  {width:100px;} 
    table.list .col_Salesdepartment_After__c  {width:150px;} 
    table.list .col_SalesProvince__c  {width:100px;} 
    table.list .col_SalesProvince_After__c  {width:150px;} 
    table.list .col_Equipment_Type__c  {width:100px;} 
    table.list .col_Equipment_Type_After__c  {width:150px;} 
    table.list .col_EquipmentSet_Managment_Code__c  {width:100px;} 
    table.list .col_EquipmentSet_Managment_Code_After__c  {width:150px;} 
    table.list .col_Main_OneToOne__c  {width:100px;} 
    table.list .col_OneToOneAccessory__c  {width:100px;} 
    table.list .col_Manage_type__c  {width:100px;} 
    table.list .col_Loaner_accsessary__c  {width:100px;} 
    table.list .col_IsPerfect__c  {width:160px;} 
    .mySearch tr{
        height: 40px;
    }
</style>
<script type="text/javascript">
var heightAjustment = 120;
var widthAjustment = 30;
@@ -42,7 +66,7 @@
        <apex:actionFunction action="{!saveAndSearchGoPage}" name="saveAndSearchGoPage" rerender="allForm, message, checEventFrame" status="statusPreload"  oncomplete="unblockUI();"/>
        <apex:outputPanel id="pageallPanel">
            <apex:pageBlock id="searchBlock" tabStyle="Report">
                <table>
                <table class="mySearch">
                    <tr>
                        <td colspan="1">关键字<apex:inputText value="{!keyword}"/> </td>
                        <td colspan="1">固定资产编号(Key)<apex:inputText value="{!assetnumber}" /></td>
@@ -54,8 +78,10 @@
                        </apex:selectList>
                        </td>
                        <!-- //add by rentx 2021-05-07 start 1802 end -->
                        <td><apex:commandButton value="检索" onclick="searchOppJs(); return false;"/></td>
                        <td><apex:commandButton action="{!turnback}" value="返回" rerender="allForm,checEventFrame"/></td>
                        <!-- 20230719 ljh 表格在一个框中 -->
                        <td><apex:commandButton value="检索" onclick="searchOppJs(); return false;"/>
                            <apex:commandButton action="{!turnback}" value="返回" rerender="allForm,checEventFrame"/>
                        </td>
                        <!-- <td><apex:commandButton action="{!turnback}" value="批量导入" rerender="allForm,checEventFrame"/></td> -->
                    </tr>
                    <tr>
@@ -77,9 +103,11 @@
                        <td colspan="1">是否已受理完善备品信息
                            <input type="checkbox" id="isPerfect"/>
                        </td>
                        <td><apex:commandButton action="{!changeEdit}" value="编辑" onclick="blockme();" reRender="allForm,checEventFrame" oncomplete="unblockUI();"/></td>
                        <td><apex:commandButton value="适用" reRender="allForm" onclick="applyJs(); return false;"/></td>
                        <td><apex:commandButton action="{!savePage}" value="保存" onclick="blockme();" rerender="allForm,checEventFrame" oncomplete="unblockUI();" /></td>
                        <!-- 20230719 ljh 表格在一个框中 -->
                        <td><apex:commandButton action="{!changeEdit}" value="编辑" onclick="blockme();" reRender="allForm,checEventFrame" oncomplete="unblockUI();"/>
                            <apex:commandButton value="适用" reRender="allForm" onclick="applyJs(); return false;"/>
                            <apex:commandButton action="{!savePage}" value="保存" onclick="blockme();" rerender="allForm,checEventFrame" oncomplete="unblockUI();" />
                        </td>
                    </tr>
                </table>
                <div style="clear:both;"></div>

 force-app/main/default/pages/TransferShippmentReceived1.page

@@ -86,11 +86,12 @@
</script>
<style type="text/css">
    .menu div.m_title{
        width: 308px;
        /* width: 308px; *//* 20230718 ljh  */
        text-align: left;
        margin: 0;
        background:#DCDCDC;
        border-radius:8px 8px 0 0;
        padding-left: 0.75rem;/*20230628 ljh*/
    }
    .menu {
        border-radius:8px;
@@ -113,13 +114,17 @@
        position: relative;
        /* 20230423 ljh lightning升级start */
        /* width: 20%; */
        width: 30%;
        width: 50%;
        /* 20230423 ljh lightning升级end */
        float: left;
        margin: 0;
        padding: 0;
        text-align: center;
        cursor: pointer;
        /*20230616 ljh*/
        height:30px;
        line-height: 30px;
        /*20230616 ljh*/
    }
    #Step_tab li span {
        margin: 0;
@@ -137,7 +142,7 @@
    }

    div#main {
        width: 320px;
        /* width: 320px; */
    }

    hr {
@@ -145,7 +150,10 @@
        color: #fff;
        background-color: #fff;
        height: 1px;
        width: 90%;
        /*20230620 ljh*/
        /*width: 90%;*/
        width: 98%;
        /*20230620 ljh*/
    }
    .close {
        color: #aaaaaa;
@@ -165,6 +173,11 @@
        list-style: none;
        border-top: 1px solid #ddd;
    }
    /*20230625 ljh */
    .errorMsg{
        width: 140px;
    }
    /*20230625 ljh */
</style>
<div id="myModal" class="modal">

@@ -191,7 +204,7 @@
            <apex:outputPanel id="message">
                <apex:pageMessages />
            </apex:outputPanel>
            <div style="text-align: right;margin-top: 10px;">
            <!-- <div style="text-align: right;margin-top: 10px;">
                <apex:commandButton styleClass="commandbutton" onclick="savejs();" value="保存" rerender="dummy" rendered="{!IF(open_type='web', true, false)}" disabled="{!saveBtnDisabled}"/>
            </div>
            <apex:outputText id="saveBtnDisabled" value="{!saveBtnDisabled}" style="display: none;"/>
@@ -201,7 +214,7 @@
                    <col width="170" />
                </colgroup>
                <tr>
                    <!-- 状态切换btn -->
                    状态切换btn
                    <th colspan="2" style="font-size:20px;text-align: center;width:380px;">
                        <ul id="Step_tab">
                        <apex:outputPanel layout="none" rendered="{!IF(SR_status='Shippment', true, false)}">
@@ -218,10 +231,37 @@
            <div style="text-align: right">
                <apex:commandButton styleClass="commandbutton" onclick="qrsacn()" value="扫一扫" rerender="dummy" rendered="{!IF(Step_status='下架', true, false)}"/>
                <apex:commandButton styleClass="commandbutton" onclick="filljs1(this);" value="全部OK" rerender="dummy" rendered="{!IF(Step_status='下架', true, false)}"/>
            </div>
            </div> -->
            <apex:pageBlock >
                <table style="border-collapse: collapse; font-size:13px;">
                    <colgroup>
                        <col width="20%" />
                        <col width="80%" />
                    </colgroup>
                    <tr>
                        <!-- 状态切换btn -->
                        <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(SR_status='Shippment', true, false)}">
                                <apex:outputPanel layout="none" rendered="{!IF(Step_status='下架', true, false)}">
                                    <li class="selected" ><span class="tabsize">下架</span></li>
                                    <li onclick="javascript:Shippment2();"><span class="tabsize">出库检测</span></li>
                                </apex:outputPanel>
                            </apex:outputPanel>
                            </ul>
                        </th>                    
                        <th width="900px;" style="padding-left:50px;" class="myBtn" >
                            <apex:commandButton styleClass="commandbutton" onclick="qrsacn()" value="扫一扫" rerender="dummy" rendered="{!IF(Step_status='下架', true, false)}"/>
                            <apex:commandButton styleClass="commandbutton" onclick="filljs1(this);" value="全部OK" rerender="dummy" rendered="{!IF(Step_status='下架', true, false)}"/>
                            <!-- 20230616 ljh  start-->
                            <apex:commandButton styleClass="commandbutton" onclick="savejs();" value="保存" rerender="dummy" rendered="{!IF(open_type='web', true, false)}" disabled="{!saveBtnDisabled}"/>
                            <!-- 20230616 ljh  end-->
                        </th>
                    </tr>
                </table>
            </apex:pageBlock>
        </div>
        <apex:outputPanel id="detail">

        <div id="detailDiv" class="detail">
            <apex:variable var="indexloop" value="{!0}" />
            <apex:variable var="SetName" value="" />
@@ -229,20 +269,22 @@
                <apex:variable var="indexloop" value="{!indexloop+1}"/>
                <apex:variable var="SetName" value="{!IF(SetName='', esdInfo.rec.TransferApplySummary__c, SetName)}" />
                <apex:outputPanel layout="none" rendered="{!IF(SetName=esdInfo.rec.TransferApplySummary__c && indexloop != 1, true, false)}">
                    <br/>
                    <!-- <br/> -->
                </apex:outputPanel>
                <apex:outputPanel layout="none" rendered="{!IF(SetName=esdInfo.rec.TransferApplySummary__c, false, true)}">
                    <hr/>
                    <h3 style="padding: 5px;" class="detailtab">{!esdInfo.fsName}</h3>
                    <!-- 20230718 ljh -->
                    <h3 style="padding: 5px 0.75rem;" class="detailtab">{!esdInfo.fsName}</h3>
                    <apex:variable var="SetName" value="{!esdInfo.rec.TransferApplySummary__c}" />
                </apex:outputPanel>
                <apex:outputPanel layout="none" rendered="{!IF(indexloop == 1, true, false)}">
                    <h3 style="padding: 5px;" class="detailtab">{!esdInfo.fsName}</h3>
                    <!-- 20230718 ljh -->    
                    <h3 style="padding: 5px 0.75rem;" class="detailtab">{!esdInfo.fsName}</h3>
                </apex:outputPanel>
                <div class="menu">
                <h2><div class="m_title">&nbsp;<apex:outputField value="{!esdInfo.rec.Fixture_Name_F__c}" />&nbsp;&nbsp;
                </div></h2>
                <ul style="{!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}">
                <ul style="padding: 1px 0.75rem;{!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}">
                    <apex:outputPanel layout="none" rendered="{!IF(Step_status='下架', true, false)}">
                        <li data-qr="{!esdInfo.rec.Fixture_QRCode_F__c}">
                            <span>{!$ObjectType.TransferApplyDetail__c.fields.StockDown__c.label}： </span>
@@ -270,6 +312,11 @@
                            <span>{!$ObjectType.Asset.fields.WH_location__c.label}： </span>
                            <span><apex:outputField value="{!esdInfo.rec.Asset__r.WH_location__c}" style="margin:3px;width:75px;"/></span>
                        </li>
                        <!-- 20230718 ljh  换到下架确认下面-->
                        <li>
                            <span>{!$ObjectType.TransferApplyDetail__c.fields.SerialNumber_F__c.label}： </span>
                            <span><apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;width:75px;"/></span>
                        </li>
                        <li>
                            <span>上次回收后检测时间： </span>
                            <span><apex:outputField value="{!esdInfo.rec.Asset__r.Pre_Reserve_TAES_Detail__r.After_Inspection_time__c}" style="margin:3px;width:75px;"/></span>
@@ -278,10 +325,12 @@
                            <span>{!$ObjectType.TransferApplyDetail__c.fields.Pre_After_Inspection_elapsed_days__c.label}： </span>
                            <span><apex:outputField value="{!esdInfo.rec.Pre_After_Inspection_elapsed_days__c}" style="margin:3px;width:75px;"/></span>
                        </li>
                        <!-- 
                            换到下架确认下面
                        <li>
                            <span>{!$ObjectType.TransferApplyDetail__c.fields.SerialNumber_F__c.label}： </span>
                            <span><apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;width:75px;"/></span>
                        </li>
                        </li> -->
                    </apex:outputPanel>
                </ul>
                </div>

 force-app/main/default/pages/TransferShippmentReceived2.page

@@ -97,12 +97,13 @@
</script>
<style type="text/css">
    .menu div.m_title{
        width: 308px;
        /* width: 308px; *//* 20230718 ljh  */
        text-align: left;
        margin: 0;
        background:#DCDCDC;
        border-radius:8px 8px 0 0;
        /*height: 42px;*/
        padding-left: 0.75rem;/*20230628 ljh*/
    }
    .menu {
        border-radius:8px;
@@ -125,13 +126,17 @@
        position: relative;
        /* 20230423 ljh lightning 升级 start*/
        /* width: 24%; */
        width: 30%;
        width: 50%;
        /* 20230423 ljh lightning 升级 end*/
        float: left;
        margin: 0;
        padding: 0;
        text-align: center;
        cursor: pointer;
        /*20230616 ljh*/
        height:30px;
        line-height: 30px;
        /*20230616 ljh*/
    }
    #Step_tab li span {
        margin: 0;
@@ -149,7 +154,7 @@
    }

    div#main {
        width: 320px;
        /* width: 320px; */
    }

    hr {
@@ -157,7 +162,10 @@
        color: #fff;
        background-color: #fff;
        height: 1px;
        width: 90%;
        /*20230620 ljh*/
        /*width: 90%;*/
        width: 98%;
        /*20230620 ljh*/
    }
    .close {
        color: #aaaaaa;
@@ -177,6 +185,11 @@
        list-style: none;
        border-top: 1px solid #ddd;
    }
    /*20230625 ljh */
    .errorMsg{
        width: 140px;
    }
    /*20230625 ljh */
</style>
<div id="myModal" class="modal">

@@ -204,7 +217,7 @@
            <apex:outputPanel id="message">
                <apex:pageMessages />
            </apex:outputPanel>
            <div style="text-align: right;margin-top: 10px;">
            <!-- <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;"/>
@@ -214,7 +227,7 @@
                    <col width="170" />
                </colgroup>
                <tr>
                    <!-- 状态切换btn -->
                    状态切换btn
                    <th colspan="2" style="font-size:20px;text-align: center;width:380px;">
                        <ul id="Step_tab">
                        <apex:outputPanel layout="none" rendered="{!IF(SR_status='Shippment', true, false)}">
@@ -234,7 +247,37 @@
            <div style="text-align: right">
                <apex:commandButton styleClass="commandbutton" onclick="qrsacn()" value="扫一扫" rerender="dummy" rendered="{!IF(Step_status='发货前', true, false)}"/>
                <apex:commandButton styleClass="commandbutton" onclick="filljs1();" value="全部OK" rerender="dummy" rendered="{!IF(Step_status='发货前', true, false)}"/>
            </div>
            </div> -->
            <apex:pageBlock >
                <table style="border-collapse: collapse; font-size:13px;">
                    <colgroup>
                        <col width="20%" />
                        <col width="80%" />
                    </colgroup>
                    <tr>
                        <!-- 状态切换btn -->
                        <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(SR_status='Shippment', true, false)}">
                                <apex:outputPanel layout="none" rendered="{!IF(Step_status='发货前', true, false)}">
                                    <li onclick="javascript:Shippment1();" class="selected"><span class="tabsize">发货前检查</span></li>
                                    <li onclick="javascript:Shippment2();"><span class="tabsize">发货</span></li>
                                </apex:outputPanel>
                                <apex:outputPanel layout="none" rendered="{!IF(Step_status='发货', true, false)}">
                                    <li onclick="javascript:Shippment1();"><span class="tabsize">发货前检测</span></li>
                                    <li onclick="javascript:Shippment2();" class="selected"><span class="tabsize">发货</span></li>
                                </apex:outputPanel>
                            </apex:outputPanel>
                            </ul>
                        </th>                    
                        <th width="900px;" style="padding-left:50px;" class="myBtn" >
                            <apex:commandButton styleClass="commandbutton" onclick="qrsacn()" value="扫一扫" rerender="dummy" rendered="{!IF(Step_status='发货前', true, false)}"/>
                            <apex:commandButton styleClass="commandbutton" onclick="filljs1();" value="全部OK" rerender="dummy" rendered="{!IF(Step_status='发货前', true, false)}"/>
                            <apex:commandButton styleClass="commandbutton" onclick="savejs();" value="保存" rerender="dummy" disabled="{!saveBtnDisabled}"/>
                        </th>
                    </tr>
                </table>
            </apex:pageBlock>
        </div>
        <apex:outputPanel id="detail">

@@ -245,28 +288,34 @@
                <apex:variable var="indexloop" value="{!indexloop+1}"/>
                <apex:variable var="SetName" value="{!IF(SetName='', esdInfo.rec.TransferApplySummary__c, SetName)}" />
                <apex:outputPanel layout="none" rendered="{!IF(SetName=esdInfo.rec.TransferApplySummary__c && indexloop != 1, true, false)}">
                    <br/>
                <!-- 20230718 ljh     -->
                <!-- <br/> -->  
                </apex:outputPanel>
                <apex:outputPanel layout="none" rendered="{!IF(SetName=esdInfo.rec.TransferApplySummary__c, false, true)}">
                    <hr/>
                    <h3 style="padding: 5px;" class="detailtab">{!esdInfo.fsName}</h3>
                    <!-- 20230718 ljh -->
                    <h3 style="padding: 5px 0.75rem;" class="detailtab">{!esdInfo.fsName}</h3>
                    <apex:variable var="SetName" value="{!esdInfo.rec.TransferApplySummary__c}" />
                </apex:outputPanel>

                <apex:outputPanel layout="none" rendered="{!IF(indexloop == 1, true, false)}">
                        <h3 style="padding: 5px;" class="detailtab">{!esdInfo.fsName}</h3>
                    <!-- 20230718 ljh -->    
                    <h3 style="padding: 5px 0.75rem;" class="detailtab">{!esdInfo.fsName}</h3>
                    </apex:outputPanel>
                <div class="menu">
                <h2><div class="m_title">&nbsp;<apex:outputField value="{!esdInfo.rec.Fixture_Name_F__c}" />&nbsp;&nbsp;
                </div></h2>
                <!-- TODO 回库はSet単位で、明細一つ一つのquickCheck要らないが、SetのquickCheck要る？ -->
                <ul style="{!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}">
                <!-- 20230718 ljh     -->
                <ul style="padding: 1px 0.75rem;{!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}">
                    <apex:outputPanel layout="none" rendered="{!IF(Step_status='发货前', true, false)}">
                        <!-- <div style="position: relative; padding-left: 50px; background:{!IF(esdInfo.quickCheck, '#BBFF66', '')}"> -->
                        <li data-qr="{!esdInfo.rec.Fixture_QRCode_F__c}" style="{!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}">
                            <span>{!$ObjectType.TransferApplyDetail__c.fields.Inspection_result__c.label}： </span>
                            <apex:outputPanel layout="none" rendered="{!esdInfo.editable}">
                            <apex:inputField id="inspectionResult" value="{!esdInfo.rec.Inspection_result__c}" style="margin:3px;width:75px;" />
                            <!-- 20230718 ljh -->
                            <!-- <apex:inputField id="inspectionResult" value="{!esdInfo.rec.Inspection_result__c}" style="margin:3px;width:75px;" /> -->
                            <apex:inputField id="inspectionResult" value="{!esdInfo.rec.Inspection_result__c}" style="margin:3px;" />    
                            </apex:outputPanel>
                            <apex:outputPanel layout="none" rendered="{!NOT(esdInfo.editable)}">
                            <span><apex:outputField id="inspectionResult2" value="{!esdInfo.rec.Inspection_result__c}" style="margin:3px;width:75px;" /></span>
@@ -306,12 +355,18 @@
                            <span>{!$ObjectType.TransferApplyDetail__c.fields.Pre_Inspection_Comment__c.label}： </span>
                            <apex:outputPanel layout="none" rendered="{!(esdInfo.editable)}">
                                <span>
                                    <apex:inputField value="{!esdInfo.rec.Pre_Inspection_Comment__c}" style="margin:3px;width:90%;float:left;"/>
                                    <!-- 20230718 ljh start -->
                                    <!-- <apex:inputField value="{!esdInfo.rec.Pre_Inspection_Comment__c}" style="margin:3px;width:90%;float:left;"/> -->
                                    <apex:inputField value="{!esdInfo.rec.Pre_Inspection_Comment__c}"/>
                                    <!-- 20230718 ljh  end-->
                                </span>
                            </apex:outputPanel>
                            <apex:outputPanel layout="none" rendered="{!NOT(esdInfo.editable)}">
                                <span>
                                    <apex:outputField value="{!esdInfo.rec.Pre_Inspection_Comment__c}" style="margin:3px;width:90%;float:left;"/>
                                    <!-- 20230718 ljh start -->
                                    <!-- <apex:outputField value="{!esdInfo.rec.Pre_Inspection_Comment__c}" style="margin:3px;width:90%;float:left;"/> -->
                                    <apex:outputField value="{!esdInfo.rec.Pre_Inspection_Comment__c}"/>
                                    <!-- 20230718 ljh end -->
                                </span>
                            </apex:outputPanel>
                        </li>

 force-app/main/default/pages/TransferShippmentReceived3.page

@@ -60,10 +60,16 @@
    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();
}
function checkMessage() {
@@ -73,7 +79,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,11 +106,12 @@
        display: none
    }
    .menu div.m_title{
        width: 308px;
        /* width: 308px; *//* 20230718 ljh  */
        text-align: left;
        margin: 0;
        background:#95aee5;
        border-radius:8px 8px 0 0;
        padding-left: 0.75rem;/*20230628 ljh*/
    }
    .menu div.m_titleg{
        width: 308px;
@@ -131,13 +141,17 @@
        position: relative;
        /* 20230423 ljh lightning 升级 start */
        /* width: 20%; */
        width: 30%;
        width: 50%;
        /* 20230423 ljh lightning 升级 end */
        float: left;
        margin: 0;
        padding: 0;
        text-align: center;
        cursor: pointer;
        /*20230616 ljh*/
        height:30px;
        line-height: 30px;
        /*20230616 ljh*/
    }
    #Step_tab li span {
        margin: 0;
@@ -155,7 +169,7 @@
    }

    div#main {
        width: 320px;
        /* width: 320px; */
    }

    hr {
@@ -163,7 +177,10 @@
        color: #fff;
        background-color: #fff;
        height: 1px;
        width: 90%;
        /*20230620 ljh*/
        /*width: 90%;*/
        width: 98%;
        /*20230620 ljh*/
    }
    .close {
        color: #aaaaaa;
@@ -188,6 +205,11 @@
        width: 140px;
    }
    /* 20230423 ljh lightning 切换 end */
    /*20230625 ljh */
    .errorMsg{
        width: 140px;
    }
    /*20230625 ljh */
</style>
<div id="myModal" class="modal">

@@ -228,27 +250,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>
@@ -259,7 +270,18 @@
                            </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 +290,37 @@
                        <td style="text-align: right;" class="deliveryslip">发货-运输单号 ： </td>
                        <td align="left">
                            <!-- 20230423 ljh lightning 升级 start -->
                                <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:inputField value="{!slip.Name}" style="width:100px;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;"/>
                            <!-- 20230423 ljh lightning 升级 end -->
                        </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>
        </div>
        <apex:outputPanel id="detail">
        <div id="detailDiv" class="detail">
@@ -329,7 +343,7 @@
                        <hr/>
                        <!-- 20230423 ljh lightning 升级 start -->
                        <!-- <h2 style="padding: 5px;" class="detailtab">{!esdInfo.rec.TransferApply__r.Name}</h2> -->
                        <div style="padding: 5px;font-weight: bold;" class="detailtab">{!esdInfo.rec.TransferApply__r.Name}</div>
                        <div style="padding: 5px 0.75rem;font-weight: bold;" class="detailtab">{!esdInfo.rec.TransferApply__r.Name}</div>
                        <!-- <br/> -->
                        <!-- 20230423 ljh lightning 升级 end -->
                        <apex:variable var="SetName" value="{!esdInfo.rec.TransferApply__r.Name}" />
@@ -347,7 +361,7 @@
                        </apex:outputPanel>
                        <!-- 20230423 ljh lightning 升级 start  -->
                        <!-- <h2 style="padding: 5px;" class="detailtab">{!esdInfo.fsName}</h2> -->
                        <span style="padding: 5px;font-weight: bold;" class="detailtab">{!esdInfo.fsName}</span>
                        <span style="padding: 5px 0.75rem;font-weight: bold;" class="detailtab">{!esdInfo.fsName}</span>
                        <!-- 20230423 ljh lightning 升级 end -->
                        <apex:variable var="SetName2" value="{!esdInfo.rec.TransferApplySummary__c}" />
                    </apex:outputPanel>
@@ -355,7 +369,7 @@
                    <apex:outputPanel layout="none" rendered="{!IF(indexloop == 1, true, false)}">
                        <!-- 20230423 ljh lightning 升级 start -->
                        <!-- <h2 style="padding: 5px;" class="detailtab">{!esdInfo.rec.TransferApply__r.Name}</h2> -->
                        <div style="padding: 5px;font-weight: bold;" class="detailtab">{!esdInfo.rec.TransferApply__r.Name}</div>
                        <div style="padding: 5px 0.75rem;font-weight: bold;" class="detailtab">{!esdInfo.rec.TransferApply__r.Name}</div>
                        <!-- <br/> -->
                        <!-- 20230423 ljh lightning 升级 end -->
                        <input type="hidden" value="{!esdInfo.rec.TransferApply__r.Pre_inspection_ng_num__c}" data-ngnum="{!esdInfo.rec.TransferApply__c}"/>
@@ -371,7 +385,8 @@
                    <h2><div class="m_title">&nbsp;<apex:outputField value="{!esdInfo.rec.Fixture_Name_F__c}" />&nbsp;&nbsp;
                    </div></h2>
                    <!-- TODO 回库はSet単位で、明細一つ一つのquickCheck要らないが、SetのquickCheck要る？ -->
                    <ul>
                    <!-- 20230718 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> -->
@@ -402,16 +417,21 @@
                    <apex:variable var="indexloop" value="{!indexloop+1}"/>
                    <apex:variable var="SetName" value="{!IF(SetName='', esdInfo.rec.TransferApplySummary__c, SetName)}" />
                    <apex:outputPanel layout="none" rendered="{!IF(SetName=esdInfo.rec.TransferApplySummary__c && indexloop != 1, true, false)}">
                        <br/>
                        <!-- 20230718 ljh     -->
                        <!-- <br/> --> 
                    </apex:outputPanel>
                    <apex:outputPanel layout="none" rendered="{!IF(SetName=esdInfo.rec.TransferApplySummary__c, false, true)}">
                        <hr/>
                        <h3 style="padding: 5px;" class="detailtab">{!esdInfo.fsName}</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.TransferApplySummary__c}"/>
                        <h3 style="padding: 5px;" class="detailtab">{!esdInfo.fsName}</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.TransferApplySummary__c}"/>
                        <apex:variable var="SetName" value="{!esdInfo.rec.TransferApplySummary__c}" />
                    </apex:outputPanel>

                    <apex:outputPanel layout="none" rendered="{!IF(indexloop == 1, true, false)}">
                        <h3 style="padding: 5px;" class="detailtab">{!esdInfo.fsName}</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.TransferApplySummary__c}"/>
                        <!-- 20230718 ljh -->
                        <!-- <h3 style="padding: 5px;" class="detailtab">{!esdInfo.fsName}</h3> -->
                        <span style="padding: 5px 0.75rem;font-weight: bold;" class="detailtab">{!esdInfo.fsName}</span>
                        <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.TransferApplySummary__c}"/>
                    </apex:outputPanel>
                    <apex:outputPanel layout="none" rendered="{!esdInfo.hasSended}">
                    </apex:outputPanel>
@@ -427,7 +447,8 @@
                    </h2>
                    </apex:outputPanel>
                    <!-- TODO 回库はSet単位で、明細一つ一つのquickCheck要らないが、SetのquickCheck要る？ -->
                    <ul>
                    <!-- 20230718 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> -->