From 196df4d4bf1941546d349cadbf343655578ec280 Mon Sep 17 00:00:00 2001
From: 19626 <1962676589@qq.com>
Date: 星期三, 13 九月 2023 15:05:56 +0800
Subject: [PATCH] sit期间修改
---
force-app/main/default/pages/NewQuoteEntry.page | 70 +++++++++++++++++------------------
1 files changed, 34 insertions(+), 36 deletions(-)
diff --git a/force-app/main/default/pages/NewQuoteEntry.page b/force-app/main/default/pages/NewQuoteEntry.page
index e17140f..ae89c1e 100644
--- a/force-app/main/default/pages/NewQuoteEntry.page
+++ b/force-app/main/default/pages/NewQuoteEntry.page
@@ -2,16 +2,13 @@
-->
<apex:page controller="NewQuoteEntryController" sidebar="false" action="{!init}" id="Page" lightningStylesheets="true" >
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
-
-
- <apex:stylesheet value="{!URLFOR($Resource.NewQuoteEntryCss)}"/>
-
+ <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
+ <apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
+ <apex:includeScript value="{!URLFOR($Resource.NewQuoteEntryJS)}"/>
+ <apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
+ <apex:includeScript value="{!URLFOR($Resource.clipboardminjs)}"/>
+ <apex:includeScript value="{!URLFOR($Resource.apex20)}"/>
<script type="text/javascript">
- if(window.sfdcPage && window.sfdcPage.appendToOnloadQueue){
- window.sfdcPage.appendToOnloadQueue(
- function() { calonLoad() }
- );
- }
//娣诲姞琛� html鐗规�у鍔犳粦鍔ㄦ潯 绮剧悽鎶�鏈� wql 2021/02/09 start
//dialog 寮圭獥 start
var popupBox;
@@ -40,15 +37,11 @@
// }
//dialog 寮圭獥 end
// 娣诲姞琛� html鐗规�у鍔犳粦鍔ㄦ潯 绮剧悽鎶�鏈� wql 2021/02/09 end
-
+ debugger
var QuoteEntryMaxLine = {!QuoteEntryMaxLine};
- console.log(QuoteEntryMaxLine );
var trade = '{!oppInfo.Trade}';
- console.log(trade );
var displayCost = '{!displayCost}';
- console.log(displayCost );
var quoid = '{!quoid}';
- console.log(quoid );
var Session_ID = '{!$Api.Session_ID}';
var Price_Valid_Period = '{!$Label.Price_Valid_Period}';
var Message_001 = '{!$Label.Message_001}';
@@ -68,6 +61,14 @@
var QuoteDecide = {!QuoteDecide};
window.sfdcPage.appendToOnloadQueue(function() { calonLoad() });
var openQuoteExcelImportWindow = null;
+
+ // function checkHaveVirtual(msg){
+ // var haveVirtual = j$(escapeVfId("Page:mainForm:block:hidden_HaveVirtual")).value();
+ // console.log(haveVirtual);
+ // if(haveVirtual == true){
+ // alert(msg);
+ // }
+ // }
function selectAll() {
var checklist = j$("input[name='checklist']");
@@ -105,7 +106,7 @@
</script>
<style type="text/css">
div#iframelike {
- color: rgb(24, 24, 24);
+ color: #fff;
height: 300px;
overflow: auto;
}
@@ -191,7 +192,6 @@
opacity: 0.5;
}
/* 娣诲姞琛� html鐗规�у鍔犳粦鍔ㄦ潯 绮剧悽鎶�鏈� wql 2021/02/09 end */
-
</style>
<apex:form id="mainForm">
@@ -258,6 +258,9 @@
<!-- 澶氬勾淇濅慨 start -->
<apex:inputHidden id="hidden_MultiYearWarrantyTotalPrice" value="{!quo.MultiYearWarrantyTotalPrice__c}"/>
<!-- 澶氬勾淇濅慨 end -->
+ <!-- 铏氭嫙浜у搧 start -->
+ <apex:inputHidden id="hidden_HaveVirtual" value="{!quo.Have_Virtual__c}"/>
+ <!-- 铏氭嫙浜у搧 end -->
<apex:inputHidden value="{!enableSales}" id="SalesRoot_Flg"/>
<apex:inputHidden value="{!oppInfo.CurrencyIsoCode}" id="CurrencyIsoCode"/>
<apex:inputHidden value="{!baseUrl}" id="baseUrl"/>
@@ -266,6 +269,10 @@
<apex:inputHidden value="{!oppInfo.Authorized_DB_No}" id="Authorized_DB_No" rendered="{!displayFlg}"/>
<apex:inputHidden value="{!oppInfo.If_Need_Authorize}" id="If_Need_Authorize" rendered="{!displayFlg}"/>
<!-- LHJ End -->
+ <!-- DB202303051651 浜у搧鎶ヤ环閲戦鑷姩璁＄畻 ssm start -->
+ <apex:inputHidden id="rateHospital" value="{!oppInfo.rate_hospital}"/>
+ <apex:inputHidden id="rateAgency1" value="{!oppInfo.rate_agency1}"/>
+ <!-- DB202303051651 浜у搧鎶ヤ环閲戦鑷姩璁＄畻 ssm end -->
<apex:outputPanel id="message1">
<apex:messages styleClass="editListError"/>
@@ -291,7 +298,7 @@
</tr>
</table>
</apex:outputPanel>
- <div style="background-color:#f4f8fd73">
+ <div>
<table border="0">
<tr>
<th style="text-align:right;width:90px;">{!$Label.Quoto_No}</th>
@@ -335,13 +342,12 @@
<td style="width:130px;"><apex:commandButton onclick="openQuoteExcelImport(event);return false;" value="{!$Label.Excel_Import}" style="width:110px;" rerender="dummy"/></td>
<td style="text-align:right;width:50px;"><apex:commandButton rerender="dummy" id="Btn_RowDelete" onclick="radioChecker2('del');return false;" value="{!$Label.deleteLabel}" style="width:60px;" /></td>
<!-- 娣诲姞琛� -->
- <td width="50px;">
+ <td width="40px;">
<!-- 娣诲姞琛� html鐗规�у鍔犳粦鍔ㄦ潯 绮剧悽鎶�鏈� wql 2021/02/09 end -->
<apex:commandButton onclick="openAddMultipleRow(); return false;" value="澧炲姞琛�" rerender="{!displayFlg}"/>
</td>
- <td style="width:50px;">
- <apex:commandButton rerender="dummy" id="Btn_RowUp" onclick="radioChecker2('up');return false;" value="{!$Label.Row_Up}" style="width:60px;"/> </td>
- <td style="width:50px;">
+ <td style="width:130px;">
+ <apex:commandButton rerender="dummy" id="Btn_RowUp" onclick="radioChecker2('up');return false;" value="{!$Label.Row_Up}" style="width:60px;"/>
<apex:commandButton rerender="dummy" id="Btn_RowDown" onclick="radioChecker2('down');return false;" value="{!$Label.Row_Down}" style="width:60px;"/>
</td>
@@ -363,21 +369,20 @@
</table>
-->
<!-- 鍘熶唬鐮� end -->
- <div style="background-color:#f4f8fd73">
- <table >
+ <table>
<tr>
<td> </td>
</tr>
<tr>
<th style="text-align:right;width:30px;"> </th>
- <th style="text-align:left;width:130px;">鍚堝悓淇濅慨鏈燂紙骞达級: </th>
+ <th style="text-align:right;width:50px;">鍚堝悓淇濅慨鏈燂紙骞达級: </th>
<td style="width:190px;"><apex:inputField id="AllGurantee_Period" value="{!quo.Gurantee_Period__c}" onchange="calGuranteePeriod();" style="width:50px; text-align:right;" />
<apex:inputHidden id="Gurantee_Period__c" value="{!quo.Gurantee_Period__c}"/>
</td>
<!-- 澶栬锤澶氬勾淇� 鍙栨秷nodiscount 鍚堣 闅愯棌 绮剧悽鎶�鏈� wql 2021/01/18 start -->
<apex:variable id="contractWarranty" value="{!1}" var="abc" >
- <th style="text-align:right;width:130px;">
+ <th style="text-align:right;width:50px;">
{!$ObjectType.Quote.fields.MultiYearWarrantyTotalPrice__c.label}
: </th>
<td style="width:370px;">
@@ -412,7 +417,7 @@
</div>
</td>
- <th style="text-align:right;width:130px;">
+ <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>
@@ -438,8 +443,7 @@
<tr>
<td> </td>
</tr>
- </table></div>
-
+ </table>
<!-- 澶氬勾淇濅慨 end -->
<DIV style="OVERFLOW-Y: hidden; OVERFLOW-X:auto;width:1260px">
@@ -521,7 +525,7 @@
<td class="dataCell" style="text-align:center;width:125px;">
<!-- 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}',{!quoteEntryMaxLine},'{!oppInfo.CelonOpportunity}')" />
+ <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;">
@@ -566,7 +570,7 @@
</td>
<td class="dataCell" style="text-align: center;width:50px;">
<!-- 2018/09/28 CHAN-B4YAB8 缁忛攢鍟嗗崟浠疯绠� start -->
- <apex:inputField id="Quantity" style="width:45px;text-align:center;" value="{!s.PageObject.Quantity__c}" onChange="calPrice('{!s.lineNo}');quoteAgencyTotalPriceAction();AgencyDiscountCalculation1();"/>
+ <apex:inputField id="Quantity" style="width:30px;text-align:center;" value="{!s.PageObject.Quantity__c}" onChange="calPrice('{!s.lineNo}');quoteAgencyTotalPriceAction();AgencyDiscountCalculation1();"/>
<!-- 2018/09/28 CHAN-B4YAB8 缁忛攢鍟嗗崟浠疯绠� end -->
</td>
<td class="dataCell" style="width:20px;text-align: center;">
@@ -878,10 +882,4 @@
</script>
<!-- //娣诲姞琛� html鐗规�у鍔犳粦鍔ㄦ潯 绮剧悽鎶�鏈� wql 2021/02/09 end -->
- <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
- <apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
- <apex:includeScript value="{!URLFOR($Resource.NewQuoteEntryJS)}"/>
- <apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
- <apex:includeScript value="{!URLFOR($Resource.clipboardminjs)}"/>
- <apex:includeScript value="{!URLFOR($Resource.apex20)}"/>
</apex:page>
\ No newline at end of file
--
Gitblit v1.9.1