From cc266a1e4080bb3ecc47ea4a202dd549545111e1 Mon Sep 17 00:00:00 2001
From: 游畅 <youchang@prec-tech.com>
Date: 星期六, 29 四月 2023 16:10:52 +0800
Subject: [PATCH] 贸易合规20230429
---
force-app/main/default/pages/NewQuoteEntry.page | 45 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 40 insertions(+), 5 deletions(-)
diff --git a/force-app/main/default/pages/NewQuoteEntry.page b/force-app/main/default/pages/NewQuoteEntry.page
index 16ff2ad..fb06f3a 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)}"/>
@@ -22,6 +22,19 @@
document.getElementById("speedDiv").style.display = 'block';
}
+ // function decision2btns(){
+ // ReservedProductVerification();
+ // debugger
+ // var filg=j$(escapeVfId('Page:mainForm:filg')).value();
+ // // var filg={!filg};
+ // console.warn(filg);
+ // if(filg == 'true'){
+ // console.warn('鎴愬姛');
+ // // decision2btn();
+ // }else{
+ // alert('浜у搧鏁伴噺涓嶅彲瓒呰繃浜у搧棰勭暀鏁伴噺');
+ // }
+ // }
//dialog 寮圭獥 end
// 娣诲姞琛� html鐗规�у鍔犳粦鍔ㄦ潯 绮剧悽鎶�鏈� wql 2021/02/09 end
@@ -177,6 +190,8 @@
<apex:outputText id="hiddenQuoid" value="{!quoid}" style="display:none;"/>
<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();">
@@ -210,6 +225,7 @@
<!-- 鍋滄棰勮 20210930 lt add MarkRed(); -->
<apex:actionFunction action="{!Save}" name="Save" reRender="mainForm" oncomplete="unblockUI();MarkRed();"/>
<!-- 鎶ヤ环璇曠畻 -->
+ <!-- <apex:actionFunction action="{!ReservedProductVerification}" name="ReservedProductVerification" reRender="mainForm" /> -->
<apex:actionFunction action="{!Jump}" name="Jump" reRender="mainForm" oncomplete="unblockUI();" />
<apex:actionFunction action="{!OppReflection}" name="OppReflection" reRender="mainForm" oncomplete="unblockUI();"/>
<apex:actionFunction action="{!Print}" name="Print" reRender="mainForm" oncomplete="openQuotePage('{!quo.Contract__c}','{!errorflg}','{!quoid}');unblockUI();"/>
@@ -284,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>
@@ -392,6 +409,21 @@
</apex:variable>
<!-- 澶栬锤澶氬勾淇� 鍙栨秷nodiscount 鍚堣 绮剧悽鎶�鏈� wql 2021/01/18 end -->
</tr>
+ <!-- SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy start -->
+ <tr>
+ <th style="text-align:right;width:30px;"> </th>
+ <th style="text-align:left;width:50px;">{!$ObjectType.Quote.fields.QuotationChange__c.label}: </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}: </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}
+ : </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 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy end -->
<tr>
<td> </td>
</tr>
@@ -475,7 +507,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}"/>
--
Gitblit v1.9.1