From 3419066d82b93d834b71b7b88a38fa9526e86f8a Mon Sep 17 00:00:00 2001
From: chenjingwu <chenjingwu@prec-tech.com>
Date: 星期五, 12 四月 2024 14:34:38 +0800
Subject: [PATCH] 123
---
force-app/main/default/lwc/lexNewQuoteEntry/lexNexQuoteEntryUtil.js | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/force-app/main/default/lwc/lexNewQuoteEntry/lexNexQuoteEntryUtil.js b/force-app/main/default/lwc/lexNewQuoteEntry/lexNexQuoteEntryUtil.js
index fb7080c..1f30230 100644
--- a/force-app/main/default/lwc/lexNewQuoteEntry/lexNexQuoteEntryUtil.js
+++ b/force-app/main/default/lwc/lexNewQuoteEntry/lexNexQuoteEntryUtil.js
@@ -607,6 +607,7 @@
quo.Dealer_Final_Price_Page__c = quoin.Dealer_Final_Price_Page__c!=undefined&&quoin.Dealer_Final_Price_Page__c!=='' ?localParseFloat(quoin.Dealer_Final_Price_Page__c):null;
quo.OCM_Agent1_Price_Page__c = quoin.OCM_Agent1_Price_Page__c!=undefined &&quoin.OCM_Agent1_Price_Page__c!==''? localParseFloat(quoin.OCM_Agent1_Price_Page__c):null;
quo.MultiYearWarrantyTotalPrice__c = quoin.MultiYearWarrantyTotalPrice__c!=undefined? localParseFloat(quoin.MultiYearWarrantyTotalPrice__c):null;
+ quo.ExtendedWarrantyAmountTotalPrice__c = quoin.ExtendedWarrantyAmountTotalPrice__c!=undefined? localParseFloat(quoin.ExtendedWarrantyAmountTotalPrice__c):null;
quo.Estimation_List_Price__c = quoin.Estimation_List_Price__c!=undefined? localParseFloat(quoin.Estimation_List_Price__c):null;
quo.QuoteTotal_Page__c = quoin.QuoteTotal_Page__c !=undefined?localParseFloat(quoin.QuoteTotal_Page__c):null;
quo.Agency1_Profit__c = quoin.Agency1_Profit__c !=undefined?localParseFloat(quoin.Agency1_Profit__c):null;
@@ -1310,7 +1311,7 @@
warrantyType = '甯傚満澶氬勾淇濅慨';
var Quantity =jzdtbt.Quantity__c;
MultiYearWarrantyTotalPrice__c = MultiYearWarrantyTotalPrice__c + localParseFloat(ServicePrice) * localParseFloat(Quantity);
- ExtendedWarrantyAmountTotalPrice__c = ExtendedWarrantyAmountTotalPrice__c + localParseFloat(jzdtbt.exPrice) * localParseFloat(Quantity);
+ // ExtendedWarrantyAmountTotalPrice__c = ExtendedWarrantyAmountTotalPrice__c + localParseFloat(jzdtbt.exPrice) * localParseFloat(Quantity);
NoDiscountTotal = localParseFloat(ServicePrice) * localParseFloat(Quantity);
}
else if (GuranteeType == '甯傚満' && contractmultiYearWarranty && CanNotCancelledGurantee) {
@@ -1321,7 +1322,7 @@
// 鏁伴噺
var Quantity = jzdtbt.Quantity__c;
MultiYearWarrantyTotalPrice__c = MultiYearWarrantyTotalPrice__c + localParseFloat(ServicePrice) * localParseFloat(Quantity);
- ExtendedWarrantyAmountTotalPrice__c = ExtendedWarrantyAmountTotalPrice__c + localParseFloat(jzdtbt.exPrice) * localParseFloat(Quantity);
+ // ExtendedWarrantyAmountTotalPrice__c = ExtendedWarrantyAmountTotalPrice__c + localParseFloat(jzdtbt.exPrice) * localParseFloat(Quantity);
NoDiscountTotal = localParseFloat(ServicePrice) * localParseFloat(Quantity);
}
else if (GuranteeType == '甯傚満') {
@@ -1530,7 +1531,9 @@
//no discount price 鍚堣
var noDiscountPriceTotal = hidden_MultiYearWarrantyTotalPrice;
noDiscountPriceTotal = localParseFloat(noDiscountPriceTotal);
- TotalPrice = TotalPrice - noDiscountPriceTotal;
+ var exPriceTotal = quo.ExtendedWarrantyAmountTotalPrice__c;
+ exPriceTotal = localParseFloat(exPriceTotal);
+ TotalPrice = TotalPrice - noDiscountPriceTotal - exPriceTotal;
jzDataToBeproduct.forEach(jzdtbt=>{
s = jzdtbt.Quantity__c;
s = localParseInt(s);
@@ -1606,6 +1609,8 @@
x = localParseFloat(x);
var y = quo.hidden_Estimation_List;
y = localParseFloat(y);
+ var z = quo.ExtendedWarrantyAmountTotalPrice__c;
+ z = localParseFloat(z);
var noDiscountPriceTotal = hidden_MultiYearWarrantyTotalPrice;
noDiscountPriceTotal = localParseFloat(noDiscountPriceTotal);
var thirdPartyEstimation_List_Price = 0;
@@ -1670,7 +1675,9 @@
//no discount price 鍚堣
var noDiscountPriceTotal = hidden_MultiYearWarrantyTotalPrice;
noDiscountPriceTotal = localParseFloat(noDiscountPriceTotal);
- var t = (y - noDiscountPriceTotal - thirdPartyEstimation_List_Price) / (Estimation_List_Price - thirdPartyEstimation_List_Price) * 100;
+ var exPriceTotal = quo.ExtendedWarrantyAmountTotalPrice__c;
+ exPriceTotal = localParseFloat(exPriceTotal);
+ var t = (y - noDiscountPriceTotal - exPriceTotal - thirdPartyEstimation_List_Price) / (Estimation_List_Price - thirdPartyEstimation_List_Price) * 100;
quo.AgencyDiscount__c = toNumComma(t);
// j$(escapeVfId('Page:mainForm:block:AgencyDiscount')).val(toNumComma(t));
}
@@ -1798,6 +1805,8 @@
//no discount price 鍚堣
var noDiscountPriceTotal = hidden_MultiYearWarrantyTotalPrice;
noDiscountPriceTotal = localParseFloat(noDiscountPriceTotal);
+ var exPriceTotal = quo.ExtendedWarrantyAmountTotalPrice__c;
+ exPriceTotal = localParseFloat(exPriceTotal);
jzDataToBeproduct.forEach(jzdtbt=>{
s = jzdtbt.Quantity__c;
s = localParseInt(s);
@@ -1839,7 +1848,7 @@
VenderName = '';
}
if (VenderName == 'OSH' || VenderName == '') {
- yy = localParseFloat(x * (z - noDiscountPriceTotal) / y);
+ yy = localParseFloat(x * (z - noDiscountPriceTotal - exPriceTotal) / y);
jzdtbt.pageObject.Subtotal__c = toNum(yy + s * noDiscountPrice);
// jzdtbt.Subtotal__c = toNumComma(yy + s * noDiscountPrice);
jzdtbt.Subtotal__c = yy + s * noDiscountPrice;
@@ -1851,7 +1860,7 @@
zz = zz + yy;
}
});
- quo.QuoteTotal_Page__c = toNumComma(zz + noDiscountPriceTotal);
+ quo.QuoteTotal_Page__c = toNumComma(zz + noDiscountPriceTotal + exPriceTotal);
quoExp = quo;
return jzDataToBeproduct;
}
@@ -2334,7 +2343,9 @@
x = localParseFloat(x);
y = y + localParseFloat(x);
});
- quo.QuoteTotal_Page__c = toNumComma(y);
+ var e = quo.ExtendedWarrantyAmountTotalPrice__c;
+ e = localParseFloat(e);
+ quo.QuoteTotal_Page__c = toNumComma(y + e);
var z = quo.Estimation_List_Price__c;
var id = quoId;
// if(!id){
@@ -2344,13 +2355,15 @@
mp = localParseFloat(mp);
var num = quo.Quote_Adjust_Calculate__c;
num = localParseFloat(num);
+ var ex = quo.ExtendedWarrantyAmountTotalPrice__c;
+ ex = localParseFloat(ex);
quo.Quote_Adjust_Calculate__c = toNumComma(num);
num = (100 + num) / 100;
z=localParseFloat(z);
var rh = oppInfo.rate_hospital;
var ra = oppInfo.rate_agency1;
quo.Dealer_Final_Price_Page__c = toNumComma(z*rh);
- quo.OCM_Agent1_Price_Page__c = Saleslet ? toNumComma(z*num*ra+mp) : '';
+ quo.OCM_Agent1_Price_Page__c = Saleslet ? toNumComma(z*num*ra+mp+ex) : '';
}
// }
quoExp = quo;
@@ -2666,7 +2679,9 @@
export function Agent1comput(quo,Saleslet,oppInfo){
var z = quo.Estimation_List_Price__c;
var mp =quo.MultiYearWarrantyTotalPrice__c;
+ var ex = quo.ExtendedWarrantyAmountTotalPrice__c;
mp = localParseFloat(mp);
+ ex = localParseFloat(ex);
var num = quo.Quote_Adjust_Calculate__c;
num = localParseFloat(num);
quo.Quote_Adjust_Calculate__c = toNumComma(num);
@@ -2675,6 +2690,6 @@
var rh = oppInfo.rate_hospital;
var ra = oppInfo.rate_agency1;
quo.Dealer_Final_Price_Page__c = toNumComma(z*rh);
- quo.OCM_Agent1_Price_Page__c = Saleslet ? toNumComma(z*num*ra+mp):'';
+ quo.OCM_Agent1_Price_Page__c = Saleslet ? toNumComma(z*num*ra+mp+ex):'';
return quo;
}
\ No newline at end of file
--
Gitblit v1.9.1