fixconflict

buli

2023-07-14 36d15f189de2e83ce2576715dac30c3c260388dd

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

@@ -83,12 +83,14 @@
                recordId: { fieldName: 'Id' }
            },
            hideDefaultActions: true,
            initialWidth: 200
            // initialWidth: 200,
            wrapText: true
        },
        {
            label: 'SAP合同号',
            fieldName: 'ContractNo__c',
            hideDefaultActions: true,
            wrapText: true,
            initialWidth: 180
        },
        {
@@ -111,7 +113,7 @@
                recordId: { fieldName: 'Id' }
            },
            hideDefaultActions: true,
            initialWidth: 110
            initialWidth: 100
        },
        {
            label: '待系统操作入库数量',
@@ -122,7 +124,7 @@
                recordId: { fieldName: 'Id' }
            },
            hideDefaultActions: true,
            initialWidth: 180
            initialWidth: 150
        },
        {
            label: '还没发货数量',
@@ -144,19 +146,19 @@
                recordId: { fieldName: 'Id' }
            },
            hideDefaultActions: true,
            initialWidth: 180
            initialWidth: 150
        },
        {
            label: '最新发货日期',
            fieldName: 'Shipment_date__c',
            hideDefaultActions: true,
            initialWidth: 140
            initialWidth: 105
        },
        {
            label: '首次发货日期',
            fieldName: 'First_Delivery__c',
            hideDefaultActions: true,
            initialWidth: 140
            initialWidth: 105
        }
    ];

@@ -647,11 +649,24 @@

    editProductLimit(event) {
        //add by Wang Xueqin 2023/05/05
        //let url =
<<<<<<< HEAD
        // '/LexProductLimitEdit?accountid=' +
        // this.accountId +
        // '&userPro_Type=' +
        // this.userPro_Type;
        let url =
            '/LexProductLimitEdit?accountid=' +
            '/lexproductlimitedit?accountid=' +
            this.accountId +
            '&userPro_Type=' +
            this.userPro_Type;
=======
            // '/LexProductLimitEdit?accountid=' +
            // this.accountId +
            // '&userPro_Type=' +
            // this.userPro_Type;
        let url = "/lexproductlimitedit?accountid=" + this.accountId + "&userPro_Type=" + this.userPro_Type;
>>>>>>> LEXCommunityLiJun
        const config = {
            type: 'standard__webPage',
            attributes: {
@@ -790,4 +805,8 @@
    get nextButtonDisabled() {
        return this.nextPageToken === undefined;
    }
}
<<<<<<< HEAD
}
=======
}
>>>>>>> LEXCommunityLiJun