From 0f44cb1a0b7b36860e9ce81c1eac9e395d87f0b4 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期一, 05 六月 2023 13:53:18 +0800
Subject: [PATCH] mergecode into lex dtt

---
 force-app/main/default/lwc/lexArriveGoodsMain/lexArriveGoodsMain.html |  270 +++++++++++------------------------------------------
 1 files changed, 59 insertions(+), 211 deletions(-)

diff --git a/force-app/main/default/lwc/lexArriveGoodsMain/lexArriveGoodsMain.html b/force-app/main/default/lwc/lexArriveGoodsMain/lexArriveGoodsMain.html
index e52af40..5dc2f11 100644
--- a/force-app/main/default/lwc/lexArriveGoodsMain/lexArriveGoodsMain.html
+++ b/force-app/main/default/lwc/lexArriveGoodsMain/lexArriveGoodsMain.html
@@ -2,39 +2,52 @@
     <template if:true={showSpinner}>
         <lightning-spinner size="medium" variant="brand"></lightning-spinner>
     </template>
+    <c-common-toast></c-common-toast>
     <template if:true={showPage}>
         <div style="border: 1px solid #D4D4D4;border-top: 3px solid #51606E;border-radius:5px;">
             <div style="padding:10px;">
                 <!-- 鎸夐挳 -->
-                <lightning-button style="margin: 5px;" label="鍏ュ簱" onclick={orderArrive}></lightning-button>
-                <lightning-button style="margin: 5px;" label="杩斿搧" onclick={orderReturn}></lightning-button>
+                <!-- <lightning-button style="margin: 5px;" label="鍏ュ簱" onclick={orderArrive}></lightning-button>
+                <lightning-button style="margin: 5px;" label="杩斿搧" onclick={orderReturn}></lightning-button> -->
+                <button class="slds-button slds-button_neutral slds-button_stretch lexBorder" style="margin: 5px;margin-right: 150px;" label="鍏ュ簱" onclick={orderArrive}>鍏ュ簱</button>
+                <button class="slds-button slds-button_neutral slds-button_stretch lexBorder" style="margin: 5px;" label="杩斿搧" onclick={orderReturn}>杩斿搧</button>
                 <p style="height: 10px;"></p>
                 <!-- 妫�绱㈡潯浠� -->
                 <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;">
-                        <p style="font-size: 16px;"><strong>妫�绱㈡潯浠�</strong></p>
+                        <lightning-layout>
+                            <lightning-layout-item padding="around-small">
+                                <p style="font-size: 18px">
+                                    <strong>妫�绱㈡潯浠�</strong>
+                                </p>
+                            </lightning-layout-item>
+                        </lightning-layout>
+                        <!-- <p style="font-size: 16px;"><strong>妫�绱㈡潯浠�</strong></p> -->
                     </div>
                     <div style="padding:10px;">
                         <table>
                             <tbody>
                                 <tr>
                                     <td style="width: 10px;"></td>
-                                    <td style="width: 94px;">
-                                        <div style="color:#696969;font-size:12px;text-align: left;">娑堣�楀搧璁㈠崟鍚嶇О</div>
+                                    <td style="width: 120px;">
+                                        <div style="color:#696969;font-size:16px;text-align: left;">娑堣�楀搧璁㈠崟鍚嶇О</div>
                                     </td>
                                     <td>
-                                        <lightning-input type="text" variant="label-hidden" label="娑堣�楀搧璁㈠崟鍚嶇О" value={category1} onchange={category1Change}></lightning-input>
+                                        <lightning-input class="inputFont" type="text" variant="label-hidden" label="娑堣�楀搧璁㈠崟鍚嶇О" value={category1} onchange={category1Change}></lightning-input>
                                     </td>
                                     <td style="width: 30px;"></td>
-                                    <td  style="width: 82px;">
-                                        <div style="color:#696969;font-size:12px;text-align: left;">鏈�鏂板彂璐ф棩鏈�</div>
+                                    <td  style="width: 108px;">
+                                        <div style="color:#696969;font-size:16px;text-align: left;">鏈�鏂板彂璐ф棩鏈�</div>
                                     </td>
                                     <td>
-                                        <lightning-input type="date" variant="label-hidden" label="鏈�鏂板彂璐ф棩鏈�" value={cate2} onchange={cate2Change}></lightning-input>
+                                        <lightning-input class="inputFont" type="date" variant="label-hidden" label="鏈�鏂板彂璐ф棩鏈�" value={cate2} onchange={cate2Change}></lightning-input>
                                     </td>
+                                    <td style="width: 30px;"></td>
                                     <td>
