From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte
---
force-app/main/default/lwc/quoteTrial/quoteTrialUtil.js | 25 ++++++-------------------
1 files changed, 6 insertions(+), 19 deletions(-)
diff --git a/force-app/main/default/lwc/quoteTrial/quoteTrialUtil.js b/force-app/main/default/lwc/quoteTrial/quoteTrialUtil.js
index 98765f6..81660c0 100644
--- a/force-app/main/default/lwc/quoteTrial/quoteTrialUtil.js
+++ b/force-app/main/default/lwc/quoteTrial/quoteTrialUtil.js
@@ -442,8 +442,7 @@
for (let [k, v] of Setmap) {
arrList.push(v);
}
- // jzdataList=[...[],...arrList];//20230214
- jzdataList = [].concat(arrList);//20230214
+ jzdataList=[...[],...arrList];
});
return jzdataList;
}
@@ -536,8 +535,7 @@
for (let [k, v] of Setmap) {
arrList.push(v);
}
- // jzdataList=[...[],...arrList];//20230214
- jzdataList = [].concat(arrList);//20230214
+ jzdataList=[...[],...arrList];
});
return jzdataList;
}
@@ -923,8 +921,7 @@
itemTemp.ismatch = '0';
newTemp4.push(itemTemp);
});
- // var data2 = [...newTemp3, ...newTemp4];//20230213
- var data2 = newTemp3.concat(newTemp4);//20230213
+ var data2 = [...newTemp3, ...newTemp4];
data2.forEach(itmss => { //浜у搧鏄庣粏鍜屽緟閫変骇鍝�
let Temp1 = {};
Temp1.Id = itmss.Id;
@@ -1047,8 +1044,6 @@
}
//涓�鑸姌鎵ｆ洿鏀硅繃鍚堝悓浠锋牸璁＄畻閫昏緫
export function updateCDLogic(Id,JxsType,GuaranteeDiscount__c_Input,NormalDiscount__c_Input,Category__c,jzDataDiscount,arrProductTemp){
- console.warn('JxsType'+JxsType);
- console.warn('jzDataDiscount'+jzDataDiscount);
var newArrsTempplus1=[];
var newArrsTempplus2=[];
var jzDataProductlast=[];
@@ -1102,18 +1097,13 @@
newArrsplusN[0].AgencySubtotal__c =newArrsplusN[0].AgencySubtotal__c+chazhiN;
newArrsplusN[0].AgencyUnitPrice__c =newArrsplusN[0].AgencyUnitPrice__c+dangechazhiN;
}
- // newArrsTempplus1=[...newArrsplusG,...newArrsplusN];//20230213
- newArrsTempplus1=newArrsplusG.concat(newArrsplusN);//20230213
- // jzDataProductlast = [...newArrsTempplus1,...newArrsTempplus2];//20230213
- jzDataProductlast = newArrsTempplus1.concat(newArrsTempplus2);//20230213
+ newArrsTempplus1=[...newArrsplusG,...newArrsplusN];
+ jzDataProductlast = [...newArrsTempplus1,...newArrsTempplus2];
}
}
}
}else if(JxsType=="涓�鑸姌鎵�"){
- console.warn('item.JxsType'+item.JxsType);
if(item.JxsType=="涓�鑸姌鎵�"){
- console.warn('NormalDiscount__c_Input'+NormalDiscount__c_Input);
- console.warn('NormalDiscount__c_Input'+NormalDiscount__c_Input);
if (NormalDiscount__c_Input == item.NormalDiscount__c_Input &&
Category__c == item.Category__c){
arrProductTemp.forEach(itemss => { //itemss浜у搧鏄庣粏
@@ -1131,10 +1121,7 @@
var dangechazhi=Math.round((chazhi/newArrsTempplus1[0].Quantity) * 100) / 100;
newArrsTempplus1[0].AgencySubtotal__c =newArrsTempplus1[0].AgencySubtotal__c+chazhi;
newArrsTempplus1[0].AgencyUnitPrice__c =newArrsTempplus1[0].AgencyUnitPrice__c+dangechazhi;
- // jzDataProductlast = [...newArrsTempplus1,...newArrsTempplus2];//20230213
- jzDataProductlast =newArrsTempplus1.concat(newArrsTempplus2);//20230213
- console.warn('newArrsTempplus2'+newArrsTempplus2);
- console.warn('jzDataProductlast'+jzDataProductlast);
+ jzDataProductlast = [...newArrsTempplus1,...newArrsTempplus2];
}
}
}
--
Gitblit v1.9.1