From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte
---
force-app/main/default/pages/PAEDecisionRecord.page | 38 ++++++++++++++++++++++----------------
1 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/force-app/main/default/pages/PAEDecisionRecord.page b/force-app/main/default/pages/PAEDecisionRecord.page
index afdc353..e1264e1 100644
--- a/force-app/main/default/pages/PAEDecisionRecord.page
+++ b/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="纭畾骞禨AP鐢宠" 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="纭畾骞禨AP鐢宠">
</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>
--
Gitblit v1.9.1