From 80a3f59e2d3df07805bc67e329300b8de90a5b3a Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期二, 11 七月 2023 14:13:08 +0800
Subject: [PATCH] Merge branch 'LEXCommunityLiJun' into LEXUpgrade2023-Deloitte
---
force-app/main/default/lwc/lexCancelRemoveBox/lexCancelRemoveBox.html | 244 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 170 insertions(+), 74 deletions(-)
diff --git a/force-app/main/default/lwc/lexCancelRemoveBox/lexCancelRemoveBox.html b/force-app/main/default/lwc/lexCancelRemoveBox/lexCancelRemoveBox.html
index 3b10fa5..c9db21e 100644
--- a/force-app/main/default/lwc/lexCancelRemoveBox/lexCancelRemoveBox.html
+++ b/force-app/main/default/lwc/lexCancelRemoveBox/lexCancelRemoveBox.html
@@ -1,11 +1,26 @@
<template>
<template if:true={showSpinner}>
- <lightning-spinner size="medium" variant="brand"></lightning-spinner>
+ <!-- <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"
+ >
+ <span class="slds-assistive-text">Loading</span>
+ <div class="slds-spinner__dot-a"></div>
+ <div class="slds-spinner__dot-b"></div>
+ </div>
+ </div>
</template>
<c-common-toast></c-common-toast>
- <div style="border: 1px solid #D4D4D4;border-radius:5px;">
-
- <div style="border-top: 3px solid #51606E;;border-bottom: 1px solid #D4D4D4;padding:3px;">
+ <div style="border: 1px solid #d4d4d4; border-radius: 5px">
+ <div
+ style="
+ border-top: 3px solid #51606e;
+ border-bottom: 1px solid #d4d4d4;
+ padding: 3px;
+ "
+ >
<div>
<!-- <p style="font-size: 18px;"><strong>鍙栨秷鎷嗙洅</strong></p> -->
<lightning-layout>
@@ -17,15 +32,51 @@
</lightning-layout>
</div>
</div>
- <div style="padding:10px;">
- <div style="border: 1px solid #D4D4D4;border-radius:5px;margin-bottom:7px;">
- <div style="border-top: 3px solid #51606E;border-bottom: 1px solid #D4D4D4;padding:3px;">
- <!-- <lightning-button variant="brand" class='lexstyle' style="margin-left:10px;" label="鍙栨秷鎷嗙洅纭" title="鍙栨秷鎷嗙洅纭" onclick={saveConfirm}></lightning-button></td> -->
- <button class="slds-button slds-button_neutral slds-button_stretch lexBorder" style="margin-left:10px;margin-top:12px;margin-bottom:12px;" label="鍙栨秷鎷嗙洅纭" onclick={saveConfirm}>鍙栨秷鎷嗙洅纭</button>
+ <div style="padding: 10px">
+ <div
+ style="
+ border: 1px solid #d4d4d4;
+ border-radius: 5px;
+ margin-bottom: 7px;
+ "
+ >
+ <div
+ style="
+ border-top: 3px solid #51606e;
+ border-bottom: 1px solid #d4d4d4;
+ padding: 3px;
+ "
+ >
+ <!-- <lightning-button variant="brand" class='lexstyle' style="margin-left:10px;" label="鍙栨秷鎷嗙洅纭" title="鍙栨秷鎷嗙洅纭" onclick={saveConfirm}></lightning-button></td> -->
+ <button
+ class="slds-button slds-button_neutral slds-button_stretch lexBorder"
+ style="
+ margin-left: 10px;
+ margin-top: 12px;
+ margin-bottom: 12px;
+ "
+ label="鍙栨秷鎷嗙洅纭"
+ onclick={saveConfirm}
+ >
+ 鍙栨秷鎷嗙洅纭
+ </button>
+ </div>
</div>
- </div>
- <div style="border: 1px solid #D4D4D4;border-radius:5px;margin-bottom:7px;margin-top:5px;">
- <div style="border-top: 3px solid #51606E;border-bottom: 1px solid #D4D4D4;padding:3px;">
+ <div
+ style="
+ border: 1px solid #d4d4d4;
+ border-radius: 5px;
+ margin-bottom: 7px;
+ margin-top: 5px;
+ "
+ >
+ <div
+ style="
+ border-top: 3px solid #51606e;
+ border-bottom: 1px solid #d4d4d4;
+ padding: 3px;
+ "
+ >
<lightning-layout>
<lightning-layout-item padding="around-small">
<p style="font-size: 16px">
@@ -34,46 +85,71 @@
</lightning-layout-item>
</lightning-layout>
</div>
-
+
<!-- <div style="border-top: 3px solid #51606E;border-bottom: 1px solid #D4D4D4;padding:3px;"> -->
- <table>
- <colgroup>
- <col width="160px" />
- <col width="100px" />
- <col width="10px" />
- <col width="70px" />
- <col width="100px" />
- <col width="10px" />
- <col width="90px" />
- <col width="100px" />
- <col width="10px" />
- <col width="85px" />
- <col width="100px" />
- <col width="10px" />
- <col width="70px" />
- <col width="100px" />
- </colgroup>
- <tbody>
- <tr>
- <td></td>
- <td align="right" class="searchName">BarCode</td>
- <td style="width:600px"><lightning-textarea class="inputFont" name="BarCode" label=""
- onchange={handleChange}></lightning-textarea></td>
- <td align="right"></td>
- <td></td>
- <td style="width: 200px;">
- <button style="margin-top:14px;" class="slds-button slds-button_neutral slds-button_stretch lexBorder" label="鑾峰彇鏄庣粏" onclick={getDetails}>鑾峰彇鏄庣粏</button>
- <!-- <lightning-button variant="brand" class='lexstyle' label="鑾峰彇鏄庣粏" title="鑾峰彇鏄庣粏" onclick={getDetails}
- ></lightning-button> -->
- </td>
- </tr>
- </tbody>
- </table>
+ <table>
+ <colgroup>
+ <col width="160px" />
+ <col width="100px" />
+ <col width="10px" />
+ <col width="70px" />
+ <col width="100px" />
+ <col width="10px" />
+ <col width="90px" />
+ <col width="100px" />
+ <col width="10px" />
+ <col width="85px" />
+ <col width="100px" />
+ <col width="10px" />
+ <col width="70px" />
+ <col width="100px" />
+ </colgroup>
+ <tbody>
+ <tr>
+ <td></td>
+ <td align="right" class="searchName">BarCode</td>
+ <td style="width: 600px">
+ <lightning-textarea
+ class="inputFont"
+ name="BarCode"
+ label=""
+ onchange={handleChange}
+ ></lightning-textarea>
+ </td>
+ <td align="right"></td>
+ <td></td>
+ <td style="width: 200px">
+ <button
+ style="margin-top: 14px"
+ class="slds-button slds-button_neutral slds-button_stretch lexBorder"
+ label="鑾峰彇鏄庣粏"
+ onclick={getDetails}
+ >
+ 鑾峰彇鏄庣粏
+ </button>
+ <!-- <lightning-button variant="brand" class='lexstyle' label="鑾峰彇鏄庣粏" title="鑾峰彇鏄庣粏" onclick={getDetails}
+ ></lightning-button> -->
+ </td>
+ </tr>
+ </tbody>
+ </table>
<!-- </div> -->
</div>
- <div style="border: 1px solid #D4D4D4;border-radius:5px;margin-bottom:7px;">
- <div style="border-top: 3px solid #51606E;border-bottom: 1px solid #D4D4D4;padding:3px;">
+ <div
+ style="
+ border: 1px solid #d4d4d4;
+ border-radius: 5px;
+ margin-bottom: 7px;
+ "
+ >
+ <div
+ style="
+ border-top: 3px solid #51606e;
+ border-bottom: 1px solid #d4d4d4;
+ padding: 3px;
+ "
+ >
<lightning-layout>
<lightning-layout-item padding="around-small">
<p style="font-size: 18px">
@@ -82,26 +158,46 @@
</lightning-layout-item>
</lightning-layout>
</div>
- <div style="padding:10px;">
-
+ <div style="padding: 10px">
<!-- <div style="height: 300px;"> -->
- <!-- <template if:true={showTable}> -->
- <c-lex-custom-lightning-datatable key-field="prodid" data={data} columns={columns}
- onrowselection={getSelectedRows} hide-checkbox-column="true"
- selected-rows={selectedRows} class="wrapped-header-datatable">
- </c-lex-custom-lightning-datatable>
- <!-- </template> -->
+ <!-- <template if:true={showTable}> -->
+ <c-lex-custom-lightning-datatable
+ key-field="prodid"
+ data={data}
+ columns={columns}
+ onrowselection={getSelectedRows}
+ hide-checkbox-column="true"
+ selected-rows={selectedRows}
+ class="wrapped-header-datatable"
+ style="word-wrap: break-word; word-break: break-all"
+ >
+ </c-lex-custom-lightning-datatable>
+ <!-- </template> -->
<!-- </div> -->
-
</div>
</div>
- <div style="border: 1px solid #D4D4D4;border-radius:5px;margin-bottom:7px;margin-top:10px">
- <div style="border-top: 3px solid #51606E;border-bottom: 1px solid #D4D4D4;padding:3px;">
+ <div
+ style="
+ border: 1px solid #d4d4d4;
+ border-radius: 5px;
+ margin-bottom: 7px;
+ margin-top: 10px;
+ "
+ >
+ <div
+ style="
+ border-top: 3px solid #51606e;
+ border-bottom: 1px solid #d4d4d4;
+ padding: 3px;
+ "
+ >
<table>
<tr>
<td>
<lightning-layout>
- <lightning-layout-item padding="around-small">
+ <lightning-layout-item
+ padding="around-small"
+ >
<p style="font-size: 18px">
<strong>閿欒鏄庣粏</strong>
</p>
@@ -111,21 +207,21 @@
</tr>
</table>
</div>
-
- <div style="padding:10px;">
- <lightning-datatable
- key-field="id" data={errorDetail} columns={column}
- onrowselection={getSelectedRows} hide-checkbox-column="true"
- selected-rows={selectedRows} class="wrapped-header-datatable">
- </lightning-datatable>
-
+ <div style="padding: 10px">
+ <lightning-datatable
+ key-field="id"
+ data={errorDetail}
+ columns={column}
+ onrowselection={getSelectedRows}
+ hide-checkbox-column="true"
+ selected-rows={selectedRows}
+ class="wrapped-header-datatable"
+ style="word-wrap: break-word; word-break: break-all"
+ >
+ </lightning-datatable>
+ </div>
</div>
</div>
- </div>
-
-
-
</div>
-
-</template>
\ No newline at end of file
+</template>
--
Gitblit v1.9.1