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/SelectAssetEstimate.page | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/force-app/main/default/pages/SelectAssetEstimate.page b/force-app/main/default/pages/SelectAssetEstimate.page
index b9dca4f..5082ab8 100644
--- a/force-app/main/default/pages/SelectAssetEstimate.page
+++ b/force-app/main/default/pages/SelectAssetEstimate.page
@@ -1,10 +1,10 @@
<!--<apex:page standardcontroller="Maintenance_Contract_Estimate__c" extensions="SelectAssetEstimateController" sidebar="false" showHeader="true" id="allPage" action="{!init}"> -->
-<apex:page controller="SelectAssetEstimateController" tabStyle="Maintenance_Contract_Estimate__c" sidebar="false" showHeader="true" id="allPage" action="{!init}">
+<apex:page controller="SelectAssetEstimateController" tabStyle="Maintenance_Contract_Estimate__c" sidebar="false" showHeader="true" id="allPage" action="{!init}" lightningStylesheets="true" >
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
- <apex:includeScript value="/soap/ajax/29.0/connection.js"/>
- <apex:includeScript value="/soap/ajax/29.0/apex.js"/>
+ <apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
+ <apex:includeScript value="{!URLFOR($Resource.apex20)}"/>
<style type="text/css">
table { border-collapse: collapse; }
@@ -1330,6 +1330,7 @@
<td><apex:outputField value="{!estimate.Contract_End_Date__c}" id="contractenddate"/></td>
<td> </td>
<td><apex:commandButton id="decidebtn" value="{!$Label.QuoteDecision_Button}" disabled="{!DecideBtnDisabled}" onclick="decideJs(); return false;"/></td>
+ <!-- <td><apex:commandButton id="decidebtn1" value="{!$Label.QuoteDecision_Button}" action="{!dosomething}"/></td> -->
<td style="text-align:right"><apex:commandButton id="undecidebtn" action="{!undecide}" value="鍙栨秷{!$Label.QuoteDecision_Button}" disabled="{!UnDecideBtnDisabled}" rerender="allForm" onclick="blockme();" oncomplete="unblockUI();"/></td>
</tr>
</table>
--
Gitblit v1.9.1