From 032b9eb2ee198505c7cd2ec546b0a001ba52ab4e Mon Sep 17 00:00:00 2001
From: chenjingwu <chenjingwu@prec-tech.com>
Date: 星期五, 12 四月 2024 14:23:48 +0800
Subject: [PATCH] 123

---
 force-app/main/default/lwc/lexNewQuoteEntry/lexNexQuoteEntryUtil.js |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/force-app/main/default/lwc/lexNewQuoteEntry/lexNexQuoteEntryUtil.js b/force-app/main/default/lwc/lexNewQuoteEntry/lexNexQuoteEntryUtil.js
index 73427e0..cd5b48e 100644
--- a/force-app/main/default/lwc/lexNewQuoteEntry/lexNexQuoteEntryUtil.js
+++ b/force-app/main/default/lwc/lexNewQuoteEntry/lexNexQuoteEntryUtil.js
@@ -1311,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) {
@@ -1322,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 == '甯傚満') {
@@ -1631,11 +1631,11 @@
         }
     });
     thirdPartyEstimation_List_Price = localParseFloat(thirdPartyEstimation_List_Price);
-    quo.Quote_Adjust_Amount_Page__c = toNumComma(x - noDiscountPriceTotal - z - y);
+    quo.Quote_Adjust_Amount_Page__c = toNumComma(x - noDiscountPriceTotal - y);
     if (y - thirdPartyEstimation_List_Price == 0) {
         quo.Quote_Adjust_Calculate__c = toNumComma(0);
     } else {
-        quo.Quote_Adjust_Calculate__c = toNumComma((x - noDiscountPriceTotal - z - y) / (y - thirdPartyEstimation_List_Price) * 100);
+        quo.Quote_Adjust_Calculate__c = toNumComma((x - noDiscountPriceTotal - y) / (y - thirdPartyEstimation_List_Price) * 100);
     }
     quoExp = quo;
     return jzDataToBeproduct;
@@ -2338,10 +2338,13 @@
     debugger
     var x = 0;
     var y = 0;
+    var z = 0;
     jzDataToBeproduct.forEach(jzdtbt=>{
         x = jzdtbt.pageObject.Subtotal__c;
+        z = jzdtbt.exPrice;
         x = localParseFloat(x);
-        y = y + localParseFloat(x);
+        z = localParseFloat(z);
+        y = y + localParseFloat(x) + z;
     });
     quo.QuoteTotal_Page__c = toNumComma(y);
     var z = quo.Estimation_List_Price__c;
@@ -2353,13 +2356,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;
@@ -2675,7 +2680,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);
@@ -2684,6 +2691,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