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

unknown

2023-08-23 50ce6a5e5ae7ac6ce3e6281acca9a0db568306e6

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

@@ -123,11 +123,15 @@
</script>
<style type="text/css">
    .menu div.m_title{
        width: 308px;
        /*width: 308px;*/
        text-align: left;
        margin: 0;
        /*20230623 ljh start*/
        background:#DCDCDC;
        /* background:#95aee5; */
        /*20230623 ljh end*/
        /*height: 42px;*/
        padding-left: 0.75rem;/*20230721 ljh  */
    }
    .dateFormat {
        display: none;
@@ -143,15 +147,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;
        /*20230619 ljh*/
        height:30px;
        line-height: 30px;
        /*20230619 ljh*/
    }
    #Step_tab li span {
        margin: 0;
@@ -168,12 +176,17 @@
        color: #fff;
    }
    
    div#main {
    /*div#main {
        width: 320px;
    }
    }*/

    div.rtop, div.rbottom {display:block; background: transparent; font-size:1px;}
    div.rtop div {background:#DCDCDC;}
    div.rtop div {
       /*20230623 ljh start*/
       background:#DCDCDC;
       /* background:#95aee5; */
        /*20230623 ljh end*/
    }
    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;}
@@ -186,7 +199,10 @@
        color: #fff;
        background-color: #fff;
        height: 1px;
        width: 90%;
        /*20230619 ljh start*/
        /*width: 90%;*/
        width: 98%;
        /*20230619 ljh end*/
    }
    .close {
        color: #aaaaaa;
@@ -246,33 +262,29 @@
            <apex:outputPanel id="message">
                <apex:pageMessages />
            </apex:outputPanel>
            <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:outputText value="（出库指示后取消）" style="color:red;" rendered="{!IF(SR_status='Received' && es.cancel_after_loaner_arranged__c, true, false)}"/> -->
            <table style="border-collapse: collapse; font-size:13px;">
                <colgroup>
                    <col width="150" />
                    <col width="170" />
                </colgroup>
                <tr>
                    <!-- 状态切换btn -->
                    <th colspan="2" style="font-size:20px;text-align: center;width:380px;">
                        <!-- 2023-04-26   zyh   lightning升级   start -->
                        <!-- <ul id="Step_tab"> -->
                        <ul id="Step_tab" style="margin-left:0px;">
                        <!-- 2023-04-26   zyh   lightning升级   end -->
                            <li class="selected"><span class="tabsize">上架</span></li>
                        </ul>
                    </th>
                </tr>
            </table>
            <div style="font-size: 14px;">缺少一对一回库:<apex:inputCheckbox value="{!forceSave}" /></div>
            <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>
            <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()" 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}"/>
                            <apex:outputText id="saveBtnDisabled" value="{!saveBtnDisabled}" style="display: none;"/>
                        </th>
                    </tr>
                </table>
                <div style="font-size: 14px;">缺少一对一回库:<apex:inputCheckbox value="{!forceSave}" /></div>
            </apex:pageBlock>
        </div>
        <apex:outputPanel id="detail">

@@ -318,19 +330,23 @@
                    <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>
                        <apex:commandButton styleClass="commandbutton" onclick="qrsacn2('{!esdInfo.rec.Rental_Apply_Equipment_Set__c}')" value="扫一扫附属品" rerender="dummy" rendered="{!IF(Step_status='上架', true, false)}"/>
                        <!-- 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:commandButton styleClass="commandbutton" onclick="qrsacn2('{!esdInfo.rec.Rental_Apply_Equipment_Set__c}')" value="扫一扫附属品" rerender="dummy" rendered="{!IF(Step_status='上架', true, false)}" style="margin-bottom: 5px;" />
                        <apex:variable var="SetName" value="{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Id}" />
                    </apex:outputPanel>

                    <apex:outputPanel layout="none" rendered="{!IF(indexloop == 1, true, false)}">
                            <h3 style="padding: 5px;" class="detailtab">{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Name}：{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Fixture_Set__r.Name}</h3>
                            <apex:commandButton styleClass="commandbutton" onclick="qrsacn2('{!esdInfo.rec.Rental_Apply_Equipment_Set__c}')" value="扫一扫附属品" rerender="dummy" rendered="{!IF(Step_status='上架', true, false)}"/>
                        </apex:outputPanel>
                        <!-- 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:commandButton styleClass="commandbutton" onclick="qrsacn2('{!esdInfo.rec.Rental_Apply_Equipment_Set__c}')" value="扫一扫附属品" rerender="dummy" rendered="{!IF(Step_status='上架', true, false)}" style="margin-bottom: 5px;"/>
                    </apex:outputPanel>
                    <apex:outputPanel layout="none" rendered="{!IF(esdInfo.errorInfo=null, false, true)}">
                        <div>
                        <span style="color:red;font-weight: bold;">异常: </span><span style="color:red;font-weight: bold;">{!esdInfo.errorInfo}</span>
@@ -344,28 +360,31 @@
                    </div>
                    <div class="menu">
                    <h2><div class="m_title">&nbsp;<apex:outputField value="{!esdInfo.rec.AssetName__c}" />&nbsp;&nbsp;<apex:outputPanel layout="none" rendered="{!esdInfo.rec.Fixture_Set_Detail__r.Is_OneToOne__c && !esdInfo.rec.Substitute_flag__c}">(一对一附属品)</apex:outputPanel>
                        <span>(<apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;"/>)</span>

                    </div></h2>
                    <!-- TODO 回库はSet単位で、明細一つ一つのquickCheck要らないが、SetのquickCheck要る？ -->
                    <ul>
                    <!-- 20230722 ljh -->
                    <ul style="padding: 1px 0.75rem;" >
                        <!-- <div style="position: relative; padding-left: 50px; background:{!IF(esdInfo.quickCheck, '#BBFF66', '')}"> -->
                        <li>
                            <!-- <span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Inspection_result_after_F__c.label}： </span> -->
                            <span>检测结果： </span><span>
                            <apex:outputField value="{!esdInfo.rec.Inspection_result_after_F__c}" style="margin:3px;width:75px;"/></span>
                            <apex:outputField value="{!esdInfo.rec.Inspection_result_after_F__c}" style="margin:3px;"/></span>
                        </li>
                        <li>
                            <!-- <span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Inspection_result_after_NG_F__c.label}： </span> -->
                            <span>检测NG区分： </span><span>
                            <apex:outputField value="{!esdInfo.rec.Inspection_result_after_NG_F__c}" style="margin:3px;width:75px;"/></span>
                            <apex:outputField value="{!esdInfo.rec.Inspection_result_after_NG_F__c}" style="margin:3px;"/></span>
                        </li>
                        <!-- <li>
                            <span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.OneToOne_Flag__c.label}： </span><span>
                            <apex:outputField value="{!esdInfo.rec.OneToOne_Flag__c}" style="margin:3px;width:75px;"/></span>
                            <apex:outputField value="{!esdInfo.rec.OneToOne_Flag__c}" style="margin:3px;"/></span>
                        </li> -->
                        <li data-qr="{!esdInfo.rec.Fixture_QRCode_F__c}">
                            <span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Arrival_in_wh__c.label}： </span>
                            <apex:outputPanel layout="none" rendered="{!esdInfo.editable}">
                            <apex:inputField id="arrivalin" value="{!esdInfo.rec.Arrival_in_wh__c}" style="margin:3px;width:75px;" />
                            <apex:inputField id="arrivalin" value="{!esdInfo.rec.Arrival_in_wh__c}" style="margin:3px;" />
                            <apex:outputPanel layout="none" rendered="{!esdInfo.rec.FSD_OneToOneAccessory_Cnt_F__c > 0 && esdInfo.rec.Fixture_Set_Detail__r.Is_OneToOne__c && !esdInfo.rec.Substitute_flag__c}">
                                <input type="hidden" name="onetoone" value="{!esdInfo.rec.Rental_Apply_Equipment_Set__c}"/>
                            </apex:outputPanel>
