From 6945f4e865d3f6ba831515fe51e4e6167cd2077b Mon Sep 17 00:00:00 2001
From: unknown <sunxia@prec-tech.com>
Date: 星期四, 04 五月 2023 10:19:07 +0800
Subject: [PATCH] Merge branch 'LEX_dev' of http://47.92.229.245:8089/r/lightningupdate into LEX_dev
---
force-app/main/default/pages/PAEDecisionRecord.page | 148 ++++++++++++++++++++++++++++---------------------
1 files changed, 85 insertions(+), 63 deletions(-)
diff --git a/force-app/main/default/pages/PAEDecisionRecord.page b/force-app/main/default/pages/PAEDecisionRecord.page
index 6332d41..0660da2 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)}">
@@ -70,6 +70,23 @@
blockme();
InsertRow();
+ }
+ var selectedSize = 0;
+ var pageLimit = {!pageLimit};
+ function CheckSize(j){
+ var a = j.id;
+ var productCount = j$(escapeVfId(a)).attr('checked');
+ if (productCount == 'checked') {
+ if(selectedSize >= pageLimit){
+ window.alert("椤甸潰鎵�閫夋暟鎹笉鑳借秴杩�500鏉�");
+ j$(escapeVfId(a)).attr('checked',false);
+ return;
+ }
+ selectedSize ++;
+ } else {
+ selectedSize --;
+ }
+ //alert(selectedSize);
}
// 淇濆瓨骞跺叧闂�
function SaveAndCloses(onlySave) {
@@ -172,12 +189,12 @@
td.columuslowercolour {
background-color: red;
- text-align: right;
+ text-align: left;
}
td.columuscuperolour {
background-color: yellow;
- text-align: right;
+ text-align: left;
}
</style>
<apex:form id="allForm">
@@ -210,35 +227,22 @@
<apex:outputpanel id="allPanel">
<apex:pageblock id="allBlock">
<apex:pageblock id="unEditable" rendered="{!editAble}" title="{!IF(RecordTypeName = 'ASRCDecision' , 'Intake universal code 缂栬緫鐢婚潰', 'Final universal code 缂栬緫鐢婚潰')}">
- <table cellspacing="10">
+ <table cellspacing="8">
<colgroup>
- <col width="7%">
- </col>
- <col width="10%">
- </col>
- <col width="7%">
- </col>
- <col width="7%">
- </col>
- <col width="7%">
- </col>
- <col width="7%">
- </col>
- <col width="7%">
- </col>
- <col width="7%">
- </col>
- <col width="7%">
- </col>
- <col width="7%">
- </col>
- <col width="7%">
- </col>
+ <col width="15%"/>
+ <col width="10%"/>
+ <col width="15%"/>
+ <col width="15%"/>
+ <col width="15%"/>
+ <col width="10%"/>
+ <col width="15%"/>
+ <col width="15%"/>
+ <col width="15%"/>
+ <col width="15%"/>
+ <col width="15%"/>
<apex:outputpanel layout="none" rendered="{!IF(RecordTypeName = 'ASACDecision' , true, false)}">
- <col width="15%">
- </col>
- <col width="10%">
- </col>
+ <col width="15%"/>
+ <col width="15%"/>
</apex:outputpanel>
</colgroup>
<tr>
@@ -257,12 +261,12 @@
<!-- 2020/07/28 taoqz end -->
<apex:outputpanel layout="none" rendered="{!IF(RecordTypeName = 'ASRCDecision' , true, false)}">
<!-- <th>AS-RC</th> -->
- <td align="right">
+ <td align="left">
{!$ObjectType.Repair__c.fields.Repair_ConfirmationDate__c.label}锛�
</td>
</apex:outputpanel>
<apex:outputpanel layout="none" rendered="{!IF(RecordTypeName = 'ASACDecision' , true, false)}">
- <td align="right">
+ <td align="left">
{!$ObjectType.Repair__c.fields.OCSM_RC_CordingDate__c.label}锛�
</td>
</apex:outputpanel>
@@ -272,13 +276,13 @@
</td>
<apex:outputpanel layout="none" rendered="{!IF(RecordTypeName = 'ASRCDecision' , true, false)}">
<!-- <th>AS-RC</th> -->
- <td align="right">
+ <td align="left">
{!$ObjectType.Repair__c.fields.Repair_Authenticator__c.label}锛�
</td>
</apex:outputpanel>
<apex:outputpanel layout="none" rendered="{!IF(RecordTypeName = 'ASACDecision' , true, false)}">
<!-- <th>AS-AC</th> -->
- <td align="right">
+ <td align="left">
{!$ObjectType.Repair__c.fields.OCSM_RC_CordingUser__c.label}锛�
</td>
</apex:outputpanel>
@@ -288,7 +292,7 @@
</td>
<apex:outputpanel layout="none" rendered="{!IF(RecordTypeName = 'ASRCDecision' && repa != null, true, false)}">
<!-- <th>AS-RC</th> -->
- <td align="right">
+ <td align="left">
{!$ObjectType.Repair__c.fields.SAP_Transfer_time__c.label}锛�
</td>
<td align="left">
@@ -297,7 +301,7 @@
</td>
</apex:outputpanel>
<apex:outputpanel layout="none" rendered="{!IF(RecordTypeName = 'ASACDecision' , true, false)}">
- <td align="right">
+ <td align="left">
鍐嶇幇缁撴灉纭锛�
</td>
<td align="left" style="{!IF(rdRecord.PAE_reappear_confirm__c = '鏈‘璁�' , 'color: red;font-weight: 800;', '')}">
@@ -321,14 +325,14 @@
</td>
</apex:outputpanel>
<!-- <apex:outputPanel layout="none" rendered="{!IF(RecordTypeName = 'ASRCDecision' , true, false)}">
- <td align="right" > 杩涜淇悊鐨勫垽瀹氱粨鏋滐細</td>
+ <td align="left" > 杩涜淇悊鐨勫垽瀹氱粨鏋滐細</td>
<td align="left" >
<apex:InputField value="{!repa.Repair_Determine_result__c}"/>
</td>
</apex:outputPanel> -->
<!-- update by rentongxiao 2020-09-21 start -->
<!-- <apex:outputPanel layout="none" rendered="{!IF(RecordTypeName = 'ASRCDecision', true, false)}">
- <td align="right" > {!$ObjectType.Repair__c.fields.if_Repair_Allowed__c.label}锛�</td>
+ <td align="left" > {!$ObjectType.Repair__c.fields.if_Repair_Allowed__c.label}锛�</td>
<td align="left" >
<apex:InputField id="repairDetermineResult" value="{!repa.if_Repair_Allowed__c}" rendered="{!isOSH}"/>
<apex:outputField id="repairDetermineResultout" value="{!repa.if_Repair_Allowed__c}" rendered="{!!isOSH}"/>
@@ -337,7 +341,7 @@
</apex:outputPanel>
<apex:outputPanel layout="none" rendered="{!IF(RecordTypeName = 'ASRCDecision', true, false)}">
- <td align="right" > {!$ObjectType.Repair__c.fields.NotAllowedReason__c.label}锛�</td>
+ <td align="left" > {!$ObjectType.Repair__c.fields.NotAllowedReason__c.label}锛�</td>
<td align="left" colspan="3">
<apex:InputField id="NotAllowedReason" value="{!repa.NotAllowedReason__c}" rendered="{!isOSH}"/>
<apex:outputField id="NotAllowedReasontout" value="{!repa.NotAllowedReason__c}" rendered="{!!isOSH}"/>
@@ -345,7 +349,7 @@
</apex:outputPanel> -->
<apex:outputpanel layout="none" rendered="{!IF(RecordTypeName = 'ASRCDecision' && repa != null, true, false)}">
- <td align="right">
+ <td align="left">
{!$ObjectType.Repair__c.fields.if_Repair_Allowed__c.label}锛�
</td>
<td align="left">
@@ -356,7 +360,7 @@
</td>
</apex:outputpanel>
<apex:outputpanel layout="none" rendered="{!IF(RecordTypeName = 'ASRCDecision' && repa != null, true, false)}">
- <td align="right">
+ <td align="left">
{!$ObjectType.Repair__c.fields.NotAllowedReason__c.label}锛�
</td>
<td align="left" colspan="3">
@@ -369,8 +373,6 @@
<!-- update by rentongxiao 2020-09-21 end -->
</tr>
<tr>
- <td colspan="4">
- </td>
<apex:outputpanel layout="none" rendered="{!IF(RecordTypeName = 'ASRCDecision' && repa != null , true, false)}">
<!-- <th>AS-RC</th> -->
<td align="left">
@@ -394,43 +396,63 @@
</tr>
</table>
<apex:outputpanel layout="none" rendered="{!IF(RecordTypeName = 'ASACDecision'&& rdRecord.PAE_reappear_confirm__c = '鏈‘璁�',false , true)}">
- <table style="width:100%; {!IF(RecordTypeName = 'ASACDecision'&& rdRecord.PAE_reappear_confirm__c = '鏈‘璁�', 'display: none;', '')}">
+ <table style="width:100%; {!IF(RecordTypeName = 'ASACDecision'&& rdRecord.PAE_reappear_confirm__c = '鏈‘璁�', 'display: none;', '')}" cellspacing="8">
+ <colgroup>
+ <col width="1%"/>
+ <col width="1%"/>
+ <col width="1%"/>
+ <col width="1%"/>
+ <col width="1%"/>
+ <col width="1%"/>
+ <col width="25%"/>
+ <col width="25%"/>
+ <col width="15%"/>
+ <col width="15%"/>
+ <col width="15%"/>
+ </colgroup>
<tr>
<td>
- <!-- <apex:commandButton onclick="SaveAndCloses(false);" value="1淇濆瓨骞跺叧闂�" style="margin-left:30px;width:80px;float:right" rerender="unEditable,message" oncomplete="unblockUI();"/> -->
- <apex:commandbutton onclick="ReturnRepairInterface();return false;" oncomplete="unblockUI();" rerender="unEditable,message" style="margin-left:30px;width:80px;float:right" value="鍏抽棴">
+ <!-- <apex:commandButton onclick="SaveAndCloses(false);" value="1淇濆瓨骞跺叧闂�" style="margin-left:30px;width:80px;float:left" rerender="unEditable,message" oncomplete="unblockUI();"/> -->
+ <apex:commandbutton onclick="ReturnRepairInterface();return false;" oncomplete="unblockUI();" rerender="unEditable,message" style="margin-left:30px;width:80px;float:left" value="鍏抽棴">
</apex:commandbutton>
- <apex:commandbutton disabled="{!IF(((repa.ETQ_UPLOAD_ERROR_GROUP__c != 'Intake') || editFlag) && savebuton == false && !(RecordTypeName='ASRCDecision'&&OCSM_QARA='1'),true,false)}" onclick="SaveAndCloses(1);return false;" oncomplete="unblockUI();" rerender="unEditable,message" style="margin-left:30px;width:80px;float:right" value="淇濆瓨">
+ </td>
+ <td>
+ <apex:commandbutton disabled="{!IF(((repa.ETQ_UPLOAD_ERROR_GROUP__c != 'Intake') || editFlag) && savebuton == false && !(RecordTypeName='ASRCDecision'&&OCSM_QARA='1'),true,false)}" onclick="SaveAndCloses(1);return false;" oncomplete="unblockUI();" rerender="unEditable,message" style="margin-left:30px;width:80px;float:left" value="淇濆瓨">
</apex:commandbutton>
- <!-- <apex:commandButton value="淇濆瓨骞跺叧闂�" disabled="{!editFlag}" rendered="{!IF((!isOSH && OCSM_QARA != '1' && RecordTypeName = 'ASRCDecision' && repa != null) || (RecordTypeName = 'ASACDecision') || (RecordTypeName = 'ASACDecision' && QISReportId != null),true,false)}" style="margin-left:30px;width:80px;float:right" onclick="SaveAndCloses(2);return false;" rerender="unEditable,message" oncomplete="unblockUI();" /> -->
+ </td>
+ <!-- <apex:commandButton value="淇濆瓨骞跺叧闂�" disabled="{!editFlag}" rendered="{!IF((!isOSH && OCSM_QARA != '1' && RecordTypeName = 'ASRCDecision' && repa != null) || (RecordTypeName = 'ASACDecision') || (RecordTypeName = 'ASACDecision' && QISReportId != null),true,false)}" style="margin-left:30px;width:80px;float:left" onclick="SaveAndCloses(2);return false;" rerender="unEditable,message" oncomplete="unblockUI();" /> -->
<!-- 20200810 Gzw 淇敼淇濆瓨骞跺叧闂寜閽紝Final鏃舵樉绀�
- <apex:commandButton value="淇濆瓨骞跺叧闂�" disabled="{!editFlag}" rendered="{!IF(((repa != null && !((repa.Repair_Determine__c = '瑕�' && isOSH)||repa.Repair_Determine__c != '瑕�')) || (RecordTypeName = 'ASACDecision')),true,false)}" style="margin-left:30px;width:80px;float:right" onclick="SaveAndCloses(2);return false;" rerender="unEditable,message" oncomplete="unblockUI();" /> -->
- <apex:commandbutton disabled="{!editFlag}" onclick="SaveAndCloses(2);return false;" oncomplete="unblockUI();" rendered="{!IF(repa != null && RecordTypeName = 'ASACDecision',true,false)}" rerender="unEditable,message" style="margin-left:30px;width:80px;float:right" value="淇濆瓨骞跺叧闂�">
+ <apex:commandButton value="淇濆瓨骞跺叧闂�" disabled="{!editFlag}" rendered="{!IF(((repa != null && !((repa.Repair_Determine__c = '瑕�' && isOSH)||repa.Repair_Determine__c != '瑕�')) || (RecordTypeName = 'ASACDecision')),true,false)}" style="margin-left:30px;width:80px;float:left" onclick="SaveAndCloses(2);return false;" rerender="unEditable,message" oncomplete="unblockUI();" /> -->
+ <td>
+ <apex:commandbutton disabled="{!editFlag}" onclick="SaveAndCloses(2);return false;" oncomplete="unblockUI();" rendered="{!IF(repa != null && RecordTypeName = 'ASACDecision',true,false)}" rerender="unEditable,message" style="margin-left:30px;width:80px;float:left" value="淇濆瓨骞跺叧闂�">
</apex:commandbutton>
+ </td>
<!-- When 瑕佷笉瑕佽繘琛屼慨鐞嗙殑鍒ゅ畾=瑕� -->
<!-- OSH screen锛歔纭畾骞禨AP鐢宠] -->
<!-- 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 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:left" 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鐢宠">
+ <td>
+ <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:120px;float:left" 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="纭畾骞跺叧闂�">
+ </td>
+ <td>
+ <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:left" value="纭畾骞跺叧闂�">
</apex:commandbutton>
+ </td>
<!-- OCSM_QARA : {!OCSM_QARA}
OSH : {!isOSH} -->
<!-- update by rentx 2020-10-26 start -->
- <!-- <apex:commandButton value="鎻掑叆琛�" disabled="{!IF((RecordTypeName='ASRCDecision'&&OCSM_QARA='0')||(RecordTypeName='ASACDecision'&&OCSM_Cording='0')||(editFlag) || (RecordTypeName='ASRCDecision' && repa.SAP_Transfer_time__c != null),true,false)}" style="margin-left:30px;width:60px;float:right" onclick="InsertRows();return false;" rerender="unEditable,message" oncomplete="unblockUI();"/>
- <apex:commandButton value="鍙栨秷琛�" disabled="{!IF((RecordTypeName='ASRCDecision'&&OCSM_QARA='0')||(RecordTypeName='ASACDecision'&&OCSM_Cording='0')||(editFlag) || (RecordTypeName='ASRCDecision' && repa.SAP_Transfer_time__c != null),true,false)}" style="margin-left:30px;width:60px;float:right" onclick="SaveAndCloses(3);return false;" rerender="unEditable,message" oncomplete="unblockUI();"/> -->
- <apex:commandbutton disabled="{!IF((RecordTypeName = 'ASRCDecision' && OCSM_QARA = '0') && ((RecordTypeName='ASACDecision'&&OCSM_Cording='0')||(editFlag) && (repa.ETQ_UPLOAD_ERROR_GROUP__c != 'Intake')),true,false)}" onclick="InsertRows();return false;" oncomplete="unblockUI();" rerender="unEditable,message" style="margin-left:30px;width:60px;float:right" value="鎻掑叆琛�">
+ <!-- <apex:commandButton value="鎻掑叆琛�" disabled="{!IF((RecordTypeName='ASRCDecision'&&OCSM_QARA='0')||(RecordTypeName='ASACDecision'&&OCSM_Cording='0')||(editFlag) || (RecordTypeName='ASRCDecision' && repa.SAP_Transfer_time__c != null),true,false)}" style="margin-left:30px;width:60px;float:left" onclick="InsertRows();return false;" rerender="unEditable,message" oncomplete="unblockUI();"/>
+ <apex:commandButton value="鍙栨秷琛�" disabled="{!IF((RecordTypeName='ASRCDecision'&&OCSM_QARA='0')||(RecordTypeName='ASACDecision'&&OCSM_Cording='0')||(editFlag) || (RecordTypeName='ASRCDecision' && repa.SAP_Transfer_time__c != null),true,false)}" style="margin-left:30px;width:60px;float:left" onclick="SaveAndCloses(3);return false;" rerender="unEditable,message" oncomplete="unblockUI();"/> -->
+ <td>
+ <apex:commandbutton disabled="{!IF((RecordTypeName = 'ASRCDecision' && OCSM_QARA = '0') && ((RecordTypeName='ASACDecision'&&OCSM_Cording='0')||(editFlag) && (repa.ETQ_UPLOAD_ERROR_GROUP__c != 'Intake')),true,false)}" onclick="InsertRows();return false;" oncomplete="unblockUI();" rerender="unEditable,message" style="margin-left:30px;width:80px;float:left" value="鎻掑叆琛�">
</apex:commandbutton>
- <apex:commandbutton disabled="{!IF((RecordTypeName = 'ASRCDecision' && OCSM_QARA = '0') && ((RecordTypeName='ASACDecision'&&OCSM_Cording='0')||(editFlag) && (repa.ETQ_UPLOAD_ERROR_GROUP__c != 'Intake')),true,false)}" onclick="SaveAndCloses(3);return false;" oncomplete="unblockUI();" rerender="unEditable,message" style="margin-left:30px;width:60px;float:right" value="鍙栨秷琛�">
+ </td>
+ <td>
+ <apex:commandbutton disabled="{!IF((RecordTypeName = 'ASRCDecision' && OCSM_QARA = '0') && ((RecordTypeName='ASACDecision'&&OCSM_Cording='0')||(editFlag) && (repa.ETQ_UPLOAD_ERROR_GROUP__c != 'Intake')),true,false)}" onclick="SaveAndCloses(3);return false;" oncomplete="unblockUI();" rerender="unEditable,message" style="margin-left:30px;width:80px;float:left" value="鍙栨秷琛�">
</apex:commandbutton>
<!-- update by rentx 2020-10-26 end -->
</td>
@@ -438,7 +460,7 @@
</table>
</apex:outputpanel>
<apex:outputpanel layout="none" rendered="{!IF(RecordTypeName = 'ASACDecision'&& rdRecord.PAE_reappear_confirm__c = '鏈‘璁�',true , false)}">
- <p style="text-align: right;padding-bottom: 10px;width:100%;font-weight: 800;">
+ <p style="text-align: left;padding-bottom: 10px;width:100%;font-weight: 800;">
鍐嶇幇缁撴灉鏈‘璁�,璇风偣鍑籌ntake universal code 缂栬緫 鎸夐挳鍓嶅幓纭
</p>
</apex:outputpanel>
--
Gitblit v1.9.1