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

unknown

2023-08-23 50ce6a5e5ae7ac6ce3e6281acca9a0db568306e6

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

@@ -114,11 +114,12 @@
</script>
<style type="text/css">
    .menu div.m_title{
        width: 308px;
        /* width: 308px; */ /*20230722 ljh*/
        text-align: left;
        margin: 0;
        background:#DCDCDC;
        border-radius:8px 8px 0 0;
        padding-left: 0.75rem;/*20230721 ljh  */
    }
    .dateFormat {
        display: none;
@@ -137,7 +138,7 @@
        position: relative;
        /* 20230424 ljh lightning 升级 start */
        /* width: 24%; */
        width: 30%;
        width: 50%;
        /* 20230424 ljh lightning 升级 end */
        float: left;
        margin: 0;
@@ -161,7 +162,7 @@
    }

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

    hr {
@@ -169,7 +170,9 @@
        color: #fff;
        background-color: #fff;
        height: 1px;
        width: 90%;
        /*20230722 ljh  */
        /* width: 90%; */
        width: 98%;
    }
    .close {
        color: #aaaaaa;
@@ -218,7 +221,8 @@
            <apex:outputPanel id="message">
                <apex:pageMessages />
            </apex:outputPanel>
            <div style="text-align: right;margin-top: 10px;">
            <!-- 20230722 ljh -->
            <!-- <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;"/>
@@ -228,7 +232,7 @@
                    <col width="170" />
                </colgroup>
                <tr>
                    <!-- 状态切换btn -->
                    状态切换btn
                    <th colspan="2" style="font-size:20px;text-align: center;width:380px;">
                        <ul id="Step_tab">
                            <li onclick="javascript:Shippment1();" class="selected"><span class="tabsize">入库前检测</span></li>
@@ -240,7 +244,31 @@
            <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;">
                              <ul id="Step_tab">
                                    <li onclick="javascript:Shippment1();" class="selected"><span class="tabsize">入库前检测</span></li>
                                    <li onclick="javascript:Shippment2();"><span class="tabsize">上架</span></li>
                                </ul>
                           </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">

@@ -255,58 +283,72 @@
                </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>
                    <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>
                        <h3 style="padding: 5px 0.75rem;" class="detailtab">{!esdInfo.fsName}</h3>
                    </apex:outputPanel>
                <div class="menu">
                <div class="m_title"><h2>&nbsp; <apex:outputField value="{!esdInfo.rec.AssetName__c}" />&nbsp;&nbsp; </h2></div>
                <ul>
                <div class="m_title"><h2><apex:outputField value="{!esdInfo.rec.AssetName__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>
                <!-- 20230722 ljh -->
                <ul style="padding: 1px 0.75rem;" >
                    <!-- <apex:outputPanel layout="none" rendered="{!IF(Step_status='入库前检测', true, false)}"> -->
                        <li>
                            <span>{!$ObjectType.TransferApplyDetail__c.fields.Check_lost_Item_F__c.label}： </span><span>
                            <apex:outputField value="{!esdInfo.rec.Check_lost_Item_F__c}" style="margin:3px;width:75px;"/></span>
                            <!-- 20230722 ljh width:75px;-->
                            <apex:outputField value="{!esdInfo.rec.Check_lost_Item_F__c}" style="margin:3px;"/></span>
                        </li>
                        <li>
                            <span>{!$ObjectType.TransferApplyDetail__c.fields.Lost_item_giveup__c.label}： </span><span>
                            <apex:outputField value="{!esdInfo.rec.Lost_item_giveup__c}" style="margin:3px;width:75px;"/></span>
                            <!-- 20230722 ljh width:75px;-->
                            <apex:outputField value="{!esdInfo.rec.Lost_item_giveup__c}" style="margin:3px;"/></span>
                        </li>
                        <apex:outputPanel layout="none" rendered="{!esdInfo.rec.Inspection_result_after_ng__c='维修'}">
                            <li data-qr="{!esdInfo.rec.Fixture_QRCode_F__c}" >
                                <span>检测结果： </span><span>
                                <apex:outputField value="{!esdInfo.rec.Inspection_result_after__c}" style="margin:3px;width:75px;" />
                                <!-- 20230722 ljh width:75px;-->
                                <apex:outputField value="{!esdInfo.rec.Inspection_result_after__c}" style="margin:3px;" />
                                </span>
                            </li>
                            <li>
                                <span>检测NG区分： </span><span>
                                <apex:outputField value="{!esdInfo.rec.Inspection_result_after_ng__c}" style="margin:3px;width:75px;"/></span>
                                <!-- 20230722 ljh width:75px;-->
                                <apex:outputField value="{!esdInfo.rec.Inspection_result_after_ng__c}" style="margin:3px;"/></span>
                            </li>
                            <li data-qr="{!esdInfo.rec.Fixture_QRCode_F__c}" >
                                <span>最终检测结果： </span>
                                <apex:outputPanel layout="none" rendered="{!(esdInfo.editable)}">
                                <apex:inputField id="inspectionResult2" value="{!esdInfo.rec.Inspection_result_after_Final__c}" style="margin:3px;width:75px;" onchange="changeResultNg('{!indexloop}', 2);" />
                                <!-- 20230722 ljh width:75px;-->
                                <apex:inputField id="inspectionResult2" value="{!esdInfo.rec.Inspection_result_after_Final__c}" style="margin:3px;" onchange="changeResultNg('{!indexloop}', 2);" />
                                </apex:outputPanel>
                                <apex:outputPanel layout="none" rendered="{!NOT(esdInfo.editable)}">
                                <span><apex:outputField value="{!esdInfo.rec.Inspection_result_after_Final__c}" style="margin:3px;width:75px;" /></span>
                                <!-- 20230722 ljh width:75px;-->
                                <span><apex:outputField value="{!esdInfo.rec.Inspection_result_after_Final__c}" style="margin:3px;" /></span>
                                </apex:outputPanel>
                            </li>
                            <li>
                                <span>最终NG区分： </span>
                                <apex:outputPanel layout="none" rendered="{!(esdInfo.editable)}"><span>
                                <apex:inputField id="inspectionResultNg2" value="{!esdInfo.rec.Inspection_result_after_NG_Final__c}" style="margin:3px;width:75px;" onchange="changeResultNg('{!indexloop}', 2);" /></span>
                                <!-- 20230722 ljh width:75px;-->
                                <apex:inputField id="inspectionResultNg2" value="{!esdInfo.rec.Inspection_result_after_NG_Final__c}" style="margin:3px;;" onchange="changeResultNg('{!indexloop}', 2);" /></span>
                                </apex:outputPanel>
                                <apex:outputPanel layout="none" rendered="{!NOT(esdInfo.editable)}">
                                <span><apex:outputField value="{!esdInfo.rec.Inspection_result_after_NG_Final__c}" style="margin:3px;width:75px;" /></span>
                                <!-- 20230722 ljh width:75px;-->
                                <span><apex:outputField value="{!esdInfo.rec.Inspection_result_after_NG_Final__c}" style="margin:3px;" /></span>
                                </apex:outputPanel>
                            </li>
                            <li>
                                <span>{!$ObjectType.TransferApplyDetail__c.fields.Inspection_NG_abord_reason__c.label}：</span>
                                <apex:outputPanel layout="none" rendered="{!(esdInfo.editable)}"><span>
                                <apex:inputField id="inspectionResultNg4" value="{!esdInfo.rec.Inspection_NG_abord_reason__c}" style="margin:3px;width:90%;float:left;" />
                                </span>
                                <!-- <apex:inputField id="inspectionResultNg4" value="{!esdInfo.rec.Inspection_NG_abord_reason__c}" style="margin:3px;width:90%;float:left;" /> -->
                                <apex:inputField id="inspectionResultNg4" value="{!esdInfo.rec.Inspection_NG_abord_reason__c}" style="margin:3px;" />
                            </span>
                                <script>
                                    disabledShowNg4();
                                    function disabledShowNg4() {
@@ -318,7 +360,9 @@
                                </script>
                                </apex:outputPanel>
                                <apex:outputPanel layout="none" rendered="{!NOT(esdInfo.editable)}">
                                <span><apex:outputField value="{!esdInfo.rec.Inspection_NG_abord_reason__c}" style="margin:3px;width:90%;float:left;" /></span>
                                <!-- 20230722 ljh  -->
                                <!-- <span><apex:outputField value="{!esdInfo.rec.Inspection_NG_abord_reason__c}" style="margin:3px;width:90%;float:left;" /></span> -->
                                <span><apex:outputField value="{!esdInfo.rec.Inspection_NG_abord_reason__c}" style="margin:3px;" /></span>    
                                </apex:outputPanel>
                            </li>
                        </apex:outputPanel>
@@ -326,25 +370,29 @@
                            <li data-qr="{!esdInfo.rec.Fixture_QRCode_F__c}" >
                                <span>检测结果： </span>
                                <apex:outputPanel layout="none" rendered="{!(esdInfo.editable)}">
                                <apex:inputField id="inspectionResult" value="{!esdInfo.rec.Inspection_result_after__c}" style="margin:3px;width:75px;" onchange="changeResultNg('{!indexloop}', 1)" />
                                <!-- 20230722 ljh width:75px;-->
                                <apex:inputField id="inspectionResult" value="{!esdInfo.rec.Inspection_result_after__c}" style="margin:3px;" onchange="changeResultNg('{!indexloop}', 1)" />
                                </apex:outputPanel>
                                <apex:outputPanel layout="none" rendered="{!NOT(esdInfo.editable)}">
                                <span><apex:outputField value="{!esdInfo.rec.Inspection_result_after__c}" style="margin:3px;width:75px;" /></span>
                                <!-- 20230722 ljh width:75px;-->
                                <span><apex:outputField value="{!esdInfo.rec.Inspection_result_after__c}" style="margin:3px;" /></span>
                                </apex:outputPanel>
                            </li>
                            <li>
                                <span>检测NG区分： </span>
                                <apex:outputPanel layout="none" rendered="{!(esdInfo.editable)}"><span>
                                <apex:inputField id="inspectionResultNg" value="{!esdInfo.rec.Inspection_result_after_ng__c}" style="margin:3px;width:75px;" onchange="changeResultNg('{!indexloop}', 1)" /></span>
                                <!-- 20230722 ljh width:75px;-->
                                <apex:inputField id="inspectionResultNg" value="{!esdInfo.rec.Inspection_result_after_ng__c}" style="margin:3px;" onchange="changeResultNg('{!indexloop}', 1)" /></span>
                                </apex:outputPanel>
                                <apex:outputPanel layout="none" rendered="{!NOT(esdInfo.editable)}">
                                <span><apex:outputField value="{!esdInfo.rec.Inspection_result_after_ng__c}" style="margin:3px;width:75px;" /></span>
                                <!-- 20230722 ljh width:75px;-->
                                <span><apex:outputField value="{!esdInfo.rec.Inspection_result_after_ng__c}" style="margin:3px;" /></span>
                                </apex:outputPanel>
                            </li>
                            <li>
                                <span>{!$ObjectType.TransferApplyDetail__c.fields.Inspection_NG_abord_reason__c.label}：</span>
                                <apex:outputPanel layout="none" rendered="{!(esdInfo.editable)}"><span>
                                <apex:inputField id="inspectionResultNg3" value="{!esdInfo.rec.Inspection_NG_abord_reason__c}" style="margin:3px;width:90%;float:left;"/>
                                <apex:inputField id="inspectionResultNg3" value="{!esdInfo.rec.Inspection_NG_abord_reason__c}" style="margin:3px;"/>
                                </span>
                                <script>
                                    disabledShowNg3();
@@ -357,23 +405,25 @@
                                </script>
                                </apex:outputPanel>
                                <apex:outputPanel layout="none" rendered="{!NOT(esdInfo.editable)}">
                                <span><apex:outputField value="{!esdInfo.rec.Inspection_NG_abord_reason__c}" style="margin:3px;width:90%;float:left;" /></span>
                                <span><apex:outputField value="{!esdInfo.rec.Inspection_NG_abord_reason__c}" style="margin:3px;" /></span>
                                </apex:outputPanel>
                            </li>
                        </apex:outputPanel>
                        <li>
                            <span>{!$ObjectType.TransferApplyDetail__c.fields.Inspection_Comment__c.label}： </span>
                            <apex:outputPanel layout="none" rendered="{!(esdInfo.editable)}">
                            <span><apex:inputField value="{!esdInfo.rec.Inspection_Comment__c}" style="margin:3px;width:90%;float:left;"/></span>
                            <span><apex:inputField value="{!esdInfo.rec.Inspection_Comment__c}" style="margin:3px;"/></span>
                            </apex:outputPanel>
                            <apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable))}">
                            <span><apex:outputField value="{!esdInfo.rec.Inspection_Comment__c}" style="margin:3px;width:90%;float:left;"/></span>
                            <span><apex:outputField value="{!esdInfo.rec.Inspection_Comment__c}" style="margin:3px;"/></span>
                            </apex:outputPanel>
                        </li>
                        <li>
                        <!-- 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;width:75px;"/></span>
                        </li>
                            <span><apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;"/></span>
                        </li> -->
                        <!-- 2023-08-02 zyh 机身编号换地方 -->

                        <script>
                            function changeResultNg(index, kubun) {