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/lexConsumableAccount/lexConsumableAccount.js | 74 -------------------------------------
1 files changed, 0 insertions(+), 74 deletions(-)
diff --git a/force-app/main/default/lwc/lexConsumableAccount/lexConsumableAccount.js b/force-app/main/default/lwc/lexConsumableAccount/lexConsumableAccount.js
index 191b028..cb6c4e2 100644
--- a/force-app/main/default/lwc/lexConsumableAccount/lexConsumableAccount.js
+++ b/force-app/main/default/lwc/lexConsumableAccount/lexConsumableAccount.js
@@ -228,11 +228,7 @@
//鍒嗛〉start
@track sortBy = '';
-<<<<<<< HEAD
- @track pageSize = 10;
-=======
@track pageSize = 200;
->>>>>>> LEXCommunityLiJun
error;
records;
currentPageToken = 0;
@@ -242,11 +238,7 @@
@track pageNumber = 1;
@track paginationVisibility = false;
@track totalPages = 1;
-<<<<<<< HEAD
- pageSizeOptions = [10, 25, 50, 100];
-=======
pageSizeOptions = [100, 200, 300];
->>>>>>> LEXCommunityLiJun
@track recordStart = 0;
@track recordEnd = 0;
//end
@@ -369,11 +361,7 @@
: r.entity.obj.Parent.Name;
console.log(
'this.accountDataInfo = ' +
-<<<<<<< HEAD
JSON.stringify(this.accountDataInfo)
-=======
- JSON.stringify(this.accountDataInfo)
->>>>>>> LEXCommunityLiJun
);
this.printUrl =
'/lexconsumableaccountinfoprint?AccId=' +
@@ -409,11 +397,7 @@
this.recordEnd = r.entity.paginatedAccounts.recordEnd;
this.totalPages = Math.ceil(
r.entity.paginatedAccounts.totalRecords /
-<<<<<<< HEAD
this.pageSize
-=======
- this.pageSize
->>>>>>> LEXCommunityLiJun
);
console.log('this.totalPages = ' + this.totalPages);
this.paginationVisibility =
@@ -448,20 +432,12 @@
}
console.log(
'this.listViewOptions = ' +
-<<<<<<< HEAD
JSON.stringify(this.listViewOptions)
-=======
- JSON.stringify(this.listViewOptions)
->>>>>>> LEXCommunityLiJun
);
console.log(
'r.entity.topInfo = ' +
-<<<<<<< HEAD
JSON.stringify(r.entity.topInfo)
-=======
- JSON.stringify(r.entity.topInfo)
->>>>>>> LEXCommunityLiJun
);
//top10瀹㈡埛
this.topInfo = r.entity.topInfo;
@@ -471,7 +447,6 @@
this.topAccountData = this.topInfo.acList;
console.log(
'this.topAccountData = ' +
-<<<<<<< HEAD
JSON.stringify(this.topAccountData)
);
console.log(
@@ -479,15 +454,6 @@
this.keepTwoDecimalStr(
this.amend(9, 3, '/').toFixed(2)
)
-=======
- JSON.stringify(this.topAccountData)
- );
- console.log(
- '9/3 = ' +
- this.keepTwoDecimalStr(
- this.amend(9, 3, '/').toFixed(2)
- )
->>>>>>> LEXCommunityLiJun
);
let total = 100;
try {
@@ -519,7 +485,6 @@
) * 100
).toFixed(2)
);
-<<<<<<< HEAD
console.log(
'this.amend = ' +
this.amend(
@@ -529,9 +494,6 @@
) *
100
);
-=======
- console.log('this.amend = ' + this.amend(this.topInfo.deList[i],this.topInfo.saleAmount,'/') * 100);
->>>>>>> LEXCommunityLiJun
total -= number;
this.topAccountData[i]['proportion'] =
number + '%';
@@ -539,7 +501,6 @@
console.log(
'this.topAccountData = ' +
-<<<<<<< HEAD
JSON.stringify(this.topAccountData)
);
@@ -550,26 +511,15 @@
? total.toFixed(2)
: '0.00')
);
-=======
- JSON.stringify(this.topAccountData)
- );
-
- //鍏朵粬
- console.log('(total.toFixed(2) > 0.00 ? total.toFixed(2) : 0.00) = ' + (total.toFixed(2) > 0.00 ? total.toFixed(2) : '0.00'))
->>>>>>> LEXCommunityLiJun
if (total != 100) {
this.topAccountData.push({
accountName: '...',
accountUrl: '/s/lexconsumableaccount',
isDisable: true,
-<<<<<<< HEAD
proportion:
(total.toFixed(2) > 0.0
? total.toFixed(2)
: '0.00') + '%',
-=======
- proportion: (total.toFixed(2) > 0.00 ? total.toFixed(2) : '0.00') + '%',
->>>>>>> LEXCommunityLiJun
CityMasterName: '...',
CityMasterNameUrl: '/lexconsumableaccount',
Town__c: '...',
@@ -695,11 +645,7 @@
this.topAccountData = this.topInfo.acList;
console.log(
'this.topAccountData = ' +
-<<<<<<< HEAD
JSON.stringify(this.topAccountData)
-=======
- JSON.stringify(this.topAccountData)
->>>>>>> LEXCommunityLiJun
);
let total = 100;
for (var i in this.topAccountData) {
@@ -740,14 +686,10 @@
accountName: '...',
accountUrl: '/s/lexconsumableaccount',
isDisable: true,
-<<<<<<< HEAD
proportion:
(total.toFixed(2) > 0.0
? total.toFixed(2)
: '0.00') + '%',
-=======
- proportion: (total.toFixed(2) > 0.00 ? total.toFixed(2) : '0.00') + '%',
->>>>>>> LEXCommunityLiJun
CityMasterName: '...',
CityMasterNameUrl: '/lexconsumableaccount',
Town__c: '...',
@@ -865,19 +807,11 @@
sortByMethod(field, reverse, primer) {
const key = primer
? function (x) {
-<<<<<<< HEAD
return primer(x[field]);
}
: function (x) {
return x[field];
};
-=======
- return primer(x[field]);
- }
- : function (x) {
- return x[field];
- };
->>>>>>> LEXCommunityLiJun
return function (a, b) {
a = key(a);
@@ -887,11 +821,7 @@
}
onHandleSort(event) {
-<<<<<<< HEAD
console.log('event.detail.fieldName = ' + event.detail.fieldName);
-=======
- console.log('event.detail.fieldName = ' + event.detail.fieldName)
->>>>>>> LEXCommunityLiJun
this.sortBy = event.detail.fieldName;
switch (this.sortBy) {
case 'NameUrl':
@@ -953,8 +883,4 @@
get nextButtonDisabled() {
return this.nextPageToken === undefined;
}
-<<<<<<< HEAD
}
-=======
-}
->>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1