@@ -375,25 +394,24 @@
                            </apex:outputPanel>
                            </apex:outputPanel>
                            <apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable))}">
                            <span><apex:outputField value="{!esdInfo.rec.Arrival_in_wh__c}" style="margin:3px;width:75px;"/></span>
                            <span><apex:outputField value="{!esdInfo.rec.Arrival_in_wh__c}" style="margin:3px;"/></span>
                            <apex:outputPanel layout="none" rendered="{!esdInfo.rec.FSD_OneToOneAccessory_Cnt_F__c > 0 && esdInfo.rec.Is_Body__c}">
                                <apex:variable var="main_loc" value="{!esdInfo.rec.Asset__r.WH_location__c}" />
                            </apex:outputPanel>
                            </apex:outputPanel>
                        </li>
                        <!-- SFDC-C63DFK 上架时镜箱/周转箱不符的标记   thh 2021-09-07 start -->
                        <!-- SFDC-C63DFK 上架时镜箱/周转箱不符的标记   thh 2021-09-07 start -->
                        <apex:outputPanel layout="none" rendered="{!esdInfo.isShow}">
                            <li data-qr="{!esdInfo.rec.Fixture_QRCode_F__c}">
                                <span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.BoxInconsistent__c.label}： </span>
                                <apex:outputPanel layout="none" rendered="{!esdInfo.editable}">
                                    <apex:inputField id="inconsistent" value="{!esdInfo.rec.BoxInconsistent__c}" style="margin:3px;width:75px;" />
                                </apex:outputPanel>
                                    <span><apex:inputField id="inconsistent" value="{!esdInfo.rec.BoxInconsistent__c}" style="margin:3px;" /></span></apex:outputPanel>
                                <apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable))}">
                                    <span><apex:outputField value="{!esdInfo.rec.BoxInconsistent__c}" style="margin:3px;width:75px;" /></span>
                                    <span><apex:outputField value="{!esdInfo.rec.BoxInconsistent__c}" style="margin:3px;" /></span>
                                </apex:outputPanel>
                            </li>
                        </apex:outputPanel>
                        <!-- SFDC-C63DFK 上架时镜箱/周转箱不符的标记   thh 2021-09-07 end -->
                        <!-- SFDC-C63DFK 上架时镜箱/周转箱不符的标记   thh 2021-09-07 end -->

                        <!-- <apex:outputPanel layout="none" rendered="{!esdInfo.discardFlg}">
                        <li>