-                                        <lightning-button style="margin-left: 10px;margin-right: 5px;" label="鎼滅储" onclick={search}></lightning-button>
-                                        <lightning-button style="margin-left: 5px;margin-right: 5px;" label="娓呯┖" onclick={clear}></lightning-button>
+                                        <!-- <lightning-button style="margin-left: 10px;margin-right: 5px;" label="鎼滅储" onclick={search}></lightning-button>
+                                        <lightning-button style="margin-left: 5px;margin-right: 5px;" label="娓呯┖" onclick={clear}></lightning-button> -->
+                                        <button class="slds-button slds-button_neutral slds-button_stretch lexsearchStyle" style="height:32px;margin-right: 30px;" label="鎼滅储" onclick={search}>鎼滅储</button>
+                                        <button class="slds-button slds-button_neutral slds-button_stretch lexclearStyle" style="height:32px;" label="娓呯┖" onclick={clear}>娓呯┖</button>
                                     </td>
                                 </tr>
                             </tbody>
@@ -44,211 +57,46 @@
                 <!-- 璁㈠崟鏄庣粏 -->
                 <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;">
-                        <p style="font-size: 16px;"><strong>璁㈠崟鏄庣粏</strong></p>
+                        <lightning-layout>
+                            <lightning-layout-item padding="around-small">
+                                <p style="font-size: 18px">
+                                    <strong>璁㈠崟鏄庣粏</strong>
+                                </p>
+                            </lightning-layout-item>
+                        </lightning-layout>
+                        <!-- <p style="font-size: 16px;"><strong>璁㈠崟鏄庣粏</strong></p> -->
                     </div>
                     <div style="padding:10px;">
