再修理按钮

unknown

2023-08-24 ddb0231ef7c5cf2bad9d3f1afc2f733674ad38a5

 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,29 +288,38 @@
                <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>
                    </apex:outputPanel>
                    <!-- 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;
                    <!-- 2023-08-02 zyh 机身编号换地方 -->
                    <span>(<apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;width:75px;"/>)</span>
                    <!-- 2023-08-02 zyh 机身编号换地方 -->
                </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;" />
                            </apex:outputPanel>
                            <!-- 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>
                            </apex:outputPanel>
@@ -306,12 +358,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>
@@ -323,10 +381,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>
                        <!-- 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>
                        </li> -->
                        <!-- 2023-08-02 zyh 机身编号换地方 -->
                        <!-- </div> -->
                    </apex:outputPanel>
                </ul>