From d99542c680e8da1615ba69c4030dbebec8f6e48e Mon Sep 17 00:00:00 2001
From: chenjingwu <chenjingwu@prec-tech.com>
Date: 星期五, 12 四月 2024 10:31:15 +0800
Subject: [PATCH] 123

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

diff --git a/force-app/main/default/lwc/lexNewQuoteEntry/lexNewQuoteEntry.js b/force-app/main/default/lwc/lexNewQuoteEntry/lexNewQuoteEntry.js
index 979162d..6d1df50 100644
--- a/force-app/main/default/lwc/lexNewQuoteEntry/lexNewQuoteEntry.js
+++ b/force-app/main/default/lwc/lexNewQuoteEntry/lexNewQuoteEntry.js
@@ -1455,8 +1455,10 @@
         this.quo.Quote_Adjust_Amount_Page__c = toNumComma(y);
         y=localParseFloat(y);
         var noDiscountPriceTotal = this.hidden_MultiYearWarrantyTotalPrice;
+        var exPriceTotal = this.quo.ExtendedWarrantyAmountTotalPrice__c;
         noDiscountPriceTotal=localParseFloat(noDiscountPriceTotal);
-        this.quo.QuoteTotal_Page__c=toNumComma(y + x + noDiscountPriceTotal);
+        exPriceTotal = localParseFloat(exPriceTotal);
+        this.quo.QuoteTotal_Page__c=toNumComma(y + x + noDiscountPriceTotal + exPriceTotal);
         var z=this.quo.Estimation_List_Price__c;
         var id=this.quoId;
         // if(!id){
@@ -1663,12 +1665,12 @@
         var data=event.detail.rows;
         console.log('data==>> ' + JSON.stringify(data));
         this.jzDataToBeproduct=onsaveToBeproductLoc(data,this.jzDataToBeproduct);
+        debugger
         if(fagExp){
             this.quo.IsQuoteTrial__c=false;
             this.quoteAgencyTotalPriceAction();
             this.AgencyDiscountCalculation1();
         }
-        debugger
         this.updateNoDiscountPricetotal();
         // chenjingwu 
         this.updateExPricetotal()
@@ -1859,20 +1861,20 @@
                     });
                     addOptions({idList: idList}).then(result=>{
                         this.addOptionsLogic(result);
+                        if(quoteLineItem.length!=num){
+                            this.quo.IsQuoteTrial__c = false;
+                        }
+                        this.calPriceAll();
+                        if(errormessage.indexOf('鎴愬姛') >= 0){
+                            this.Alert(errormessage,'success');
+                        }else{
+                            this.Alert(errormessage,'error');
+                        }
+                        
+                        this.OnLoading(false);
+                        this.cancelQuoteExcelImport();
                         this.tobeflag=true;
                     });
-                    if(quoteLineItem.length!=num){
-                        this.quo.IsQuoteTrial__c = false;
-                    }
-                    this.calPriceAll();
-                    if(errormessage.indexOf('鎴愬姛') >= 0){
-                        this.Alert(errormessage,'success');
-                    }else{
-                        this.Alert(errormessage,'error');
-                    }
-                    
-                    this.OnLoading(false);
-                    this.cancelQuoteExcelImport();
             });
     }
     @track

--
Gitblit v1.9.1