Merge branch 'master' into LEXUpgrade2023-Deloitte

buli

2023-07-14 e6068da47c1bef5517c9e5fdc8c726766867ad4e

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

@@ -2,7 +2,10 @@
    <template if:true={showSpinner}>
        <!-- <lightning-spinner size="medium" variant="brand"></lightning-spinner> -->
        <div class="slds-spinner_container">
            <div role="status" class="slds-spinner slds-spinner_medium slds-spinner_brand">
            <div
                role="status"
                class="slds-spinner slds-spinner_medium slds-spinner_brand"
            >
                <span class="slds-assistive-text">Loading</span>
                <div class="slds-spinner__dot-a"></div>
                <div class="slds-spinner__dot-b"></div>
@@ -28,8 +31,15 @@
        </div> -->
        <!-- 未全部发货订单明细 -->
        <template if:true={over_view}>
            <div style="border: 1px solid #D4D4D4;border-top: 3px solid #51606E;border-radius:5px;margin-bottom:7px;">
                <div style="border-bottom: 1px solid #D4D4D4;padding:3px;">
            <div
                style="
                    border: 1px solid #d4d4d4;
                    border-top: 3px solid #51606e;
                    border-radius: 5px;
                    margin-bottom: 7px;
                "
            >
                <div style="border-bottom: 1px solid #d4d4d4; padding: 3px">
                    <lightning-layout>
                        <lightning-layout-item padding="around-small">
                            <p style="font-size: 18px">
@@ -39,15 +49,29 @@
                    </lightning-layout>
                    <!-- <p style="font-size: 16px;"><strong>未全部发货订单明细</strong></p> -->
                </div>
                <div style="padding:10px;">
                    <c-lex-custom-lightning-datatable class="wrapped-header-datatable" hide-checkbox-column key-field="Id" data={raesList} columns={colms} onclicklink={clickLick}></c-lex-custom-lightning-datatable>
                <div style="padding: 10px">
                    <c-lex-custom-lightning-datatable
                        class="wrapped-header-datatable"
                        hide-checkbox-column
                        key-field="Id"
                        data={raesList}
                        columns={colms}
                        onclicklink={clickLick}
                    ></c-lex-custom-lightning-datatable>
                </div>
            </div>
        </template>
        <!-- 使用期限小于一年的产品 -->
        <template if:true={overlimit}>
            <div style="border: 1px solid #D4D4D4;border-top: 3px solid #51606E;border-radius:5px;margin-bottom:7px;">
                <div style="border-bottom: 1px solid #D4D4D4;padding:3px;">
            <div
                style="
                    border: 1px solid #d4d4d4;
                    border-top: 3px solid #51606e;
                    border-radius: 5px;
                    margin-bottom: 7px;
                "
            >
                <div style="border-bottom: 1px solid #d4d4d4; padding: 3px">
                    <lightning-layout>
                        <lightning-layout-item padding="around-small">
                            <p style="font-size: 18px">
@@ -57,8 +81,14 @@
                    </lightning-layout>
                    <!-- <p style="font-size: 16px;"><strong>使用期限小于一年的产品</strong></p> -->
                </div>
                <div style="padding:10px;">
                    <lightning-datatable class="wrapped-header-datatable" hide-checkbox-column key-field="prodName" data={overlimitdateorderdetails} columns={colm3}></lightning-datatable>
                <div style="padding: 10px">
                    <lightning-datatable
                        class="wrapped-header-datatable"
                        hide-checkbox-column
                        key-field="prodName"
                        data={overlimitdateorderdetails}
                        columns={colm3}
                    ></lightning-datatable>
                </div>
            </div>
        </template>
@@ -147,8 +177,15 @@
            </div>
        </div> -->
        <!--经销商库存上下限 -->
        <div style="border: 1px solid #D4D4D4;border-top: 3px solid #51606E;border-radius:5px;margin-bottom:7px;">
            <div style="border-bottom: 1px solid #D4D4D4;padding:3px;">
        <div
            style="
                border: 1px solid #d4d4d4;
                border-top: 3px solid #51606e;
                border-radius: 5px;
                margin-bottom: 7px;
            "
        >
            <div style="border-bottom: 1px solid #d4d4d4; padding: 3px">
                <lightning-layout>
                    <lightning-layout-item padding="around-small">
                        <p style="font-size: 18px">
