From fbac2ed0a87dad3180b3d22a9ed189437e4b7f19 Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期二, 07 三月 2023 18:30:19 +0800
Subject: [PATCH] no message
---
force-app/main/default/lwc/quoteTrial/quoteTrial.js | 206 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 144 insertions(+), 62 deletions(-)
diff --git a/force-app/main/default/lwc/quoteTrial/quoteTrial.js b/force-app/main/default/lwc/quoteTrial/quoteTrial.js
index 27b3b9d..1062c2a 100644
--- a/force-app/main/default/lwc/quoteTrial/quoteTrial.js
+++ b/force-app/main/default/lwc/quoteTrial/quoteTrial.js
@@ -203,7 +203,8 @@
this.OnLoadSaveProduct.push(item);
}
})
- var arrss = [...[], ...this.OnLoadSaveProduct];
+ // var arrss = [...[], ...this.OnLoadSaveProduct];//20230214
+ var arrss = [].concat(this.OnLoadSaveProduct);//20230214
//鍚堝苟涓婁竴娆¤瘯绠楃殑鎶ヤ环琛�
this.addOffer(arrss);
//澶勭悊鎶ヤ环鏁版嵁鏀瑰姩鍚庤瘯绠楃晫闈㈢殑鍙樺寲
@@ -263,7 +264,8 @@
//鍚堝苟涓婁竴娆＄殑鎶ヤ环琛�
lastQuotation = [];
addOffer(TrialLine) {
- this.lastQuotation = [...[], ...addOfferLogic(TrialLine)]; //鍚堝苟涓婁竴娆＄殑鎶ヤ环琛岀殑閫昏緫
+ // this.lastQuotation = [...[], ...addOfferLogic(TrialLine)]; //鍚堝苟涓婁竴娆＄殑鎶ヤ环琛岀殑閫昏緫//20230214
+ this.lastQuotation = [].concat(addOfferLogic(TrialLine));//20230214
}
Complate = false;
//浠庢暟鎹簱鏇存柊宸蹭繚瀛樼殑鏁版嵁 鏂规 UpdateBy 2021 06 29
@@ -389,7 +391,11 @@
var newDicountData = [];
newDicountData=SpecialSavesChangePartLogic(jzDataDefaultList,SaveName, SelectedData, IdStr, CompareId,DefalutQuantity,newDicountData,jzDataDiscountList);
this.jzDataDefault = NewDefaultDatass;
- this.jzDataProduct = [...this.jzDataProduct, ...AddProductDatass]; //浜у搧鏄庣粏
+ // this.jzDataProduct = [...this.jzDataProduct, ...AddProductDatass]; //浜у搧鏄庣粏//20230213
+ this.jzDataProduct =this.jzDataProduct.concat(AddProductDatass);//20230213
+ console.warn('newDicountData'+ newDicountData[0].Id);
+ console.warn('AddProductDatass'+AddProductDatass[0]);
+ console.warn('this.jzDataProduct'+this.jzDataProduct[0]);
//鍚堝悓浠锋牸姹囨��
this.ContractPriceCompute();
this.jzDataDiscount = newDicountData;
@@ -407,7 +413,8 @@
...jzDataProductParam
}
jzDataProductParam = this.countListAndNod(tempObject, result);
- arrData = [...[], jzDataProductParam];
+ // arrData = [...[], jzDataProductParam];//20230214
+ arrData = [].concat(jzDataProductParam);//20230214
//杩斿洖鏁版嵁姣旇緝瑙勫垯
this.CompareData(result, idStr, jzDataProductParam, TypeName, jzDataDefaultToTemps, arrData, isShow);
})
@@ -432,7 +439,8 @@
CompareData(list, idStr, jzDataProductParam, TypeName, jzDataDefaultToTemps, arrData, isShow) {
var isChange = false;
var TempsJzData = []
- TempsJzData = [...[], ...this.jzDataDefault]; //寰呴�変骇鍝�
+ // TempsJzData = [...[], ...this.jzDataDefault]; //寰呴�変骇鍝�//20230214
+ TempsJzData = [].concat(this.jzDataDefault);//20230214
var TempsJzDataToCompare = []
TempsJzData.forEach(item => {
list.forEach(element => { //淇冮攢鏂规涓绘暟鎹叧鑱斾骇鍝�
@@ -475,7 +483,8 @@
newObj.element = newElement;
newTempsJzDataToCompare.push(newObj);
})
- TempsJzDataToCompare = [...[], ...newTempsJzDataToCompare];
+ // TempsJzDataToCompare = [...[], ...newTempsJzDataToCompare];//20230214
+ TempsJzDataToCompare = [].concat(newTempsJzDataToCompare);//20230214
//End
if (TempsJzDataToCompare.length == list.length&&list.length!=0) {
TempsJzDataToCompare.forEach(TempsItems => {
@@ -507,7 +516,8 @@
//鏇存柊娆℃暟
this.updatesNums();
//鍚堝苟閲嶅浠锋牸鏀跨瓥鏂规
- var jzarr = [...[], ...this.jzDataFixedPrice];
+ // var jzarr = [...[], ...this.jzDataFixedPrice];//20230214
+ var jzarr = [].concat(this.jzDataFixedPrice);//20230214
this.MergeDuplicateSchemes(jzarr);
//淇濆瓨鏈�澶ф鏁�
this.savecount(idStr);
@@ -538,7 +548,8 @@
CompareFullDataedit.push(editnum);
}
});
- this.CompareFullData = [...[], ...CompareFullDataedit];
+ // this.CompareFullData = [...[], ...CompareFullDataedit];//20230214
+ this.CompareFullData = [].concat(CompareFullDataedit);//20230214
Setmap.set(arrs.Id, object);
} else {
object = {
@@ -551,12 +562,14 @@
for (let [k, v] of Setmap) {
arr.push(v);
}
- this.jzDataFixedPrice = [...[], ...arr]
+ // this.jzDataFixedPrice = [...[], ...arr]//20230214
+ this.jzDataFixedPrice = [].concat(arr);//20230214
this.ConsolidationProgramProducts(arr);
}
//褰掑苟鐩稿悓浠锋牸鏀跨瓥鏂规鐨勪骇鍝�
ConsolidationProgramProducts(arrSchemes) {
- var jzdataList = [...[], ...this.jzDataProduct];
+ // var jzdataList = [...[], ...this.jzDataProduct];//20230214
+ var jzdataList = [].concat(this.jzDataProduct);//20230214
this.jzDataProduct = PriceConsolidation(arrSchemes, jzdataList);
}
//淇濆瓨鏈�澶ф鏁�
@@ -575,8 +588,10 @@
//鏇挎崲listprice鍗曚环
ReplacementUnitPrice() {
var ifTrade = this.QuoteData[0].Opportunity.Trade__c; //鍐呭璐�
- var arr = [...[], ...this.jzDataProduct];
- this.jzDataProduct = [...[], ...ReplacementUnitPriceLogic(arr, ifTrade)]; //鏇挎崲listprice鍗曚环閫昏緫
+ // var arr = [...[], ...this.jzDataProduct];//20230214
+ var arr = [].concat(this.jzDataProduct);//20230214
+ // this.jzDataProduct = [...[], ...ReplacementUnitPriceLogic(arr, ifTrade)]; //鏇挎崲listprice鍗曚环閫昏緫//20230214
+ this.jzDataProduct = [].concat(ReplacementUnitPriceLogic(arr, ifTrade));//20230214
//鍚堝悓浠锋牸姹囨��
this.ContractPriceCompute();
}
@@ -663,7 +678,8 @@
newArrsTemp6.push(itsss);
}
});
- newArrsTemp5 = [...[], ...newArrsTemp6];
+ // newArrsTemp5 = [...[], ...newArrsTemp6];//20230214
+ newArrsTemp5 = [].concat(newArrsTemp6);//20230214
this.jzDataDefault = newArrsTemp5;
}
this.jzDataProduct = arrProductTemp;
@@ -731,7 +747,8 @@
newArrsTemp6.push(itsss);
}
});
- newArrsTemp5 = [...[], ...newArrsTemp6];
+ // newArrsTemp5 = [...[], ...newArrsTemp6];//20230214
+ newArrsTemp5 = [].concat(newArrsTemp6);//20230214
this.jzDataDefault = newArrsTemp5;
}
this.jzDataProduct = arrProductTemp;
@@ -740,7 +757,8 @@
}
}
});
- this.jzDataFixedPrice = [...[], ...arrTemp];
+ // this.jzDataFixedPrice = [...[], ...arrTemp];//20230214
+ this.jzDataFixedPrice = [].concat(arrTemp);//20230214
}
}
@@ -821,11 +839,13 @@
}
}
});
- this.jzDataDiscount = [...[], ...arrTemp1];
+ // this.jzDataDiscount = [...[], ...arrTemp1];//20230214
+ this.jzDataDiscount = [].concat(arrTemp1);//20230214
}
//涓�鑸姌鎵ｆ洿鏀硅繃鍚堝悓浠锋牸璁＄畻
updateCommonlyDiscountLogic(Id,JxsType,GuaranteeDiscount__c_Input,NormalDiscount__c_Input,Category__c,jzDataDiscount) {
//todu13
+ console.warn('jzDataDiscount'+jzDataDiscount);
this.updateIdStr("1");
var arrProductTemp = this.jzDataProduct; // PromotionId 浜у搧鏄庣粏
this.jzDataProduct=updateCDLogic(Id,JxsType,GuaranteeDiscount__c_Input,NormalDiscount__c_Input,Category__c,jzDataDiscount,arrProductTemp);
@@ -834,14 +854,20 @@
//璁＄畻涓�鑸姌鎵ｉ潪瀵硅薄鍝佹姌鎵�
ComouteProductDiscount(Id,Category__c,GuaranteeDiscount__c_Input, NormalDiscount__c_Input,GuaranteeDiscount_H_Money__c, NormalDiscount_H_Money__c, item) {
//todu12
+ console.warn('this.jzDataDiscountxxx1'+this.jzDataDiscount);
this.updateIdStr("2");
var arrTemp1 = this.jzDataDiscount; //鎶樻墸鏀跨瓥
+ console.warn('this.jzDataDiscountxxx2'+this.jzDataDiscount);
this.updateIdStr("1");
var arrProductTemp = this.jzDataProduct; // PromotionId 浜у搧鏄庣粏
var reslut=ReverseCalculationModifyDiscountLogic(arrTemp1,arrProductTemp,Id,Category__c,GuaranteeDiscount__c_Input, NormalDiscount__c_Input,GuaranteeDiscount_H_Money__c, NormalDiscount_H_Money__c, item);
- this.jzDataDiscount=[...[], ...arrTempsss];
- this.jzDataProduct =[...[], ...arrProductTempsss];
+ // this.jzDataDiscount=[...[], ...arrTempsss];//20230214
+ this.jzDataDiscount=[].concat(arrTempsss);
+ console.warn('arrTempsss'+arrTempsss);
+ console.warn('this.jzDataDiscountxxx3'+this.jzDataDiscount);
+ // this.jzDataProduct =[...[], ...arrProductTempsss];//20230214
+ this.jzDataProduct=[].concat(arrProductTempsss);//20230214
return reslut;
}
//todu
@@ -858,7 +884,10 @@
//鍒犻櫎浠锋牸璁＄畻
delectComputeData(item) { //item 浜у搧鏄庣粏鐨勪竴鏉℃暟鎹�
var sum = this.ComputeListPrice(item.PromotionId);
- var jzProductarry = [...[], ...this.jzDataProduct];
+ // var jzProductarry = [...[], ...this.jzDataProduct];//20230214
+ var jzProductarry = [].concat(this.jzDataProduct);//20230214
+ console.warn('ceshiasdfasdfsdfasdjzProductarry'+arrss);
+ console.warn('sfgssgfgthis.jzDataProduct'+this.jzDataProduct);
jzProductarry.forEach(japdt => { //japdt浜у搧鏄庣粏
if (item.PromotionId == japdt.PromotionId) {
japdt.AgencySubtotal__c = japdt.AgencySubtotal__c + item.AgencySubtotal__c * (japdt.ListPrice * japdt.Quantity / sum);
@@ -867,7 +896,8 @@
japdt.AgencyUnitPrice__c = Math.round(japdt.AgencyUnitPrice__c * 100) / 100;
}
});
- this.jzDataProduct = [...[], ...jzProductarry];
+ // this.jzDataProduct = [...[], ...jzProductarry];//20230214
+ this.jzDataProduct = [].concat(jzProductarry);//20230214
//鍚堝悓浠锋牸姹囨��
this.ContractPriceCompute();
}
@@ -876,7 +906,8 @@
//淇敼 浜у搧鏄庣粏
let num = parseInt(length / Quantity);
let addArr = [];
- var newss = [...[], ...this.jzDataDefault];
+ // var newss = [...[], ...this.jzDataDefault];//20230214
+ var newss = [].concat(this.jzDataDefault);//20230214
var newDataDefault = newss.map(item => {
if (item == undefined) {
console.warn("undefined!!");
@@ -896,7 +927,8 @@
}
return item;
})
- this.jzDataProduct = [...this.jzDataProduct, ...addArr];
+ // this.jzDataProduct = [...this.jzDataProduct, ...addArr];//20230213
+ this.jzDataProduct = this.jzDataProduct.concat(addArr);//20230213
//鍚堝悓浠锋牸姹囨��
this.ContractPriceCompute();
this.jzDataDefault = newDataDefault;
@@ -933,8 +965,10 @@
}
// =======鏇存柊淇冮攢鏂规娆℃暟鏁版嵁
updatesNums() {
- var jzDataFixedPriceTemp = [...[], ...this.jzDataFixedPrice];
- var jzDataDiscountTemp = [...[], ...this.jzDataDiscount];
+ // var jzDataFixedPriceTemp = [...[], ...this.jzDataFixedPrice];//20230214
+ var jzDataFixedPriceTemp = [].concat(this.jzDataFixedPrice);//20230214
+ // var jzDataDiscountTemp = [...[], ...this.jzDataDiscount];//20230214
+ var jzDataDiscountTemp = [].concat(this.jzDataDiscount);//20230214
var CompareFullData = this.CompareFullData;
updatesNumsLogic(jzDataFixedPriceTemp,jzDataDiscountTemp,CompareFullData);
this.jzDataFixedPrice = jzDataFixedPriceTemps;
@@ -943,7 +977,8 @@
// ====================== 鍒ゆ柇鏄惁涓�0
ChangeNumZeroTrueData = []
ChangeNumZeroTrue() {
- this.ChangeNumZeroTrueData = [...[], ...this.jzDataDefault];
+ // this.ChangeNumZeroTrueData = [...[], ...this.jzDataDefault];//20230214
+ this.ChangeNumZeroTrueData = [].concat(this.jzDataDefault);//20230214
var newJzDataDefault = this.ChangeNumZeroTrueData.filter(item => {
if (item.Quantity > 0) {
return true;
@@ -1069,7 +1104,8 @@
var falg = true;
if (item.TypeName == "浠锋牸鏀跨瓥") {
this.DeleteIsChangelogic(item, item.TypeName, num, list);
- var arrTemp = [...[], ...this.jzDataFixedPrice]; //浠锋牸鏀跨瓥
+ // var arrTemp = [...[], ...this.jzDataFixedPrice]; //浠锋牸鏀跨瓥//20230214
+ var arrTemp = [].concat(this.jzDataFixedPrice);//20230214
var TempItem = {};
arrTemp.forEach(atItem => {
if (atItem.Id == item.PromotionId) {
@@ -1088,7 +1124,8 @@
}
} else if (item.TypeName == "鎶樻墸鏀跨瓥") {
this.DeleteIsChangelogic(item, item.TypeName, num, list);
- var arrTempTOName = [...[], ...this.jzDataDiscount]; //鎶樻墸鏀跨瓥
+ // var arrTempTOName = [...[], ...this.jzDataDiscount]; //鎶樻墸鏀跨瓥//20230214
+ var arrTempTOName = [].concat(this.jzDataDiscount);//20230214
var TempItemTOName = {};
var PromotionHeadRecordId = item.recordTypeName__c;
if (PromotionHeadRecordId == "Authorizer") {
@@ -1173,7 +1210,8 @@
}
});
if (flg) {
- this.jzDataProduct = [...[], ...jzdatas];
+ // this.jzDataProduct = [...[], ...jzdatas];//20230214
+ this.jzDataProduct = [].concat(jzdatas);//20230214
if (TypeName == "浠锋牸鏀跨瓥") {
//鍒犻櫎浠锋牸璁＄畻
this.delectComputeData(item);
@@ -1197,7 +1235,8 @@
}
});
}
- this.jzDataDefault = [...[], ...arr];
+ // this.jzDataDefault = [...[], ...arr];//20230214
+ this.jzDataDefault = [].concat(arr);//20230214
}
}
// ==================閫氱煡鏄剧ず ======================
@@ -1323,10 +1362,12 @@
newarrjdf.push(jdf);
}
});
- this.jzDataFixedPrice = [...[], ...newarrjdf];
+ // this.jzDataFixedPrice = [...[], ...newarrjdf];//20230214
+ this.jzDataFixedPrice = [].concat(newarrjdf);//20230214
});
});
- this.jzData = [...[], ...responseObj.records];
+ // this.jzData = [...[], ...responseObj.records];//20230214
+ this.jzData = [].concat(responseObj.records);//20230214
// this.index=this.jzData.length;
this.tableIsLoding = false;
})
@@ -1392,14 +1433,17 @@
if (this.index == 0) {
if (this.flagall) {
if (this.jzDataDefaultCopy.length < this.lastQuotation.length) { //1銆佹潯鏁板皬浜�
- this.jzDataDefault = [...[], ...this.jzDataDefaultCopy];
+ // this.jzDataDefault = [...[], ...this.jzDataDefaultCopy];//20230214
+ this.jzDataDefault = [].concat(this.jzDataDefaultCopy);//20230214
this.jzDataProduct = [];
this.jzDataFixedPrice = [];
this.jzDataDiscount = [];
return;
} else { //2銆�
- var lastQuotation = [...[], ...this.lastQuotation];
- var DefaultCopy = [...[], ...this.jzDataDefaultCopy];
+ // var lastQuotation = [...[], ...this.lastQuotation];//20230214
+ var lastQuotation = [].concat(this.lastQuotation);//20230214
+ // var DefaultCopy = [...[], ...this.jzDataDefaultCopy];//20230214
+ var DefaultCopy = [].concat(this.jzDataDefaultCopy);//20230214
var Default = [];
for (var j = 0; j < DefaultCopy.length; j++) {
var arrList = [];
@@ -1408,7 +1452,8 @@
for (var i = 0; i < lastQuotation.length; i++) {
if (DefaultCopy[j].Id == lastQuotation[i].Id) {
if (DefaultCopy[j].Quantity < lastQuotation[i].Quantity) { //2-1-1 鏁伴噺灏忎簬 clear
- this.jzDataDefault = [...[], ...this.jzDataDefaultCopy];
+ // this.jzDataDefault = [...[], ...this.jzDataDefaultCopy];//20230214
+ this.jzDataDefault = [].concat(this.jzDataDefaultCopy);//20230214
this.jzDataProduct = [];
this.jzDataFixedPrice = [];
this.jzDataDiscount = [];
@@ -1434,13 +1479,15 @@
}
}
if (lastQuotation.length != 0) { //2-2 鍚堟垚鏁版嵁鏈夊墿浣�
- this.jzDataDefault = [...[], ...this.jzDataDefaultCopy];
+ // this.jzDataDefault = [...[], ...this.jzDataDefaultCopy];//20230214
+ this.jzDataDefault = [].concat(this.jzDataDefaultCopy);//20230214
this.jzDataProduct = [];
this.jzDataFixedPrice = [];
this.jzDataDiscount = [];
return;
}
- this.jzDataDefault = [...[], ...Default];
+ // this.jzDataDefault = [...[], ...Default];//20230214
+ this.jzDataDefault = [].concat(Default);//20230214
}
}
}
@@ -1626,7 +1673,8 @@
CompareFullDataedit.push(editnum);
}
});
- this.CompareFullData = [...[], ...CompareFullDataedit];
+ // this.CompareFullData = [...[], ...CompareFullDataedit];//20230214
+ this.CompareFullData = [].concat(CompareFullDataedit);//20230214
// }
}
} else {
@@ -1660,7 +1708,8 @@
}
}
//haha
- var newArrs = [...[], ...editnewDate];
+ // var newArrs = [...[], ...editnewDate];//20230214
+ var newArrs = [].concat(editnewDate);//20230214
if (boolean == 1) {
this.jzDataFixedPrice = newData;
newArrs.forEach(item => {
@@ -1670,7 +1719,8 @@
this.CloseAlert();
}, 2000);
});
- this.jzDataProduct = [...this.newArrsTemp3, ...this.newArrsTemp4];
+ // this.jzDataProduct = [...this.newArrsTemp3, ...this.newArrsTemp4];//20230213
+ this.jzDataProduct = this.newArrsTemp3.concat(this.newArrsTemp4);//20230213
//鍚堝悓浠锋牸姹囨��
this.ContractPriceCompute();
} else if (boolean == 3) {
@@ -1700,7 +1750,8 @@
if (this.jzDataFixedPrice == null || this.jzDataFixedPrice.length <= 0) {
this.jzDataFixedPrice = arrs;
} else {
- this.jzDataFixedPrice = [...this.jzDataFixedPrice, ...arrs];
+ // this.jzDataFixedPrice = [...this.jzDataFixedPrice, ...arrs];//20230213
+ this.jzDataFixedPrice = this.jzDataFixedPrice.concat(arrs);//20230213
};
}
//浠锋牸鏀跨瓥閫変腑
@@ -1737,10 +1788,12 @@
compareFu.push(deletId);
}
});
- this.CompareFullData = [...[], ...compareFu];
+ // this.CompareFullData = [...[], ...compareFu];//20230214
+ this.CompareFullData = [].concat(compareFu);//20230214
}
}
- this.SelectedFnDataFixedPrice = [...[], ...select];
+ // this.SelectedFnDataFixedPrice = [...[], ...select];//20230214
+ this.SelectedFnDataFixedPrice = [].concat(select);//20230214
if (fag) {
//鍒犻櫎鎵�閫夋柟妗堝尮閰嶇殑浜у搧
this.DeleteChangesFn(ids, "浠锋牸鏀跨瓥");
@@ -1764,7 +1817,8 @@
compareFu.push(deletId);
}
});
- this.CompareFullData = [...[], ...compareFu];
+ // this.CompareFullData = [...[], ...compareFu];//20230214
+ this.CompareFullData = [].concat(compareFu);//20230214
if (this.SelectedFnDataFixedPrice[j].Id == this.jzDataFixedPrice[i].Id) {
this.jzDataFixedPrice.splice(i, 1); // 灏嗕娇鍚庨潰鐨勫厓绱犱緷娆″墠绉伙紝鏁扮粍闀垮害鍑�1
i--;
@@ -1877,7 +1931,8 @@
newarrjdf.push(jdf);
}
});
- this.jzDataFixedPrice = [...[], ...newarrjdf];
+ // this.jzDataFixedPrice = [...[], ...newarrjdf];//20230214
+ this.jzDataFixedPrice = [].concat(newarrjdf);//20230214
if (event.fag && iflag) {
var newArr = [];
newArr.push(item);
@@ -1894,7 +1949,8 @@
}
})
})
- this.jzDataFix = [...[], ...respons];
+ // this.jzDataFix = [...[], ...respons];//20230214
+ this.jzDataFix = [].concat(respons);//20230214
this.tableIsLodingFix = false;
})
}
@@ -1931,7 +1987,8 @@
if (this.jzDataDiscount == null || this.jzDataDiscount.length <= 0) {
this.jzDataDiscount = arrs;
} else {
- this.jzDataDiscount = [...this.jzDataDiscount, ...arrs];
+ // this.jzDataDiscount = [...this.jzDataDiscount, ...arrs];//20230213
+ this.jzDataDiscount = this.jzDataDiscount.concat(arrs);//20230213
}
}
//鎶樻墸鏀跨瓥閫変腑
@@ -2268,14 +2325,16 @@
debugger
if (boolean == 0) {
this.jzDataDiscount = newData;
- var newArrs = [...[], ...editnewDate];
+ // var newArrs = [...[], ...editnewDate];//20230214
+ var newArrs = [].concat(editnewDate);//20230214
newArrs.forEach(item => {
// this.ComputeData(item.Id, '鎶樻墸鏀跨瓥');
//鍚堝苟鎶樻墸鏀跨瓥閲嶅鏂规
this.ConsolidatedDiscountPolicy(this.jzDataDiscount);
this.ComputeDiscount(item.Id, item.NormalDiscount__c_Input, item.GuaranteeDiscount__c_Input, item.Category__c, item.JxsType);
});
- this.jzDataProduct = [...this.newArrsTemp2, ...this.newArrsTemp];
+ // this.jzDataProduct = [...this.newArrsTemp2, ...this.newArrsTemp];//20230213
+ this.jzDataProduct = this.newArrsTemp2.concat(this.newArrsTemp);//20230213
//鍚堝悓浠锋牸姹囨��
this.ContractPriceCompute();
this.Alert("鏁版嵁淇敼鎴愬姛", false, true);
@@ -2293,6 +2352,8 @@
} else if (boolean == 4) {
this.jzDataDiscount = newData;
var ffgg=0;
+ console.warn('newData'+newData);
+ console.warn('this.jzDataDiscount'+this.jzDataDiscount);
if(boolean3){
newData2.forEach(HeTo => {
//鏍规嵁鍚堝悓浠锋牸璁＄畻涓�鑸姌鎵�
@@ -2301,8 +2362,13 @@
ffgg=HeTo;
return ;
}
+ console.warn('HeTo'+HeTo);
//鍚堝苟鎶樻墸鏀跨瓥閲嶅鏂规
- this.ConsolidatedDiscountPolicy(this.jzDataDiscount);
+ // let jzDataDiscountx = [...[], ...this.jzDataDiscount];//20230214
+ let jzDataDiscountx = [].concat(this.jzDataDiscount);//20230214
+ console.warn('jzDataDiscountx'+jzDataDiscountx);
+ console.warn('this.jzDataDiscountxxx'+this.jzDataDiscount);
+ this.ConsolidatedDiscountPolicy(jzDataDiscountx);
//涓�鑸姌鎵ｆ洿鏀硅繃鍚堝悓浠锋牸璁＄畻
this.updateCommonlyDiscountLogic(HeTo.Id,HeTo.JxsType,HeTo.GuaranteeDiscount__c_Input,HeTo.NormalDiscount__c_Input,HeTo.Category__c,this.jzDataDiscount);
});
@@ -2414,15 +2480,21 @@
}
//鍚堝苟鎶樻墸鏀跨瓥閲嶅鏂规
ConsolidatedDiscountPolicy(SchemeSet) {
+ console.warn('SchemeSet'+SchemeSet);
var arr = [];
arr = ConsolidatedDiscountPolicyLogic(SchemeSet, arr); //鍚堝苟鎶樻墸鏀跨瓥閲嶅鏂规閫昏緫
- this.jzDataDiscount = [...[], ...arr];
+ console.warn('arr'+arr);
+ // this.jzDataDiscount = [...[], ...arr];//20230214
+ this.jzDataDiscount = [].concat(arr);//20230214
+ console.warn('this.jzDataDiscount2'+this.jzDataDiscount);
// this.ConsolidationProgramProducts(arr);
this.ConsolidatedDiscountDetails(arr); //鍚堝苟鎶樻墸鏀跨瓥浜у搧鏄庣粏
}
//鍚堝苟鎶樻墸鏀跨瓥浜у搧鏄庣粏
ConsolidatedDiscountDetails(arrSchemes) {
- var jzdataList = [...[], ...this.jzDataProduct];
+ // var jzdataList = [...[], ...this.jzDataProduct];//20230214
+ var jzdataList = [].concat(this.jzDataProduct);//20230214
+ console.warn('jzdataList'+jzdataList);
this.jzDataProduct = ConsolidatedDiscountDetailsLogic(arrSchemes, jzdataList); //鍚堝苟鎶樻墸鏀跨瓥浜у搧鏄庣粏閫昏緫
}
@track
@@ -2462,7 +2534,8 @@
arr.push(jzdsc);
}
});
- this.jzDataSpecial = [...[], ...arr];
+ // this.jzDataSpecial = [...[], ...arr];//20230214
+ this.jzDataSpecial = [].concat(arr);//20230214
}
});
})
@@ -2531,7 +2604,8 @@
}
}
//haha4
- var newArrs = [...[], ...editnewDate];
+ // var newArrs = [...[], ...editnewDate];//20230214
+ var newArrs = [].concat(editnewDate);//20230214
newArrs.forEach(item => {
if (item.Quantity < item.SplitQuantity) {
boolean = 2;
@@ -2644,7 +2718,8 @@
}
}
//haha3
- var newArrs = [...[], ...editnewDate];
+ // var newArrs = [...[], ...editnewDate];//20230214
+ var newArrs = [].concat(editnewDate);//20230214
newArrs.forEach(item => {
if (item.Quantity < item.SplitQuantity) {
boolean = 2;
@@ -2844,7 +2919,8 @@
itemTemp.typess = "鎶樻墸鏀跨瓥";
newTemp2.push(itemTemp);
});
- var data = [...newTemp, ...newTemp2];
+ // var data = [...newTemp, ...newTemp2];//20230213
+ var data = newTemp.concat(newTemp2);//20230213
var ParamIdStr = this.ParamIdStr;
var Trade__c = this.QuoteData[0].Opportunity.Trade__c;
var NewData = ConsolidationScheme(data, ParamIdStr, Trade__c);
@@ -2955,11 +3031,14 @@
var indexNum = 0;
var jzdpdc = [];
if (str == "1") {
- jzdpdc = [...[], ...this.jzDataProduct]; //淇冮攢浜у搧
+ // jzdpdc = [...[], ...this.jzDataProduct]; //淇冮攢浜у搧//20230214
+ jzdpdc = [].concat(this.jzDataProduct);//20230214
} else if (str == "2") {
- jzdpdc = [...[], ...this.jzDataDiscount]; //鎶樻墸鏀跨瓥
+ // jzdpdc = [...[], ...this.jzDataDiscount]; //鎶樻墸鏀跨瓥//20230214
+ jzdpdc = [].concat(this.jzDataDiscount);//20230214
} else if (str == "3") {
- jzdpdc = [...[], ...this.jzDataFixedPrice]; //浠锋牸鏀跨瓥
+ // jzdpdc = [...[], ...this.jzDataFixedPrice]; //浠锋牸鏀跨瓥//20230214
+ jzdpdc = [].concat(this.jzDataFixedPrice);//20230214
}
jzdpdc.forEach(item => {
indexNum++;
@@ -2970,11 +3049,14 @@
newArr.push(temp);
})
if (str == "1") {
- this.jzDataProduct = [...[], ...newArr]; //淇冮攢浜у搧
+ // this.jzDataProduct = [...[], ...newArr]; //淇冮攢浜у搧//20230214
+ this.jzDataProduct = [].concat(newArr);//20230214
} else if (str == "2") {
- this.jzDataDiscount = [...[], ...newArr]; //鎶樻墸鏀跨瓥
+ // this.jzDataDiscount = [...[], ...newArr]; //鎶樻墸鏀跨瓥//20230214
+ this.jzDataDiscount = [].concat(newArr);//20230214
} else if (str == "3") {
- this.jzDataFixedPrice = [...[], ...newArr]; //浠锋牸鏀跨瓥
+ // this.jzDataFixedPrice = [...[], ...newArr]; //浠锋牸鏀跨瓥//20230214
+ this.jzDataFixedPrice = [].concat(newArr);//20230214
}
//TODU
}
--
Gitblit v1.9.1