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 | 59 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 39 insertions(+), 20 deletions(-)
diff --git a/force-app/main/default/lwc/lexConsumableAccount/lexConsumableAccount.js b/force-app/main/default/lwc/lexConsumableAccount/lexConsumableAccount.js
index 270892f..cb6c4e2 100644
--- a/force-app/main/default/lwc/lexConsumableAccount/lexConsumableAccount.js
+++ b/force-app/main/default/lwc/lexConsumableAccount/lexConsumableAccount.js
@@ -361,7 +361,7 @@
: r.entity.obj.Parent.Name;
console.log(
'this.accountDataInfo = ' +
- JSON.stringify(this.accountDataInfo)
+ JSON.stringify(this.accountDataInfo)
);
this.printUrl =
'/lexconsumableaccountinfoprint?AccId=' +
@@ -397,7 +397,7 @@
this.recordEnd = r.entity.paginatedAccounts.recordEnd;
this.totalPages = Math.ceil(
r.entity.paginatedAccounts.totalRecords /
- this.pageSize
+ this.pageSize
);
console.log('this.totalPages = ' + this.totalPages);
this.paginationVisibility =
@@ -432,12 +432,12 @@
}
console.log(
'this.listViewOptions = ' +
- JSON.stringify(this.listViewOptions)
+ JSON.stringify(this.listViewOptions)
);
console.log(
'r.entity.topInfo = ' +
- JSON.stringify(r.entity.topInfo)
+ JSON.stringify(r.entity.topInfo)
);
//top10瀹㈡埛
this.topInfo = r.entity.topInfo;
@@ -447,13 +447,13 @@
this.topAccountData = this.topInfo.acList;
console.log(
'this.topAccountData = ' +
- JSON.stringify(this.topAccountData)
+ JSON.stringify(this.topAccountData)
);
console.log(
'9/3 = ' +
- this.keepTwoDecimalStr(
- this.amend(9, 3, '/').toFixed(2)
- )
+ this.keepTwoDecimalStr(
+ this.amend(9, 3, '/').toFixed(2)
+ )
);
let total = 100;
try {
@@ -485,7 +485,15 @@
) * 100
).toFixed(2)
);
- console.log('this.amend = ' + this.amend(this.topInfo.deList[i],this.topInfo.saleAmount,'/') * 100);
+ console.log(
+ 'this.amend = ' +
+ this.amend(
+ this.topInfo.deList[i],
+ this.topInfo.saleAmount,
+ '/'
+ ) *
+ 100
+ );
total -= number;
this.topAccountData[i]['proportion'] =
number + '%';
@@ -493,17 +501,25 @@
console.log(
'this.topAccountData = ' +
- JSON.stringify(this.topAccountData)
+ 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'))
+ console.log(
+ '(total.toFixed(2) > 0.00 ? total.toFixed(2) : 0.00) = ' +
+ (total.toFixed(2) > 0.0
+ ? total.toFixed(2)
+ : '0.00')
+ );
if (total != 100) {
this.topAccountData.push({
accountName: '...',
accountUrl: '/s/lexconsumableaccount',
isDisable: true,
- proportion: (total.toFixed(2) > 0.00 ? total.toFixed(2) : '0.00') + '%',
+ proportion:
+ (total.toFixed(2) > 0.0
+ ? total.toFixed(2)
+ : '0.00') + '%',
CityMasterName: '...',
CityMasterNameUrl: '/lexconsumableaccount',
Town__c: '...',
@@ -629,7 +645,7 @@
this.topAccountData = this.topInfo.acList;
console.log(
'this.topAccountData = ' +
- JSON.stringify(this.topAccountData)
+ JSON.stringify(this.topAccountData)
);
let total = 100;
for (var i in this.topAccountData) {
@@ -670,7 +686,10 @@
accountName: '...',
accountUrl: '/s/lexconsumableaccount',
isDisable: true,
- proportion: (total.toFixed(2) > 0.00 ? total.toFixed(2) : '0.00') + '%',
+ proportion:
+ (total.toFixed(2) > 0.0
+ ? total.toFixed(2)
+ : '0.00') + '%',
CityMasterName: '...',
CityMasterNameUrl: '/lexconsumableaccount',
Town__c: '...',
@@ -788,11 +807,11 @@
sortByMethod(field, reverse, primer) {
const key = primer
? function (x) {
- return primer(x[field]);
- }
+ return primer(x[field]);
+ }
: function (x) {
- return x[field];
- };
+ return x[field];
+ };
return function (a, b) {
a = key(a);
@@ -802,7 +821,7 @@
}
onHandleSort(event) {
- console.log('event.detail.fieldName = ' + event.detail.fieldName)
+ console.log('event.detail.fieldName = ' + event.detail.fieldName);
this.sortBy = event.detail.fieldName;
switch (this.sortBy) {
case 'NameUrl':
@@ -864,4 +883,4 @@
get nextButtonDisabled() {
return this.nextPageToken === undefined;
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1