@@ -408,16 +426,15 @@
                                <span><span>废弃区</span></span>
                            </apex:outputPanel>
                            <apex:outputPanel layout="none" rendered="{!esdInfo.editable && NOT(esdInfo.discardFlg)}">
                                <apex:inputField id="WHlocation" value="{!esdInfo.rec.Asset__r.WH_location__c}" style="margin:3px;width:75px;" onchange="changeloc(this)"/>
                            </apex:outputPanel>
                                <span><apex:inputField id="WHlocation" value="{!esdInfo.rec.Asset__r.WH_location__c}" style="margin:3px;" onchange="changeloc(this)"/></span></apex:outputPanel>
                            <apex:outputPanel layout="none" rendered="{!NOT(esdInfo.editable) && NOT(esdInfo.discardFlg)}">
                                <span><apex:outputField value="{!esdInfo.rec.Asset__r.WH_location__c}" style="margin:3px;width:75px;"/></span>
                                <span><apex:outputField value="{!esdInfo.rec.Asset__r.WH_location__c}" style="margin:3px;"/></span>
                            </apex:outputPanel>
                        </li>
                        <li>
                        <!-- <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>
                            <span><apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;"/></span>
                        </li> -->
                        <!-- </apex:outputPanel> -->
                        <!-- </div> -->
                    </ul>
@@ -439,7 +456,14 @@
            userAgent = window.navigator.userAgent.toLowerCase(),
            safari = /safari/.test( userAgent ),
            ios = /iphone|ipod|ipad/.test( userAgent ),
            ver = (navigator.userAgent).match(/OS (\d)?\d_\d(_\d)?/i)[0].split('_')[0].replace("OS ","");
            
            // 20230619 ljh
            // ver = (navigator.userAgent).match(/OS (\d)?\d_\d(_\d)?/i)[0].split('_')[0].replace("OS ","");
            ver = '';
           if (ios) {
               ver = (navigator.userAgent).match(/OS (\d)?\d_\d(_\d)?/i)[0].split('_')[0].replace("OS ","");
           }
           // 20230619 ljh
        let scanner = new Instascan.Scanner({ video: document.getElementById('preview'), scanPeriod: 5 ,mirror: false});

        function filljsQR(content) {