fixconflict

buli

2023-07-14 36d15f189de2e83ce2576715dac30c3c260388dd

 force-app/main/default/lwc/lexConsumableAccount/lexConsumableAccount.js

@@ -228,7 +228,11 @@

    //分页start
    @track sortBy = '';
<<<<<<< HEAD
    @track pageSize = 10;
=======
    @track pageSize = 200;
>>>>>>> LEXCommunityLiJun
    error;
    records;
    currentPageToken = 0;
@@ -238,7 +242,11 @@
    @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
@@ -361,7 +369,11 @@
                                : r.entity.obj.Parent.Name;
                        console.log(
                            'this.accountDataInfo = ' +
<<<<<<< HEAD
                                JSON.stringify(this.accountDataInfo)
=======
                            JSON.stringify(this.accountDataInfo)
>>>>>>> LEXCommunityLiJun
                        );
                        this.printUrl =
                            '/lexconsumableaccountinfoprint?AccId=' +
@@ -397,7 +409,11 @@
                        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 =
@@ -432,12 +448,20 @@
                        }
                        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;
@@ -447,6 +471,7 @@
                        this.topAccountData = this.topInfo.acList;
                        console.log(
                            'this.topAccountData = ' +
<<<<<<< HEAD
                                JSON.stringify(this.topAccountData)
                        );
                        console.log(
@@ -454,6 +479,15 @@
                                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 {
@@ -485,6 +519,7 @@
                                        ) * 100
                                    ).toFixed(2)
                                );
<<<<<<< HEAD
                                console.log(
                                    'this.amend = ' +
                                        this.amend(
@@ -494,6 +529,9 @@
                                        ) *
                                            100
                                );
=======
                                console.log('this.amend = ' +  this.amend(this.topInfo.deList[i],this.topInfo.saleAmount,'/') * 100);
>>>>>>> LEXCommunityLiJun
                                total -= number;
                                this.topAccountData[i]['proportion'] =
                                    number + '%';
@@ -501,6 +539,7 @@

                            console.log(
                                'this.topAccountData = ' +
<<<<<<< HEAD
                                    JSON.stringify(this.topAccountData)
                            );

@@ -511,15 +550,26 @@
                                        ? 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: '...',
@@ -645,7 +695,11 @@
                    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) {
@@ -686,10 +740,14 @@
                            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: '...',
@@ -807,11 +865,19 @@
    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);
@@ -821,7 +887,11 @@
    }

    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':
@@ -883,4 +953,8 @@
    get nextButtonDisabled() {
        return this.nextPageToken === undefined;
    }
<<<<<<< HEAD
}
=======
}
>>>>>>> LEXCommunityLiJun