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

unknown

2023-08-23 50ce6a5e5ae7ac6ce3e6281acca9a0db568306e6

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

@@ -138,18 +138,22 @@
        border-top-right-radius:10px;
        text-align: left;
        margin: 0;
        padding: 1%;
        width: 98%;
        background:#DCDCDC;
        /* lightning改造   zyh   start */
        /* padding: 1%; */
        /* width: 98%; */
        /* background:#DCDCDC; */
        background:#95aee5;
        padding-left: 0.75rem;
        /* lightning改造   zyh   end */
        position: relative;
    }
    .checkintitle{
        position:absolute;
        right:10px;   
    }
    .disableInput {
    input.disableInput[type="text"] {
        pointer-events: none;
        background-color: #ccc;
        background-color: #8c8c8c5b;
    }
    .dateFormat {
        display: none;
@@ -157,18 +161,26 @@
    #Step_tab {
        list-style-type: none;
        padding: 0;
        margin: 0;
        height: 31px;
        border-bottom: 5px solid #3b5998;
    }
    #Step_tab li {
        position: relative;
        width: 20%;
        /* lightning改造   zyh   start */
        /* width: 20%; */
        width: 50%;
        /* lightning改造   zyh   end */
        float: left;
        margin: 0;
        padding: 0;
        text-align: center;
        cursor: pointer;
        height: 25px;
        /* lightning改造   zyh   start */
        /* height: 25px; */
        height: 30px;
        line-height: 30px;
        /* lightning改造   zyh   end */
    }
    #Step_tab li span {
        margin: 0;
