From be8ca3316a9afeec26434b5eb359012aa0633d06 Mon Sep 17 00:00:00 2001
From: unknown <sunxia@prec-tech.com>
Date: 星期四, 11 五月 2023 17:39:21 +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 | 21 ++-------------------
1 files changed, 2 insertions(+), 19 deletions(-)
diff --git a/force-app/main/default/pages/PAEDecisionRecord.page b/force-app/main/default/pages/PAEDecisionRecord.page
index 0660da2..4f8b749 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鍒ゅ畾璁板綍" lightningStylesheets="true">
+<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,23 +70,6 @@
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) {
@@ -424,7 +407,7 @@
<!-- 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: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 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:100px;float:left" value="淇濆瓨骞跺叧闂�">
</apex:commandbutton>
</td>
<!-- When 瑕佷笉瑕佽繘琛屼慨鐞嗙殑鍒ゅ畾=瑕� -->
--
Gitblit v1.9.1