Merge branch 'master' into LEXUpgrade2023-Deloitte

buli

2023-07-14 e6068da47c1bef5517c9e5fdc8c726766867ad4e

 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}';
@@ -191,6 +191,7 @@
        <apex:inputHidden id="changedAfterPrint" value="{!changedAfterPrint}"/>
        <apex:inputHidden id="changedAfterBid" value="{!changedAfterBid}"/>
        <apex:inputHidden id="filg" value="{!filg}" />
        <apex:inputHidden id="SkipQuotefilg" value="{!SkipQuotefilg}" />
        <apex:inputHidden id="productStatusUpdated" value="{!productStatusUpdated}"/>
        <!-- 20211011 lt add MarkRed();-->
        <apex:actionFunction action="{!setProductEntry}" name="setProductEntry" reRender="mainForm" oncomplete="unblockUI();calPriceAll();MarkRed();">
@@ -299,11 +300,12 @@
                    <tr>
                        <th style="text-align:right">{!IF(displayFlg,'产品标准定价总额','')}</th>
                        <td style="text-align:right;"><apex:outputText id="Estimation_List_Price" style="display:{!IF(displayFlg, '', 'none')}" value="{0, number, ###,##0.00}"><apex:param value="{!qb.Estimation_List_Price}" /></apex:outputText></td>
                        <th style="text-align:right;">{!IF(displayFlg,$Label.Total_Price,'')}</th>
                        <td><apex:inputField id="quoTotalPrice" value="{!quo.QuoteTotal_Page__c}" style="text-align:right;" rendered="{!displayFlg}" onchange="quoteTotalPriceAction()"/></td>
                        <th style="text-align:right;">{!IF(displayFlg,$Label.Total_Price,'')}</th><!--obsap 经销商1合同金额计算 fy  html-disabled="true" -->
                        <td><apex:inputField id="quoTotalPrice" value="{!quo.QuoteTotal_Page__c}" style="text-align:right;" rendered="{!displayFlg}" onchange="quoteTotalPriceAction()" html-disabled="true"/></td>
                        <th style="text-align:right;">{!IF(displayFlg,$Label.Contact_Price,'')}</th>
                            <!--    2018/09/28 CHAN-B4YAB8 经销商单价计算 start -->
                        <td><div class="requiredInput"><div class="requiredBlock"></div><apex:inputField id="Dealer_Final_Price" value="{!quo.Dealer_Final_Price_Page__c}" style="text-align:right;" rendered="{!displayFlg}" onChange="calFromContactPrice();setOCMAmount();quoteAgencyTotalPriceAction1('OCM直接销售');"/></div></td>
                             <!-- fy obsap  <div class="requiredBlock"> </div>-->
                        <td><div class="requiredInput"><apex:inputField id="Dealer_Final_Price" value="{!quo.Dealer_Final_Price_Page__c}" style="text-align:right;" rendered="{!displayFlg}" onChange="calFromContactPrice();setOCMAmount();quoteAgencyTotalPriceAction1('OCM直接销售');"/></div></td>
                            <!--    2018/09/28 CHAN-B4YAB8 经销商单价计算 end -->
                        <th style="text-align:right;">{!IF(displayFlg,$Label.Forecast_Amounts,'')}</th>
                        <td style="text-align:right;"><apex:outputLabel id="Wholesale_Price" value="{!oppInfo.Wholesale_Price}" style="display:{!IF(displayFlg, '', 'none')}"/></td>
@@ -368,7 +370,7 @@
                    <th style="text-align:right;width:50px;">
                        {!$ObjectType.Quote.fields.MultiYearWarrantyTotalPrice__c.label}
                    :&nbsp;</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}"/>
@@ -400,13 +402,29 @@
                    </div>
                    </td>
                     
                    <th style="text-align:right;width:50px;">
                    <th style="text-align:right;width:20px;">
                        {!$ObjectType.Quote.fields.multiYearWarranty__c.label}
                    :&nbsp;</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>
                <!-- SWAG-CKDATG 【委托】【OBSAP-报价委托】报价委托项目改善1 fy start -->
                <tr>
                    <th style="text-align:right;width:30px;">&nbsp;</th>
                    <th style="text-align:left;width:50px;">{!$ObjectType.Quote.fields.QuotationChange__c.label}:&nbsp;</th>
                    <td style="width:190px;"><apex:inputField id="QuotationChange" value="{!quo.QuotationChange__c}"  style="width:205px; text-align:left;" />
                    </td>
                    <th style="text-align:right;width:50px;">{!$ObjectType.Quote.fields.MainEngineWithoutMonitor__c.label}:&nbsp;</th>
                    <td style="width:50px;"><apex:inputField id="RemarksOnChanges" value="{!quo.MainEngineWithoutMonitor__c}"  style=" text-align:center;" />
                    </td>
                    <th style="text-align:right;width:50px;">
                        {!$ObjectType.Quote.fields.Interdepartmental__c.label}
                    :&nbsp;</th>
                    <td style="width:200px;"><apex:inputField id="Interdepartmental" value="{!quo.Interdepartmental__c}" onchange="callFromCancelgurantee_MD();" style="text-align:right;width:30px;" /></td>
                </tr>
                <!-- SWAG-CKDATG 【委托】【OBSAP-报价委托】报价委托项目改善1 fy end -->
                <tr>
                    <td>&nbsp;</td>
                </tr>
@@ -490,7 +508,10 @@
                        <apex:outputLabel id="indexNo" value="{!IF(s.PageObject.Id__c==null,null,s.lineNo + 1)}" style="width:10px;"/>
                    </td>
                    <td class="dataCell" style="text-align:center;width:125px;">
                        <apex:inputText id="Assert" style="width:95%;" value="{!s.Asset_Model}" onclick="searchProduct('{!s.lineNo}',this.value)" />
                        <!-- Celon询价修改 2022-04-24 ssm start -->
                        <!-- <apex:inputText id="Assert" style="width:95%;" value="{!s.Asset_Model}" onclick="searchProduct('{!s.lineNo}',this.value)" /> -->
                        <apex:inputText id="Assert" style="width:95%;" value="{!s.Asset_Model}" onclick="searchProduct('{!s.lineNo}',this.value,'{!oppInfo.CelonOpportunity}')" />
                        <!-- Celon询价修改 2022-04-24 ssm end -->
                    </td>
                    <td class="dataCell" id="{!Text(cnt-1)}:td_Status__c" style="width:70px;text-align: center;">
                        <apex:outputField style="width:75px;" id="Status__c" value="{!s.PageObject.SFDA_Status__c}"/>