@@ -185,8 +197,11 @@
        color: #fff;
    }
    div.menu{
        margin-bottom: 20px; 
        width: 490px;
        /* lightning改造   zyh   start */
        /* margin-bottom: 20px;  */
        margin-bottom: 2px; 
        /* width: 490px; */
        /* lightning改造   zyh   end */
    }

    hr {
@@ -194,7 +209,10 @@
        color: #fff;
        background-color: #fff;
        height: 1px;
        width: 90%;
        /* lightning改造   zyh   start */
        /* width: 90%; */
        width: 98%;
        /* lightning改造   zyh   end */
    }
    .close {
        color: #aaaaaa;
@@ -218,7 +236,9 @@
    .menu{
        border:1px solid #a1a1a1;
        border-radius:10px;
        width: 400px;
        /* lightning改造   zyh   start */
        /* width: 400px; */
        /* lightning改造   zyh   end */
    }
    .menu li .fieldname {
        width: 30%;
@@ -240,7 +260,14 @@
        margin-left: 20px !important;
    }
    div.freezehander{
        width:500px;
        /* lightning改造   zyh   start */
        /* width:500px; */
        /* lightning改造   zyh   end */
    }
    .titleCheckbox[type="checkbox"]{
        margin-bottom: 4px;
        margin-right: 0;
        margin-left: 10px;
    }
</style>

@@ -262,26 +289,27 @@
<apex:form id="allForm">
    <apex:actionFunction name="save" action="{!save}" rerender="allForm" onComplete="unblockUI();checkMessage();resetDetailDivMargintop();" />
    <apex:inputHidden value="{!done_flg}" id="done_flg"/>
    <div id="main">
    <div id="main" style="margin-bottom:20px;">
        <input type="hidden" id="QRType" value="1"/>
        <input type="hidden" id="QRTypeID" value=""/>
        <div id="hander" class="freezehander">
            <apex:outputPanel id="message">
                <apex:pageMessages />
            </apex:outputPanel>
            <div style="text-align: right;margin-top: 10px;">
            <!-- lightning改造   zyh   start -->
            <!-- <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 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;">
            <!-- <table style="border-collapse: collapse; font-size:13px;">
                <colgroup>
                    <col width="150" />
                    <col width="170" />
                </colgroup>
                <tr>
                <tr> -->
                    <!-- 状态切换btn -->
                    <th colspan="2" style="font-size:20px;text-align: center;width:500px;">
                    <!-- <th colspan="2" style="font-size:20px;text-align: center;width:500px;">
                        <ul id="Step_tab">
                            <li class="selected"><span class="tabsize">清点</span></li>
                        </ul>
@@ -293,7 +321,29 @@
                <apex:commandButton styleClass="commandbutton" onclick="qrsacn()" value="扫一扫" rerender="dummy"/>
                <apex:commandButton styleClass="commandbutton" onclick="checkAll();" value="全选" rerender="dummy" />
                <apex:commandButton styleClass="commandbutton" onclick="filljs1();" value="全部OK" rerender="dummy"/>
            </div>
            </div> -->
            <apex:pageBlock >
                <table style="border-collapse: collapse; font-size:13px; margin-bottom:10px;">
                    <colgroup>
                        <col width="20%" />
                        <col width="80%" />
                    </colgroup>
                    <tr>
                        <th style="font-size:20px;text-align: center;width:280px;">
                            <ul id="Step_tab">
                                <li class="selected"><span class="tabsize">清点</span></li>
                            </ul>
                        </th>
                        <th width="1900px;">
                            <apex:commandButton styleClass="commandbutton" onclick="changeAccessory()" value="附属品调整" rerender="dummy"/>
                            <apex:commandButton styleClass="commandbutton" onclick="qrsacn()" value="扫一扫" rerender="dummy"/>
                            <apex:commandButton styleClass="commandbutton" onclick="checkAll();" value="全选" rerender="dummy" />
                            <apex:commandButton styleClass="commandbutton" onclick="filljs1();" value="全部OK" rerender="dummy"/>
                            <apex:commandButton styleClass="commandbutton" onclick="savejs();" value="保存" rerender="dummy" disabled="{!saveBtnDisabled}"/>
                        </th>
                    </tr>
                </table>
            </apex:pageBlock>
        </div>
        <apex:outputPanel id="detail">

@@ -304,24 +354,26 @@

            <apex:repeat value="{!esdList}" var="esdInfo" id="esdList">
                <!-- <apex:outputPanel rendered="{!IF(SetName=esdInfo.rnd.ReceivingNoteSummary__r.Id,false,true)}"> -->
                <div style="margin-bottom: -20px;display: {!IF(SetName=esdInfo.rnd.ReceivingNoteSummary__r.Id,'none','block')}">
                <!-- <div style="margin-bottom: -20px;display: {!IF(SetName=esdInfo.rnd.ReceivingNoteSummary__r.Id,'none','block')}"> -->
                <div style="display: {!IF(SetName=esdInfo.rnd.ReceivingNoteSummary__r.Id,'none','block')}">
                    <apex:outputPanel rendered="{!IF(indexloop=0,false,true)}">
                        <hr/>
                    </apex:outputPanel>
                    <label style="font-size: 14px;font-weight: bold;" >
                        <apex:outputPanel rendered="{!esdInfo.rnd.ReceivingNoteSummary__r.Package_Status__c=='OK'}">
                            <apex:inputCheckbox id="checkedRN" value="{!esdInfo.isChecked}" html-data-rnId="{!esdInfo.rnd.ReceivingNoteSummary__c}" html-data-fsId="{!esdInfo.rnd.Fixture_Set_Detail__r.Fixture_Set__c}"/>
                            <apex:inputCheckbox id="checkedRN" styleClass="titleCheckbox" value="{!esdInfo.isChecked}" html-data-rnId="{!esdInfo.rnd.ReceivingNoteSummary__c}" html-data-fsId="{!esdInfo.rnd.Fixture_Set_Detail__r.Fixture_Set__c}"/>
                        </apex:outputPanel>
                        &nbsp;{!esdInfo.rnd.ReceivingNoteSummary__r.ReceivingNoteSummaryNo__c}
                        {!esdInfo.rnd.ReceivingNoteSummary__r.ReceivingNoteSummaryNo__c}
                        <!-- &nbsp;{!esdInfo.rnd.ReceivingNoteSummary__r.ReceivingNoteSummaryNo__c} -->
                    </label>
                    <apex:variable var="SetName" value="{!esdInfo.rnd.ReceivingNoteSummary__r.Id}" />
                    <apex:variable var="indexloop" value="{!indexloop+1}"/>
                </div>
                <!-- </apex:outputPanel> -->

                <!-- <br /> -->

                <apex:outputPanel layout="none" rendered="true" >
                    <br/>
                    <!-- <br/> -->
                    
                    <div class="menu">
                        
@@ -338,31 +390,52 @@
                        
                        <ul data-sumId="{!esdInfo.rnd.ReceivingNoteSummary__c}" data-model="{!IF(esdInfo.rnd.Fixture_Arrival_Process__c=='变体',esdInfo.rnd.Fixture_Arrival_Product__r.Fixture_Model_No_T__c, esdInfo.rnd.Fixture_Model_No_F__c)}">
                            <li>
                                <span class="fieldname">明细No.</span>
                                <!-- lightning改造   zyh   start -->
                                <!-- <span class="fieldname">明细No.</span> -->
                                <span class="fieldvalue">明细No.</span>
                                <!-- lightning改造   zyh   end -->
                                <span class="fieldvalue" style="width: 65%;">{!esdInfo.rnd.ReceivingNoteDetailNo__c}</span>
                            </li>
                            <li style="{!IF(ISBLANK(esdInfo.rnd.Fixture_Arrival_Process__c),'display: none;','')}">
                                <span class="fieldname">备品入库处理</span>
                                <!-- lightning改造   zyh   start -->
                                <!-- <span class="fieldname">备品入库处理</span> -->
                                <span class="fieldvalue">备品入库处理</span>
                                <!-- lightning改造   zyh   end -->
                                <span class="fieldvalue" style="width: 65%;">{!esdInfo.rnd.Fixture_Arrival_Process__c}</span>
                            </li>
                            <li style="{!IF(esdInfo.rnd.Fixture_Arrival_Process__c == '变体','','display: none;')}">
                                <span class="fieldname">备品入库产品</span>
                                <!-- lightning改造   zyh   start -->
                                <!-- <span class="fieldname">备品入库产品</span> -->
                                <span class="fieldvalue">备品入库产品</span>
                                <!-- lightning改造   zyh   end -->
                                <span class="fieldvalue" style="width: 65%;">{!esdInfo.rnd.Fixture_Arrival_Product__r.Name}</span>
                            </li>
                            <li>
                                <span class="fieldname">规格</span>
                                <!-- lightning改造   zyh   start -->
                                <!-- <span class="fieldname">规格</span> -->
                                <span class="fieldvalue">规格</span>
                                <!-- lightning改造   zyh   end -->
                                <span class="fieldvalue">{!esdInfo.rnd.Packing_list_Fixture_F__c}</span>
                            </li>
                            <li style="{!IF(esdInfo.rnd.unknow_serial_NO_product__c = 'TRUE', '', 'display: none;')}">
                                <span class="fieldname">无机身号码设备</span>
                                <!-- lightning改造   zyh   start -->
                                <!-- <span class="fieldname">无机身号码设备</span> -->
                                <span class="fieldvalue">无机身号码设备</span>
                                <!-- lightning改造   zyh   end -->
                                <apex:outputText styleclass="fieldvalue" id="isNoSerialNumber" value="{!esdInfo.rnd.unknow_serial_NO_product__c}" />
                            </li>
                            <li style="{!IF(esdInfo.rnd.unknow_serial_NO_product__c = 'TRUE', '', 'display: none;')}">
                                <span class="fieldname">机身编码</span>
                                <!-- lightning改造   zyh   start -->
                                <!-- <span class="fieldname">机身编码</span> -->
                                <span class="fieldvalue">机身编码</span>
                                <!-- lightning改造   zyh   end -->
                                <apex:outputText styleClass="fieldvalue" value="{!esdInfo.rnd.SerialNumber_F__c}"/>
                            </li>
                            <li style="{!IF(esdInfo.rnd.unknow_serial_NO_product__c != 'TRUE', '', 'display: none;')}">
                                <span class="fieldname">机身编码</span>
                                <!-- lightning改造   zyh   start -->
                                <!-- <span class="fieldname">机身编码</span> -->
                                <span class="fieldvalue">机身编码</span>
                                <!-- lightning改造   zyh   end -->
                                <apex:inputHidden value="{!esdInfo.rnd.unknow_serial_NO_product__c}" />
                                <apex:outputText styleClass="fieldvalue" value="{!esdInfo.rnd.SerialNumber_Origin__c}"/>
                                <apex:outputPanel rendered="{!esdInfo.canChange==true}" layout="none">
@@ -370,26 +443,41 @@
                                </apex:outputPanel>
                            </li>
                            <li style="{!IF(esdInfo.rnd.unknow_serial_NO_product__c != 'TRUE', '', 'display: none;')}">
                                <span class="fieldname">机身编码(更新)</span>
                                <!-- lightning改造   zyh   start -->
                                <!-- <span class="fieldname">机身编码(更新)</span> -->
                                <span class="fieldvalue">机身编码(更新)</span>
                                <!-- lightning改造   zyh   end -->
                                <span class="fieldvalue"><apex:inputField id="serialNumberfix" styleclass="disableInput" value="{!esdInfo.rnd.SerialNumber__c}" /></span>
                            </li>
                            <li style="{!IF(esdInfo.rnd.Asset_loaner_category_F__c != '耗材','','display: none;')}">
                                <span class="fieldname">使用期限(修改前)</span>
                                <!-- lightning改造   zyh   start -->
                                <!-- <span class="fieldname">使用期限(修改前)</span> -->
                                <span class="fieldvalue">使用期限(修改前)</span>
                                <!-- lightning改造   zyh   end -->
                                <span class="fieldvalue"> <apex:outputField id="PeriodOfUse_Old_F__c" value="{!esdInfo.rnd.PeriodOfUse_Old_F__c}" /> </span>
                            </li>
                            <li style="{!IF(esdInfo.rnd.Asset_loaner_category_F__c != '耗材','','display: none;')}">
                                <span class="fieldname">使用期限(修改后)</span>
                                <!-- lightning改造   zyh   start -->
                                <!-- <span class="fieldname">使用期限(修改后)</span> -->
                                <span class="fieldvalue">使用期限(修改后)</span>
                                <!-- lightning改造   zyh   end -->
                                <span class="fieldvalue">
                                    <apex:inputField id="PeriodOfUse_Final__c" value="{!esdInfo.rnd.PeriodOfUse_Final__c}" rendered="{!esdInfo.canChange==true}" />
                                    <apex:outputField value="{!esdInfo.rnd.PeriodOfUse_Final__c}" rendered="{!esdInfo.canChange==false}"  />
                                </span>
                            </li>
                            <li style="{!IF(esdInfo.rnd.Asset_loaner_category_F__c == '耗材','','display: none;')}">
                                <span class="fieldname">使用期限</span>
                                <!-- lightning改造   zyh   start -->
                                <!-- <span class="fieldname">使用期限</span> -->
                                <span class="fieldvalue">使用期限</span>
                                <!-- lightning改造   zyh   end -->
                                <span class="fieldvalue"> <apex:outputField value="{!esdInfo.rnd.PeriodOfUse__c}" /> </span>
                            </li>
                            <li data-qr="{!esdInfo.rnd.Fixture_QRCode_F__c}" data-bar="{!esdInfo.rnd.Barcode_F__c}" data-sumId="{!esdInfo.rnd.ReceivingNoteSummary__c}">
                                <span class="fieldname">清点结果</span>
                                <!-- lightning改造   zyh   start -->
                                <!-- <span class="fieldname">清点结果</span> -->
                                <span class="fieldvalue">清点结果</span>
                                <!-- lightning改造   zyh   end -->
                                <apex:outputPanel layout="none" rendered="{!esdInfo.canChange==false}" >
                                   <span class="fieldvalue"><apex:outputField value="{!esdInfo.rnd.AcceptanceResult__c}"/></span>
                                </apex:outputPanel>
@@ -398,7 +486,10 @@
                                </apex:outputPanel>
                            </li>
                            <li>
                                <span class="fieldname">清点备注</span>
                                <!-- lightning改造   zyh   start -->
                                <!-- <span class="fieldname">清点备注</span> -->
                                <span class="fieldvalue">清点备注</span>
                                <!-- lightning改造   zyh   end -->
                                <apex:outputPanel layout="none" rendered="{!esdInfo.canChange==false}" >
                                   <span class="fieldvalue"><apex:outputField value="{!esdInfo.rnd.AcceptanceComments__c}"/></span>
                                </apex:outputPanel>
@@ -416,11 +507,21 @@
        </apex:outputPanel>
    </div>
    <script type="text/javascript">
        // lightning改造   zyh   start
        // var standalone = window.navigator.standalone,
        //     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 ","");
        var standalone = window.navigator.standalone,
            userAgent = window.navigator.userAgent.toLowerCase(),
            safari = /safari/.test( userAgent ),
            ios = /iphone|ipod|ipad/.test( userAgent ),
           ver = '';
           if (ios) {
            ver = (navigator.userAgent).match(/OS (\d)?\d_\d(_\d)?/i)[0].split('_')[0].replace("OS ","");
           }
        // lightning改造   zyh   end
        let scanner = new Instascan.Scanner({ video: document.getElementById('preview'), scanPeriod: 5 ,mirror: false});

        function filljsQR(content) {