@@ -158,12 +195,24 @@
                </lightning-layout>
                <!-- <p style="font-size: 16px;"><strong>经销商库存上下限</strong></p> -->
            </div>
            <div style="padding:10px;">
            <div style="padding: 10px">
                <div lwc:dom="manual" id="resultDiv" class="resultDiv"></div>
                <lightning-datatable class="wrapped-header-datatable" hide-checkbox-column key-field="prodName" data={productLimitRecords} columns={colm4}></lightning-datatable>
                <p style="height: 10px;"></p>
                <div draggable="false" >
                    <button class="slds-button slds-button_neutral slds-button_stretch lexBorder" style="width: 220px;" onclick={editProductLimit}>经销商产品上下限编辑</button>
                <lightning-datatable
                    class="wrapped-header-datatable"
                    hide-checkbox-column
                    key-field="prodName"
                    data={productLimitRecords}
                    columns={colm4}
                ></lightning-datatable>
                <p style="height: 10px"></p>
                <div draggable="false">
                    <button
                        class="slds-button slds-button_neutral slds-button_stretch lexBorder"
                        style="width: 220px"
                        onclick={editProductLimit}
                    >
                        经销商产品上下限编辑
                    </button>
                </div>
            </div>
        </div>
@@ -194,28 +243,69 @@
        </div> -->
        <!-- 订单各种数量信息弹窗 -->
        <template if:true={showPop}>
            <section role="dialog" tabindex="-1" aria-labelledby="modal-heading-01" aria-modal="true" aria-describedby="modal-content-id-1" class="slds-modal slds-fade-in-open slds-modal_small" style="border: 1px solid #D4D4D4;">
            <section
                role="dialog"
                tabindex="-1"
                aria-labelledby="modal-heading-01"
                aria-modal="true"
                aria-describedby="modal-content-id-1"
                class="slds-modal slds-fade-in-open slds-modal_small"
                style="border: 1px solid #d4d4d4"
            >
                <div class="slds-modal__container">
                    <header class="slds-modal__header" style="background-color: #F3F3F3;">
                        <button style="" class="slds-button slds-button_icon slds-modal__close slds-button_icon-inverse" title="Close" onclick={closePop}>
                            <lightning-icon icon-name="utility:close"
                    <header
                        class="slds-modal__header"
                        style="background-color: #f3f3f3"
                    >
                        <button
                            style=""
                            class="slds-button slds-button_icon slds-modal__close slds-button_icon-inverse"
                            title="Close"
                            onclick={closePop}
                        >
                            <lightning-icon
                                icon-name="utility:close"
                                alternative-text="close"
                                variant="inverse"
                                size="small" ></lightning-icon>
                                size="small"
                            ></lightning-icon>
                            <span class="slds-assistive-text">Close</span>
                        </button>
                        <h2 id="modal-heading-01" class="slds-text-heading_medium slds-hyphenate">{popTitle}</h2>
                        <h2
                            id="modal-heading-01"
                            class="slds-text-heading_medium slds-hyphenate"
                        >
                            {popTitle}
                        </h2>
                    </header>
                    <div class="slds-modal__content slds-p-around_medium" id="modal-content-id-1" style="border: 1px solid #F3F3F3;">
                        <lightning-datatable class="wrapped-header-datatable" hide-checkbox-column key-field="prodModel" columns={colms2}  data={recordList}></lightning-datatable>
                    <div
                        class="slds-modal__content slds-p-around_medium"
                        id="modal-content-id-1"
                        style="border: 1px solid #f3f3f3"
                    >
                        <lightning-datatable
                            class="wrapped-header-datatable"
                            hide-checkbox-column
                            key-field="prodModel"
                            columns={colms2}
                            data={recordList}
                        ></lightning-datatable>
                    </div>
                    <footer class="slds-modal__footer">
                        <!-- <lightning-button style="margin-left: 10px;" variant="neutral" label="关闭" onclick={closePop}></lightning-button> -->
                        <button class="slds-button slds-button_neutral slds-button_stretch lexclearStyle" style="margin-left: 10px;" variant="neutral" label="关闭" onclick={closePop}>关闭</button>
                        <button
                            class="slds-button slds-button_neutral slds-button_stretch lexclearStyle"
                            style="margin-left: 10px"
                            variant="neutral"
                            label="关闭"
                            onclick={closePop}
                        >
                            关闭
                        </button>
                    </footer>
                </div>
            </section>
            <div class="slds-backdrop slds-backdrop_open"></div>
        </template>
    </template>
</template>
</template>