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/NewQuoteEntry.page | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/force-app/main/default/pages/NewQuoteEntry.page b/force-app/main/default/pages/NewQuoteEntry.page index eb484ac..092af2c 100644 --- a/force-app/main/default/pages/NewQuoteEntry.page +++ b/force-app/main/default/pages/NewQuoteEntry.page @@ -1,6 +1,6 @@ <!--<apex:page standardController="Quote" extensions="NewQuoteEntryController" sidebar="false" action="{!init}" id="Page"> --> -<apex:page controller="NewQuoteEntryController" sidebar="false" action="{!init}" id="Page" > +<apex:page controller="NewQuoteEntryController" sidebar="false" action="{!init}" id="Page" lightningStylesheets="true" > <apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/> <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/> <apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/> @@ -37,7 +37,7 @@ // } //dialog 寮圭獥 end // 娣诲姞琛� html鐗规�у鍔犳粦鍔ㄦ潯 绮剧悽鎶�鏈� wql 2021/02/09 end - + debugger var QuoteEntryMaxLine = {!QuoteEntryMaxLine}; var trade = '{!oppInfo.Trade}'; var displayCost = '{!displayCost}'; @@ -370,7 +370,7 @@ <th style="text-align:right;width:50px;"> {!$ObjectType.Quote.fields.MultiYearWarrantyTotalPrice__c.label} : </th> - <td style="width:470px;"> + <td style="width:370px;"> <apex:outputtext id="MultiYearWarrantyTotalPrice_out" value="{0, number, ###,##0.00}" style="text-align:right;width:180px;"> <apex:param value="{!quo.MultiYearWarrantyTotalPrice__c}"/> @@ -402,10 +402,11 @@ </div> </td> - <th style="text-align:right;width:50px;"> + <th style="text-align:right;width:20px;"> {!$ObjectType.Quote.fields.multiYearWarranty__c.label} : </th> <td style="width:200px;"><apex:inputField id="multiYearWarranty" value="{!quo.multiYearWarranty__c}" onchange="callFromCancelgurantee_MD();" style="text-align:right;width:30px;" /></td> + </apex:variable> <!-- 澶栬锤澶氬勾淇� 鍙栨秷nodiscount 鍚堣 绮剧悽鎶�鏈� wql 2021/01/18 end --> </tr> -- Gitblit v1.9.1