From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte
---
force-app/main/default/lwc/lexTopPage/lexTopPage.html | 149 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 123 insertions(+), 26 deletions(-)
diff --git a/force-app/main/default/lwc/lexTopPage/lexTopPage.html b/force-app/main/default/lwc/lexTopPage/lexTopPage.html
index 8886b5c..fbd71f0 100644
--- a/force-app/main/default/lwc/lexTopPage/lexTopPage.html
+++ b/force-app/main/default/lwc/lexTopPage/lexTopPage.html
@@ -1,6 +1,16 @@
<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>
<template if:true={showPage}>
@@ -21,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">
@@ -32,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">
@@ -50,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>
@@ -140,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">
@@ -151,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>
@@ -187,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>
\ No newline at end of file
+</template>
--
Gitblit v1.9.1