Merge branch 'master' into LEXUpgrade2023-Deloitte

buli

2023-07-14 e6068da47c1bef5517c9e5fdc8c726766867ad4e

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

@@ -1,4 +1,4 @@
<apex:page action="{!init}" extensions="PAEDecisionRecordController" id="allPage" showheader="false" sidebar="false" standardcontroller="PAE_DecisionRecord__c" title="PAE判定记录">
<apex:page action="{!init}" extensions="PAEDecisionRecordController" id="allPage" showheader="false" sidebar="false" standardcontroller="PAE_DecisionRecord__c" title="PAE判定记录" lightningStylesheets="true" >
    <apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}">
    </apex:stylesheet>
    <apex:includescript value="{!URLFOR($Resource.jquery183minjs)}">
@@ -412,8 +412,15 @@
                                    <!-- OCSM QARA screen  [确定并关闭] -->
                                    <!-- update by rentx 2020-10-26 start -->
                                    <!-- <apex:commandButton rendered="{!IF(((repa.Repair_Determine__c = '要' && isOSH)||repa.Repair_Determine__c != '要') && repa != null && RecordTypeName='ASRCDecision',true,false)}" value="确定并SAP申请"  style="margin-left:30px;width:100px;float:right"  onclick="sendToSAPJS(2);return false;"  rerender="unEditable,message" oncomplete="unblockUI();" disabled="{!IF(repa.SAP_Transfer_time__c != null || editFlag,true,false)}" /> -->
                                    
                                    
                                    
                                    <apex:commandbutton disabled="{!IF(repa.SAP_Transfer_time__c != null || editFlag,true,false)}" onclick="sendToSAPJS(2);return false;" oncomplete="unblockUI();" rendered="{!IF(((repa.Repair_Determine__c = '要' && isOSH)||repa.Repair_Determine__c != '要') && repa != null && RecordTypeName='ASRCDecision',true,false)}" rerender="unEditable,message" style="margin-left:30px;width:100px;float:right" value="确定并SAP申请">
                                    </apex:commandbutton>
                                    
                                    
                                    
                                    
                                    <apex:commandbutton disabled="{!editFlag}" onclick="SaveAndCloses(2);return false;" oncomplete="unblockUI();" rendered="{!IF((repa.Repair_Determine__c = '要' && OCSM_QARA == '1' && RecordTypeName = 'ASRCDecision' && repa != null) || (RecordTypeName = 'ASRCDecision' && QISReportId != null),true,false)}" rerender="unEditable,message" style="margin-left:30px;width:100px;float:right" value="确定并关闭">
                                    </apex:commandbutton>
                                    <!-- OCSM_QARA : {!OCSM_QARA}
@@ -510,8 +517,6 @@
                            <th width="7%">
                                {!$ObjectType.PAE_DecisionRecordDetail__c.fields.PAED_Nullifier__c.label}
                            </th>
                             <!-- <th width="7%">手动修改</th> -->
                           
                            <apex:outputpanel layout="none" rendered="{!IF(RecordTypeName = 'ASRCDecision' , true, false)}">
                                <!-- <th width="7%">不再現結果確認日</th> -->
                                <th width="7%">
@@ -521,11 +526,11 @@
                                <th width="7%">
                                    {!$ObjectType.PAE_DecisionRecordDetail__c.fields.PAED_ResultAffirmant__c.label}
                                </th>
                               
                                <!-- <th width="7%">手动修改</th> -->
                                <th width="7%">
                                    {!$ObjectType.PAE_DecisionRecordDetail__c.fields.Monitor_PAE__c.label}
                                </th>
                            </apex:outputpanel>
                             <th width="7%">
                                {!$ObjectType.PAE_DecisionRecordDetail__c.fields.Monitor_PAE__c.label}
                            </th>
                        </tr>
                        <apex:repeat id="ConsumableorderdetailsTable" value="{!paedRecordDetailView}" var="paedRdV">
                            <tr class="dataRow">
@@ -630,6 +635,7 @@
                                    <apex:inputhidden id="PaeIsSave" value="{!paedRdV.paedrdd.PAE_is_save__c }">
                                    </apex:inputhidden>
                                    <!-- // 2021-12-08  zxk   精琢科技  手动赋值逻辑  end -->

                                </td>
                                <apex:outputpanel layout="none" rendered="{!IF(RecordTypeName = 'ASRCDecision' , true, false)}">
                                    <td class="dataCell">
@@ -699,21 +705,21 @@
                                    <!-- update by rentongxiao 2020-10-10 start -->
                                    <!-- <td class="dataCell">
                                    <apex:OutputField value="{!paedRdV.paedrdd.PAED_ResultAffirmant__r.NaMe}"/>
                                    </td> -->
                                </td> -->
                                    <td class="dataCell">
                                        <apex:outputfield value="{!paedRdV.paedrdd.PAED_ResultAffirmant_new__c}">
                                        </apex:outputfield>
                                    </td>
                                    <!-- update by rentongxiao 2020-10-10  -->
                                    <!-- // 2021-12-08  zxk   精琢科技  手动赋值逻辑  start -->
                                    <td class="dataCell">
                                        <apex:inputcheckbox id="MonitorPAE" value="{!paedRdV.monitorPAE}" disabled="true">
                                        </apex:inputcheckbox>
                                        <apex:inputhidden id="MonitorPAEhidden" value="{!paedRdV.monitorPAE}">
                                        </apex:inputhidden>
                                    </td>
                                    <!-- // 2021-12-08  zxk   精琢科技  手动赋值逻辑  end -->
                                </apex:outputpanel>
                                 <!-- // 2021-12-08  zxk   精琢科技  手动赋值逻辑  start -->
                                <td class="dataCell">
                                    <apex:inputcheckbox id="MonitorPAE" value="{!paedRdV.monitorPAE}" disabled="true">
                                    </apex:inputcheckbox>
                                    <apex:inputhidden id="MonitorPAEhidden" value="{!paedRdV.monitorPAE}">
                                    </apex:inputhidden>
                                </td>
                                <!-- // 2021-12-08  zxk   精琢科技  手动赋值逻辑  end -->
                            </tr>
                        </apex:repeat>
                    </table>