From 65a3de8fc057c6550f38d2aef6b5ed7f0e7e2f81 Mon Sep 17 00:00:00 2001
From: chenjingwu <chenjingwu@prec-tech.com>
Date: 星期一, 15 四月 2024 09:55:08 +0800
Subject: [PATCH] 123
---
force-app/main/default/lwc/lexNewQuoteEntry/lexNexQuoteEntryUtil.js | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/force-app/main/default/lwc/lexNewQuoteEntry/lexNexQuoteEntryUtil.js b/force-app/main/default/lwc/lexNewQuoteEntry/lexNexQuoteEntryUtil.js
index d610887..ba849d6 100644
--- a/force-app/main/default/lwc/lexNewQuoteEntry/lexNexQuoteEntryUtil.js
+++ b/force-app/main/default/lwc/lexNewQuoteEntry/lexNexQuoteEntryUtil.js
@@ -1631,11 +1631,11 @@
}
});
thirdPartyEstimation_List_Price = localParseFloat(thirdPartyEstimation_List_Price);
- quo.Quote_Adjust_Amount_Page__c = toNumComma(x - noDiscountPriceTotal - y);
+ quo.Quote_Adjust_Amount_Page__c = toNumComma(x - noDiscountPriceTotal - y - z);
if (y - thirdPartyEstimation_List_Price == 0) {
quo.Quote_Adjust_Calculate__c = toNumComma(0);
} else {
- quo.Quote_Adjust_Calculate__c = toNumComma((x - noDiscountPriceTotal - y) / (y - thirdPartyEstimation_List_Price) * 100);
+ quo.Quote_Adjust_Calculate__c = toNumComma((x - noDiscountPriceTotal - y - z) / (y - thirdPartyEstimation_List_Price) * 100);
}
quoExp = quo;
return jzDataToBeproduct;
@@ -1990,6 +1990,7 @@
quo.OCM_Agent1_Price_Page__c = '';
}
quo.MultiYearWarrantyTotalPrice__c = toNumComma(quo.MultiYearWarrantyTotalPrice__c);
+ quo.ExtendedWarrantyAmountTotalPrice__c = toNumComma(quo.ExtendedWarrantyAmountTotalPrice__c);
quo.Agency1_Profit__c = toNumComma(quo.Agency1_Profit__c);
quo.Agency2_Profit__c = toNumComma(quo.Agency2_Profit__c);
//棰勬祴閲戦淇敼 fy
@@ -2235,7 +2236,7 @@
jzdtbt.exPrice = item.MultiOneYearWarrantyPrice__c;
}
});
- if(jzdtbt.exPrice == null || jzdtbt.exPrice == '' || jzdtbt.exPrice == undefined){
+ if(jzdtbt.exPrice == null || jzdtbt.exPrice == '' || jzdtbt.exPrice == undefined || jzdtbt.Learning_Community == '0'){
jzdtbt.exPrice = 0;
}
}
@@ -2341,11 +2342,11 @@
jzDataToBeproduct.forEach(jzdtbt=>{
x = jzdtbt.pageObject.Subtotal__c;
x = localParseFloat(x);
- y = y + localParseFloat(x) + z;
+ y = y + localParseFloat(x);
});
var e = quo.ExtendedWarrantyAmountTotalPrice__c;
e = localParseFloat(e);
- quo.QuoteTotal_Page__c = toNumComma(y) + toNumComma(e);
+ quo.QuoteTotal_Page__c = toNumComma(y + e);
var z = quo.Estimation_List_Price__c;
var id = quoId;
// if(!id){
--
Gitblit v1.9.1