fixconflict

buli

2023-07-14 36d15f189de2e83ce2576715dac30c3c260388dd

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

@@ -15,7 +15,11 @@
    //分页start
    @track sortBy = '';
    //@track sortDirection = "asc";
<<<<<<< HEAD
    @track pageSize = 10;
=======
    @track pageSize = 200;
>>>>>>> LEXCommunityLiJun
    error;
    records;
    currentPageToken = 0;
@@ -25,7 +29,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
@@ -64,14 +72,14 @@
            type: 'Name',
            sortable: true,
            hideDefaultActions: true,
            initialWidth: 300,
            // initialWidth: 200,
            wrapText: true,
            cellAttributes: { alignment: 'left' }
        },
        {
            label: '第三分类',
            fieldName: 'Category3__c',
            initialWidth: 120,
            initialWidth: 102,
            cellAttributes: { alignment: 'left' },
            hideDefaultActions: true,
            sortable: true,
@@ -81,7 +89,7 @@
            label: '第四分类',
            fieldName: 'Category4__c',
            cellAttributes: { alignment: 'left' },
            initialWidth: 120,
            initialWidth: 102,
            hideDefaultActions: true,
            wrapText: true,
            sortable: true
@@ -90,7 +98,7 @@
            label: '第五分类',
            fieldName: 'Category5__c',
            cellAttributes: { alignment: 'left' },
            initialWidth: 120,
            initialWidth: 102,
            hideDefaultActions: true,
            wrapText: true,
            sortable: true
@@ -100,7 +108,7 @@
            label: '规格',
            fieldName: 'packing_list',
            cellAttributes: { alignment: 'right' },
            initialWidth: 55,
            initialWidth: 50,
            wrapText: true,
            hideDefaultActions: true
        },
@@ -108,7 +116,7 @@
            label: '单位',
            fieldName: 'BoxPiece',
            cellAttributes: { alignment: 'left' },
            initialWidth: 55,
            initialWidth: 50,
            wrapText: true,
            hideDefaultActions: true
        },
@@ -117,7 +125,7 @@
            fieldName: 'approbation_No',
            cellAttributes: { alignment: 'left' },
            wrapText: true,
            initialWidth: 200,
            initialWidth: 104,
            hideDefaultActions: true
        },
        {
@@ -126,13 +134,13 @@
            cellAttributes: { alignment: 'left' },
            wrapText: true,
            hideDefaultActions: true,
            initialWidth: 110
            initialWidth: 95
        },
        {
            label: 'CFDA状态',
            fieldName: 'SFDA_Status__c',
            cellAttributes: { alignment: 'left' },
            initialWidth: 95,
            initialWidth: 84,
            wrapText: true,
            hideDefaultActions: true
        },
@@ -141,7 +149,7 @@
            fieldName: 'guaranteeperiod',
            cellAttributes: { alignment: 'left' },
            hideDefaultActions: true,
            initialWidth: 105
            initialWidth: 95
        },
        {
            label: '有效期内库存',
@@ -156,7 +164,7 @@
                boxPrice: { fieldName: 'BoxPiece' }
            },
            hideDefaultActions: true,
            initialWidth: 150
            initialWidth: 110
        },

        {
@@ -164,7 +172,7 @@
            fieldName: 'overlimitCount',
            hideDefaultActions: true,
            cellAttributes: { alignment: 'right' },
            initialWidth: 80
            initialWidth: 78
        }
    ];
    defaultSortDirection = 'asc';
@@ -560,7 +568,8 @@
            agencyProType: this.agencyProType,
            userWorkLocation: this.userWorkLocation,
            pageSizeLWC: this.pageSize,
            pageTokenLWC: this.currentPageToken
            pageTokenLWC: this.currentPageToken,
            productkucunLWC: this.productkucun
        })
            .then((result) => {
                console.log('result搜索 = ' + JSON.stringify(result));
@@ -662,6 +671,7 @@
        } else {
            this.rowNumberOffset = 0;
        }
<<<<<<< HEAD
    }

    handlePrevious() {
@@ -722,4 +732,67 @@
            .querySelector('c-common-toast')
            .showToast(variant, content, iconName, 10000);
    }
}
}
=======
    }

    handlePrevious() {
        this.currentPageToken =
            Number(this.currentPageToken) - Number(this.pageSize);
        this.searchOrderDetail();
    }

    handleNext() {
        this.currentPageToken =
            Number(this.currentPageToken) + Number(this.pageSize);
        this.searchOrderDetail();
    }
    handleFirst() {
        this.currentPageToken = 0;
        this.searchOrderDetail();
    }

    handleLast() {
        this.currentPageToken =
            this.totalPages > 1 ? (this.totalPages - 1) * this.pageSize : 0;
        this.searchOrderDetail();
    }

    handlePageschange(event) {
        console.log(event.detail);
        this.pageSize = event.detail;
        this.currentPageToken = 0;
        this.searchOrderDetail();
    }
    get previousButtonDisabled() {
        return this.currentPageToken === 0;
    }

    get nextButtonDisabled() {
        return this.nextPageToken === undefined;
    }
    showMyToast(title, message, variant) {
        console.log('show custom message');
        var iconName = '';
        var content = '';
        if (variant == 'success') {
            iconName = 'utility:check';
        } else {
            iconName = 'utility:error';
        }
        if (message != '') {
            content =
                '<h2><strong>' +
                title +
                '<strong/></h2><h5>' +
                message +
                '</h5>';
        } else {
            content = '<h2><strong>' + title + '<strong/></h2>';
        }
        this.template
            .querySelector('c-common-toast')
            .showToast(variant, content, iconName, 10000);
    }
}
>>>>>>> LEXCommunityLiJun