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

unknown

2023-08-23 50ce6a5e5ae7ac6ce3e6281acca9a0db568306e6

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

@@ -333,20 +333,23 @@
        border:1px solid #D1D1D1;
    }
    .menu div.m_title{
        width: 308px;
        /* width: 308px; */ /*20230722 ljh*/
        text-align: left;
        margin: 0;
        background:#95aee5;
        background:#DCDCDC;
        /* background:#95aee5; */
        border-radius:8px 8px 0 0;
        /*height: 42px;*/
        padding-left: 0.75rem;/*20230721 ljh  */
    }
    .menu div.m_titleg{
        width: 308px;
        /* width: 308px; */
        text-align: left;
        margin: 0;
        background:#DCDCDC;
        border-radius:8px 8px 0 0;
        /*height: 42px;*/
        padding-left: 0.75rem;/*20230721 ljh  */
    }
    .dateFormat {
        display: none;
@@ -365,7 +368,7 @@
        position: relative;
        /* 20230424 ljh lightning 升级 start */
        /* width: 20%; */
        width: 30%;
        width: 50%;
        /* 20230424 ljh lightning 升级 end */
        float: left;
        margin: 0;
@@ -389,7 +392,7 @@
    }

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

    hr {
@@ -397,7 +400,9 @@
        color: #fff;
        background-color: #fff;
        height: 1px;
        width: 90%;
        /* 20230722 ljh */
        /* width: 90%; */
        width: 98%;
    }
    .close {
        color: #aaaaaa;
@@ -475,10 +480,10 @@
            <apex:outputPanel id="message">
                <apex:pageMessages />
            </apex:outputPanel>
                <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;"/>
            <!-- <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;"/>
            <table style="border-collapse: collapse; font-size:13px;">
                <colgroup>
                    <col width="150" />
@@ -497,7 +502,31 @@
                <apex:commandButton styleClass="commandbutton" onclick="qrsacn(2)" value="扫一扫备品" rerender="dummy"/>
                <input type="hidden" id="QRType" value="1"/>
                <apex:commandButton styleClass="commandbutton" onclick="checkAllDetail2();return false" value="全部OK" rerender="dummy"/>
            </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;">
                               <li class="selected"><span class="tabsize">欠品确认</span></li>
                            </ul>
                        </th>
                        <th width="900px;" style="padding-left:50px;" class="myBtn">
                            <apex:commandButton styleClass="commandbutton" onclick="qrsacn(2)" value="扫一扫备品" rerender="dummy"/>
                            <input type="hidden" id="QRType" value="1"/>
                            <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;"/>
                        </th>
                    </tr>
                </table>
            </apex:pageBlock>
        </div>
        <apex:outputPanel id="detail">
        <div id="detailDiv" class="detail">
@@ -526,88 +555,132 @@
                    <div class="m_title">
                        <h2>
                            &nbsp;<apex:outputField value="{!esdInfo.rec.Fixture_Name_F__c}" />&nbsp;&nbsp;
                            <!-- 2023-08-02 zyh 机身编号换地方 -->
                            <span>(<apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;"/>)</span>
                            <!-- 2023-08-02 zyh 机身编号换地方 -->
                        </h2>
                    </div>
                    </apex:outputPanel>
                    <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"/>
                        <!-- 20201209 ljh add -->
                        <apex:outputPanel layout="none" rendered="{!IF(AND(esdInfo.rec.ArrivalResult__c != null,esdInfo.rec.ArrivalResult__c !=''), true, false)}">
                        <span>&nbsp;&nbsp;&nbsp;&nbsp;{!$ObjectType.TransferApplyDetail__c.fields.ArrivalResult__c.label} ： </span>
                        <apex:outputField value="{!esdInfo.rec.ArrivalResult__c}" style="margin:3px;width:75px" />
                        <br/>
                        <li>
                        <span>{!$ObjectType.TransferApplyDetail__c.fields.ArrivalResult__c.label} ： </span>
                        <apex:outputField value="{!esdInfo.rec.ArrivalResult__c}" style="margin:3px;" />
                        </li>
                        </apex:outputPanel>
                        <!-- 20201209 ljh add -->
                        <!-- 20210426 ljh add 1832 start-->
                        <apex:outputPanel layout="none" rendered="{!IF(AND(esdInfo.rec.Return_DeliverySlip__c != null,esdInfo.rec.ArrivalResult__c == 'NG',esdInfo.rec.Arrival_NG_Comment__c !=''), true, false)}">
                        <span>&nbsp;&nbsp;&nbsp;&nbsp;{!$ObjectType.TransferApplyDetail__c.fields.Arrival_NG_Comment__c.label} ： </span>
                        <apex:outputField value="{!esdInfo.rec.Arrival_NG_Comment__c}" style="margin:3px;width:75px" />
                        <br/>
                        <li>
                        <span>{!$ObjectType.TransferApplyDetail__c.fields.Arrival_NG_Comment__c.label} ： </span>
                        <apex:outputField value="{!esdInfo.rec.Arrival_NG_Comment__c}" style="margin:3px;" />
                        </li>
                        </apex:outputPanel>
                        <!-- 20210426 ljh add 1832 end-->
                        <!-- === -->
                        <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.TransferApplyDetail__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.TransferApplyDetail__c.fields.Check_lost_Item__c.label} ： 
                            <apex:outputPanel layout="none" rendered="{!(esdInfo.editable)}">
                                <span><apex:inputField id="checkLost" value="{!esdInfo.rec.Check_lost_Item__c}" style="margin:3px;" onchange="changeCheckLost(this)"/> </span>
                            </apex:outputPanel>
                            <apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable))}">
                                <span><apex:outputField value="{!esdInfo.rec.Check_lost_Item__c}" style="margin:3px;" /></span>
                            </apex:outputPanel></span>
                            </li>
                        </apex:outputPanel>
                        <apex:outputPanel layout="none" rendered="{!IF(OR(esdInfo.rec.Check_lost_Item__c='OK',esdInfo.rec.Check_lost_Item__c=''), false, true   )}">
                        <span>&nbsp;&nbsp;&nbsp;&nbsp;{!$ObjectType.TransferApplyDetail__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.TransferApplyDetail__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>
                            <span>{!$ObjectType.TransferApplyDetail__c.fields.Check_lost_Item__c.label} ： </span>
                            <apex:outputField id="checkLost3" value="{!esdInfo.rec.Check_lost_Item__c}" style="margin:3px;"/>
                            </li>
                        </apex:outputPanel>
                        <li>
                            <span>{!$ObjectType.TransferApplyDetail__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;"/>
                            </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;"/>
                            </apex:outputPanel>
                        </li>
                        <!-- 最初最终对出现 -->
                        <apex:outputPanel layout="none" rendered="{!IF(OR(esdInfo.rec.Check_lost_Item__c='OK',esdInfo.rec.Check_lost_Item__c=''), false, true   )}">
                            <li>
                                <span>{!$ObjectType.TransferApplyDetail__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;" 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;" /></apex:outputPanel>
                            </li>
                        </apex:outputPanel>
                        <apex:outputPanel layout="none" rendered="{!esdInfo.rec.Check_lost_Item__c != null && esdInfo.rec.Check_lost_Item__c != 'OK' }">
                            <li>
                            <span>{!$ObjectType.TransferApplyDetail__c.fields.Lost_item_Memo_Final__c.label}： </span>
                            <apex:outputPanel layout="none" rendered="{!esdInfo.editable && esdInfo.rec.Check_lost_Item_Final__c != '消耗'}">
                            <apex:inputField id="lostMemo2" value="{!esdInfo.rec.Lost_item_Memo_Final__c}" style="margin:3px;"/>
                            </apex:outputPanel>
                            <apex:outputPanel layout="none" rendered="{!NOT(esdInfo.editable) || esdInfo.rec.Check_lost_Item_Final__c == '消耗'}">
                            <apex:outputField value="{!esdInfo.rec.Lost_item_Memo_Final__c}" style="margin:3px;"/>
                            </apex:outputPanel>
                            </li>
                        </apex:outputPanel>
                        <!-- === -->
                        <apex:outputPanel layout="none" rendered="{!IF(esdInfo.slipId=null, true, false)}">
                        <input type="hidden" name="noSlip" value="1"/>
                        </apex:outputPanel>
                        <br/>
                        <span>&nbsp;&nbsp;&nbsp;&nbsp;{!$ObjectType.TransferApplyDetail__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.TransferApplyDetail__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;"/>
                        </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;"/>
                        </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.TransferApplyDetail__c.fields.Lost_item_Memo_Final__c.label}： </span>
                        <li>
                        <span>{!$ObjectType.TransferApplyDetail__c.fields.NoItemReturn__c.label}： 
                        <apex:outputField value="{!esdInfo.rec.NoItemReturn__c}" style="margin:3px;"/></span>
                        </li>
                        
                        <!-- <apex:outputPanel layout="none" rendered="{!esdInfo.rec.Check_lost_Item__c != null && esdInfo.rec.Check_lost_Item__c != 'OK' }">
                            <li>
                            <span>{!$ObjectType.TransferApplyDetail__c.fields.Lost_item_Memo_Final__c.label}： </span>
                            <apex:outputPanel layout="none" rendered="{!esdInfo.editable && esdInfo.rec.Check_lost_Item_Final__c != '消耗'}">
                            <apex:inputField id="lostMemo2" value="{!esdInfo.rec.Lost_item_Memo_Final__c}" style="margin:3px;width:75px;"/>
                            </apex:outputPanel>
                            <apex:inputField id="lostMemo2" value="{!esdInfo.rec.Lost_item_Memo_Final__c}" style="margin:3px;"/>
                            </apex:outputPanel>s
                            <apex:outputPanel layout="none" rendered="{!NOT(esdInfo.editable) || esdInfo.rec.Check_lost_Item_Final__c == '消耗'}">
                            <apex:outputField value="{!esdInfo.rec.Lost_item_Memo_Final__c}" style="margin:3px;width:75px;"/>
                            <apex:outputField value="{!esdInfo.rec.Lost_item_Memo_Final__c}" style="margin:3px;"/>
                            </apex:outputPanel>
                        </apex:outputPanel>
                        <br/>
                            </li>
                        </apex:outputPanel> -->
                        
                        <apex:outputPanel layout="none" rendered="{!$ObjectType.TransferApplyDetail__c.fields.Lost_item_giveup__c.accessible}">
                        <!-- 20230424 ljh lightning 升级 start -->
                        <!-- &nbsp;&nbsp;&nbsp;&nbsp;{!$ObjectType.TransferApplyDetail__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> -->
                        <span>&nbsp;&nbsp;&nbsp;&nbsp;{!$ObjectType.TransferApplyDetail__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 != '消耗')}"><apex:inputField id="checkboxGiveUp" value="{!esdInfo.rec.Lost_item_giveup__c}"/></apex:outputPanel>
                        <li>
                        <span>{!$ObjectType.TransferApplyDetail__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 != '消耗')}"><apex:inputField id="checkboxGiveUp" value="{!esdInfo.rec.Lost_item_giveup__c}"/></apex:outputPanel>
                        <!-- 20230424 ljh lightning 升级 end -->
                        <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>
                        </apex:outputPanel>
                        <span>&nbsp;&nbsp;&nbsp;&nbsp;{!$ObjectType.TransferApplyDetail__c.fields.CDS_complete__c.label} ： </span>
                        <li>
                        <span>{!$ObjectType.TransferApplyDetail__c.fields.CDS_complete__c.label} ： </span>
                        <apex:outputPanel layout="none" rendered="{!IF(esdInfo.slipId=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>
                        </li>
                        <apex:outputPanel layout="none" rendered="{!IF(esdInfo.slipId=null, false, esdInfo.rec.Main_OneToOne__c)}">
                            <br/>
                            <span>&nbsp;&nbsp;&nbsp;&nbsp;{!$ObjectType.TransferApplyDetail__c.fields.CDSChargement__c.label} ： </span>
                            <li>
                            <span>{!$ObjectType.TransferApplyDetail__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.TransferApplyDetail__c.fields.CDSType__c.label} ： </span>
                            </li>
                            <li>
                            <span>{!$ObjectType.TransferApplyDetail__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>
                        </apex:outputPanel>
                        <br/>
                        <span>&nbsp;&nbsp;&nbsp;&nbsp;{!$ObjectType.TransferApplyDetail__c.fields.SerialNumber_F__c.label}： </span>
                        <span><apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;width:75px;"/></span>
                            <!-- 2023-08-02 zyh 机身编号换地方 -->
                        <!-- <li>
                        <span>{!$ObjectType.TransferApplyDetail__c.fields.SerialNumber_F__c.label}： </span>
                        <span><apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;"/></span>
                        </li> -->
                            <!-- 2023-08-02 zyh 机身编号换地方 -->
                    </ul>
                    </div>
                </apex:outputPanel>