-                        <table aria-multiselectable="true" class="slds-table slds-table_bordered slds-table_fixed-layout slds-table_resizable-cols" role="grid" aria-label="Example advanced table of Opportunities in actionable mode">
-                            <thead>
-                                <tr class="slds-line-height_reset">
-                                    <th aria-label="Name" aria-sort="none" class="slds-is-resizable slds-is-sortable slds-cell_action-mode" scope="col">
-                                        <a class="slds-th__action slds-text-link_reset" role="button" tabindex="0">
-                                            <span class="slds-assistive-text">Sort by: </span>
-                                            <div class="slds-grid slds-grid_vertical-align-center slds-has-flexi-truncate">
-                                                <span class="slds-truncate" title="Name">娑堣�楀搧璁㈠崟鍚嶇О</span>
-                                                <span class="slds-icon_container slds-icon-utility-arrowdown">
-                                                <svg class="slds-icon slds-icon-text-default slds-is-sortable__icon " aria-hidden="true">
-                                                    <use xlink:href="/assets/icons/utility-sprite/svg/symbols.svg#arrowdown"></use>
-                                                </svg>
-                                                </span>
-                                            </div>
-                                        </a>
-                                        <div class="slds-resizable">
-                                            <span class="slds-resizable__handle">
-                                                <span class="slds-resizable__divider"></span>
-                                            </span>
-                                        </div>
-                                    </th>
-                                    <th aria-label="Name" aria-sort="none" class="slds-is-resizable slds-is-sortable slds-cell_action-mode" scope="col">
-                                        <a class="slds-th__action slds-text-link_reset" role="button" tabindex="0">
-                                            <span class="slds-assistive-text">Sort by: </span>
-                                            <div class="slds-grid slds-grid_vertical-align-center slds-has-flexi-truncate">
-                                                <span class="slds-truncate" title="Name">SAP鍚堝悓鍙�</span>
-                                                <span class="slds-icon_container slds-icon-utility-arrowdown">
-                                                <svg class="slds-icon slds-icon-text-default slds-is-sortable__icon " aria-hidden="true">
-                                                    <use xlink:href="/assets/icons/utility-sprite/svg/symbols.svg#arrowdown"></use>
-                                                </svg>
-                                                </span>
-                                            </div>
-                                        </a>
-                                        <div class="slds-resizable">
-                                            <span class="slds-resizable__handle">
-                                                <span class="slds-resizable__divider"></span>
-                                            </span>
-                                        </div>
-                                    </th>
-                                    <th aria-label="Name" aria-sort="none" class="slds-is-resizable slds-is-sortable slds-cell_action-mode" scope="col">
-                                        <a class="slds-th__action slds-text-link_reset" role="button" tabindex="0">
-                                            <span class="slds-assistive-text">Sort by: </span>
-                                            <div class="slds-grid slds-grid_vertical-align-center slds-has-flexi-truncate">
-                                                <span class="slds-truncate" title="Name">璁㈠崟鎬绘暟</span>
-                                                <span class="slds-icon_container slds-icon-utility-arrowdown">
-                                                <svg class="slds-icon slds-icon-text-default slds-is-sortable__icon " aria-hidden="true">
-                                                    <use xlink:href="/assets/icons/utility-sprite/svg/symbols.svg#arrowdown"></use>
-                                                </svg>
-                                                </span>
-                                            </div>
-                                        </a>
-                                        <div class="slds-resizable">
-                                            <span class="slds-resizable__handle">
-                                                <span class="slds-resizable__divider"></span>
-                                            </span>
-                                        </div>
-                                    </th>
-                                    <th aria-label="Name" aria-sort="none" class="slds-is-resizable slds-is-sortable slds-cell_action-mode" scope="col">
-                                        <a class="slds-th__action slds-text-link_reset" role="button" tabindex="0">
-                                            <span class="slds-assistive-text">Sort by: </span>
-                                            <div class="slds-grid slds-grid_vertical-align-center slds-has-flexi-truncate">
-                                                <span class="slds-truncate" title="Name">宸插埌璐ф暟閲�</span>
-                                                <span class="slds-icon_container slds-icon-utility-arrowdown">
-                                                <svg class="slds-icon slds-icon-text-default slds-is-sortable__icon " aria-hidden="true">
-                                                    <use xlink:href="/assets/icons/utility-sprite/svg/symbols.svg#arrowdown"></use>
-                                                </svg>
-                                                </span>
-                                            </div>
-                                        </a>
-                                        <div class="slds-resizable">
-                                            <span class="slds-resizable__handle">
-                                                <span class="slds-resizable__divider"></span>
-                                            </span>
-                                        </div>
-                                    </th>
-                                    <th aria-label="Name" aria-sort="none" class="slds-is-resizable slds-is-sortable slds-cell_action-mode" scope="col">
-                                        <a class="slds-th__action slds-text-link_reset" role="button" tabindex="0">
-                                            <span class="slds-assistive-text">Sort by: </span>
-                                            <div class="slds-grid slds-grid_vertical-align-center slds-has-flexi-truncate">
-                                                <span class="slds-truncate" title="Name">寰呯郴缁熸搷浣滃叆搴撴暟閲�</span>
-                                                <span class="slds-icon_container slds-icon-utility-arrowdown">
-                                                <svg class="slds-icon slds-icon-text-default slds-is-sortable__icon " aria-hidden="true">
-                                                    <use xlink:href="/assets/icons/utility-sprite/svg/symbols.svg#arrowdown"></use>
-                                                </svg>
-                                                </span>
-                                            </div>
-                                        </a>
-                                        <div class="slds-resizable">
-                                            <span class="slds-resizable__handle">
-                                                <span class="slds-resizable__divider"></span>
-                                            </span>
-                                        </div>
-                                    </th>
-                                    <th aria-label="Name" aria-sort="none" class="slds-is-resizable slds-is-sortable slds-cell_action-mode" scope="col">
-                                        <a class="slds-th__action slds-text-link_reset" role="button" tabindex="0">
-                                            <span class="slds-assistive-text">Sort by: </span>
-                                            <div class="slds-grid slds-grid_vertical-align-center slds-has-flexi-truncate">
-                                                <span class="slds-truncate" title="Name">杩樻病鍙戣揣鏁伴噺</span>
-                                                <span class="slds-icon_container slds-icon-utility-arrowdown">
-                                                <svg class="slds-icon slds-icon-text-default slds-is-sortable__icon " aria-hidden="true">
-                                                    <use xlink:href="/assets/icons/utility-sprite/svg/symbols.svg#arrowdown"></use>
-                                                </svg>
-                                                </span>
-                                            </div>
-                                        </a>
-                                        <div class="slds-resizable">
-                                            <span class="slds-resizable__handle">
-                                                <span class="slds-resizable__divider"></span>
-                                            </span>
-                                        </div>
-                                    </th>
-                                    <th aria-label="Name" aria-sort="none" class="slds-is-resizable slds-is-sortable slds-cell_action-mode" scope="col">
-                                        <a class="slds-th__action slds-text-link_reset" role="button" tabindex="0">
-                                            <span class="slds-assistive-text">Sort by: </span>
-                                            <div class="slds-grid slds-grid_vertical-align-center slds-has-flexi-truncate">
-                                                <span class="slds-truncate" title="Name">鍙戣揣涓冨ぉ杩樻湭鍒拌揣鏁�</span>
-                                                <span class="slds-icon_container slds-icon-utility-arrowdown">
-                                                <svg class="slds-icon slds-icon-text-default slds-is-sortable__icon " aria-hidden="true">
-                                                    <use xlink:href="/assets/icons/utility-sprite/svg/symbols.svg#arrowdown"></use>
-                                                </svg>
-                                                </span>
-                                            </div>
-                                        </a>
-                                        <div class="slds-resizable">
-                                            <span class="slds-resizable__handle">
-                                                <span class="slds-resizable__divider"></span>
-                                            </span>
-                                        </div>
-                                    </th>
-                                    <th aria-label="Name" aria-sort="none" class="slds-is-resizable slds-is-sortable slds-cell_action-mode" scope="col">
-                                        <a class="slds-th__action slds-text-link_reset" role="button" tabindex="0">
-                                            <span class="slds-assistive-text">Sort by: </span>
-                                            <div class="slds-grid slds-grid_vertical-align-center slds-has-flexi-truncate">
-                                                <span class="slds-truncate" title="Name">鏈�鏂板彂璐ф棩鏈�</span>
-                                                <span class="slds-icon_container slds-icon-utility-arrowdown">
-                                                <svg class="slds-icon slds-icon-text-default slds-is-sortable__icon " aria-hidden="true">
-                                                    <use xlink:href="/assets/icons/utility-sprite/svg/symbols.svg#arrowdown"></use>
-                                                </svg>
-                                                </span>
-                                            </div>
-                                        </a>
-                                        <div class="slds-resizable">
-                                            <span class="slds-resizable__handle">
-                                                <span class="slds-resizable__divider"></span>
-                                            </span>
-                                        </div>
-                                    </th>
-                                    <th aria-label="Name" aria-sort="none" class="slds-is-resizable slds-is-sortable slds-cell_action-mode" scope="col">
-                                        <a class="slds-th__action slds-text-link_reset" role="button" tabindex="0">
-                                            <span class="slds-assistive-text">Sort by: </span>
-                                            <div class="slds-grid slds-grid_vertical-align-center slds-has-flexi-truncate">
-                                                <span class="slds-truncate" title="Name">棣栨鍙戣揣鏃ユ湡</span>
-                                                <span class="slds-icon_container slds-icon-utility-arrowdown">
-                                                <svg class="slds-icon slds-icon-text-default slds-is-sortable__icon " aria-hidden="true">
-                                                    <use xlink:href="/assets/icons/utility-sprite/svg/symbols.svg#arrowdown"></use>
-                                                </svg>
-                                                </span>
-                                            </div>
-                                        </a>
-                                        <div class="slds-resizable">
-                                            <span class="slds-resizable__handle">
-                                                <span class="slds-resizable__divider"></span>
-                                            </span>
-                                        </div>
-                                    </th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                <tr aria-selected="false" class="slds-hint-parent">
-                                    <td class="slds-cell_action-mode" role="gridcell">
-                                        <div class="slds-truncate" title="Acme">璁㈠崟鏄庣粏姹囨��</div>
-                                    </td>
-                                    <td class="slds-cell_action-mode" role="gridcell">
-                                        <div class="slds-truncate" title="Acme"></div>
-                                    </td>
-                                    <td class="slds-cell_action-mode" role="gridcell">
-                                        <div class="slds-truncate" title="Acme">{totalNum}</div>
-                                    </td>
-                                    <td class="slds-cell_action-mode" role="gridcell">
-                                        <div class="slds-truncate" title="Acme">{orderNumberArrived}</div>
-                                    </td>
-                                    <td class="slds-cell_action-mode" role="gridcell">
-                                        <div class="slds-truncate" title="Acme">{deliveryDetailCount}</div>
-                                    </td>
-                                    <td class="slds-cell_action-mode" role="gridcell">
-                                        <div class="slds-truncate" title="Acme">{orderNumberNotarrive}</div>
-                                    </td>
-                                    <td class="slds-cell_action-mode" role="gridcell">
-                                        <div class="slds-truncate" title="Acme">{moreThanSevenDays}</div>
-                                    </td>
-                                    <td class="slds-cell_action-mode" role="gridcell">
-                                        <div class="slds-truncate" title="Acme"></div>
-                                    </td>
-                                    <td class="slds-cell_action-mode" role="gridcell">
-                                        <div class="slds-truncate" title="Acme"></div>
-                                    </td>
-                                </tr>
-                            </tbody>
-                        </table>
+                        <!-- <lightning-datatable hide-checkbox-column key-field="id" columns={colms}  data={raesList}></lightning-datatable> -->
+                        <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>
             </div>
         </div>
     </template>
+    <!-- 璁㈠崟鍚勭鏁伴噺淇℃伅寮圭獥 -->
+    <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;">
+            <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"
+                            alternative-text="close"
+                            variant="inverse"
+                            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>
+                </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>
+                <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>
+                </footer>
+            </div>
+        </section>
+        <div class="slds-backdrop slds-backdrop_open"></div>
+    </template>
 </template>
\ No newline at end of file

--
Gitblit v1.9.1