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/lexSaleAndDelivery/lexSaleAndDelivery.html | 174 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 127 insertions(+), 47 deletions(-)
diff --git a/force-app/main/default/lwc/lexSaleAndDelivery/lexSaleAndDelivery.html b/force-app/main/default/lwc/lexSaleAndDelivery/lexSaleAndDelivery.html
index d2c33e0..fd35ca3 100644
--- a/force-app/main/default/lwc/lexSaleAndDelivery/lexSaleAndDelivery.html
+++ b/force-app/main/default/lwc/lexSaleAndDelivery/lexSaleAndDelivery.html
@@ -28,22 +28,33 @@
<lightning-layout multiple-rows>
<lightning-layout-item size="6">
<div class="slds-text-align_center">
- <div class="slds-grid slds-grid_vertical-align-center">
+ <div
+ class="slds-grid slds-grid_vertical-align-center"
+ >
<button
class="slds-button slds-button_neutral slds-button_stretch lexBorder lexBorderWidth"
- onclick={neworderhead}>
+ onclick={neworderhead}
+ >
鏂板缓鍑哄簱鍗�
</button>
聽
- <div class="slds-form-element__label searchName" style="visibility: hidden">
+ <div
+ class="slds-form-element__label searchName"
+ style="visibility: hidden"
+ >
鍑哄簱鏃�　浠�
</div>
- <div class="slds-form-element__label searchName" style="visibility: hidden">
+ <div
+ class="slds-form-element__label searchName"
+ style="visibility: hidden"
+ >
　鍒�
</div>
<button
class="slds-button slds-button_neutral slds-button_stretch lexBorder lexBorderWidth"
- onclick={editProductLimit} style="margin-left: 4px;">
+ onclick={editProductLimit}
+ style="margin-left: 4px"
+ >
涓婁紶宸插嚭搴撲竴瑙�
</button>
</div>
@@ -73,26 +84,46 @@
<div class="slds-text-align_center">
<lightning-layout multiple-rows>
<lightning-layout-item size="6">
- <div class="slds-grid slds-grid_vertical-align-center">
- <div class="slds-form-element__label searchName">
+ <div
+ class="slds-grid slds-grid_vertical-align-center"
+ >
+ <div
+ class="slds-form-element__label searchName"
+ >
鍑哄簱鏃�　浠�
</div>
- <lightning-input type="date" variant="label-hidden" label="鍑哄簱鏃� 浠�"
- onchange={dataChange} data-field="deliveryFromDate"
- value={deliveryFromDate} class="inputFont"
- style="max-width: 150px;"></lightning-input>
+ <lightning-input
+ type="date"
+ variant="label-hidden"
+ label="鍑哄簱鏃� 浠�"
+ onchange={dataChange}
+ data-field="deliveryFromDate"
+ value={deliveryFromDate}
+ class="inputFont"
+ style="max-width: 150px"
+ ></lightning-input>
</div>
</lightning-layout-item>
<lightning-layout-item size="6">
- <div class="slds-grid slds-grid_vertical-align-center">
- <div class="slds-form-element__label searchName">
+ <div
+ class="slds-grid slds-grid_vertical-align-center"
+ >
+ <div
+ class="slds-form-element__label searchName"
+ >
鍒�
</div>
- <lightning-input type="date" variant="label-hidden" label="鍒�"
- onchange={dataChange} data-field="deliveryToDate"
- value={deliveryToDate} class="inputFont"
- style="max-width: 150px;"></lightning-input>
+ <lightning-input
+ type="date"
+ variant="label-hidden"
+ label="鍒�"
+ onchange={dataChange}
+ data-field="deliveryToDate"
+ value={deliveryToDate}
+ class="inputFont"
+ style="max-width: 150px"
+ ></lightning-input>
</div>
</lightning-layout-item>
</lightning-layout>
@@ -101,46 +132,73 @@
<lightning-layout-item size="3">
<div class="slds-text-align_center">
- <div class="slds-grid slds-grid_vertical-align-center">
- <div class="slds-form-element__label searchName">
+ <div
+ class="slds-grid slds-grid_vertical-align-center"
+ >
+ <div
+ class="slds-form-element__label searchName"
+ >
鍑哄簱鍗曞彿
</div>
- <lightning-input variant="label-hidden" label="鍑哄簱鍗曞彿" onchange={dataChange}
- data-field="deliveryOrderNo" value={deliveryOrderNo} class="inputFont"
- style="max-width: 150px;"></lightning-input>
+ <lightning-input
+ variant="label-hidden"
+ label="鍑哄簱鍗曞彿"
+ onchange={dataChange}
+ data-field="deliveryOrderNo"
+ value={deliveryOrderNo}
+ class="inputFont"
+ style="max-width: 150px"
+ ></lightning-input>
</div>
</div>
</lightning-layout-item>
<lightning-layout-item>
<div class="slds-text-align_center">
- <div class="slds-grid slds-grid_vertical-align-center">
- <div class="slds-form-element__label searchName">
+ <div
+ class="slds-grid slds-grid_vertical-align-center"
+ >
+ <div
+ class="slds-form-element__label searchName"
+ >
瀹㈡埛鍚�
</div>
- <lightning-input variant="label-hidden" label="瀹㈡埛鍚�" onchange={dataChange}
- data-field="contactName" value={contactName} class="inputFont"
- style="max-width: 150px;"></lightning-input>
+ <lightning-input
+ variant="label-hidden"
+ label="瀹㈡埛鍚�"
+ onchange={dataChange}
+ data-field="contactName"
+ value={contactName}
+ class="inputFont"
+ style="max-width: 150px"
+ ></lightning-input>
</div>
</div>
</lightning-layout-item>
</lightning-layout>
- <lightning-layout multiple-rows style="margin-top: 20px">
+ <lightning-layout
+ multiple-rows
+ style="margin-top: 20px"
+ >
<lightning-layout-item size="6">
<lightning-layout multiple-rows>
<lightning-layout-item size="6">
<button
- class="slds-button slds-button_neutral slds-button_stretch lexsearchStyle"
- onclick={searchConsumableorderdetailsJs} style="min-width: 180px;">
+ class="slds-button slds-button_neutral slds-button_stretch lexsearchStyle"
+ onclick={searchConsumableorderdetailsJs}
+ style="min-width: 180px"
+ >
杩樻病鍑哄簱鐨勫嚭搴撳崟
</button>
</lightning-layout-item>
<lightning-layout-item size="6">
<button
- class="slds-button slds-button_neutral slds-button_stretch lexsearchStyle"
- onclick={searchOrderInstatusJs} style="min-width: 215px;">
+ class="slds-button slds-button_neutral slds-button_stretch lexsearchStyle"
+ onclick={searchOrderInstatusJs}
+ style="min-width: 215px"
+ >
宸插嚭搴撴湭寮�绁ㄧ殑鍑哄簱鍗�
</button>
</lightning-layout-item>
@@ -148,15 +206,21 @@
</lightning-layout-item>
<lightning-layout-item size="3">
- <button class="slds-button slds-button_neutral slds-button_stretch lexsearchStyle"
- onclick={searchConsumableorFinishJs} style="min-width: 225px">
+ <button
+ class="slds-button slds-button_neutral slds-button_stretch lexsearchStyle"
+ onclick={searchConsumableorFinishJs}
+ style="min-width: 225px"
+ >
宸插嚭搴撳凡寮�绁ㄧ殑鍑哄簱鍗�
</button>
</lightning-layout-item>
<lightning-layout-item>
- <button class="slds-button slds-button_neutral slds-button_stretch lexclearStyle"
- onclick={clearJs} style="width: 206px;">
+ <button
+ class="slds-button slds-button_neutral slds-button_stretch lexclearStyle"
+ onclick={clearJs}
+ style="width: 206px"
+ >
娓呯┖
</button>
</lightning-layout-item>
@@ -168,12 +232,21 @@
<div class="borderCss">
<template if:true={isShowSpinner}>
<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>
+ 聽 聽 聽 聽 聽 聽
+ <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>
<div class="headerDorderCss">
<lightning-layout>
@@ -186,14 +259,21 @@
</div>
<template if:true={showTable}>
<div style="padding: 7px; height: 500px">
- <lightning-datatable key-field="id" data={data} columns={columns}
- hide-checkbox-column default-sort-direction={defaultSortDirection}
- sorted-direction={sortDirection} sorted-by={sortedBy} onsort={onHandleSort}
- class="wrapped-header-datatable">
+ <lightning-datatable
+ key-field="id"
+ data={data}
+ columns={columns}
+ hide-checkbox-column
+ default-sort-direction={defaultSortDirection}
+ sorted-direction={sortDirection}
+ sorted-by={sortedBy}
+ onsort={onHandleSort}
+ class="wrapped-header-datatable"
+ >
</lightning-datatable>
</div>
</template>
</div>
</div>
</div>
-</template>
\ No newline at end of file
+</template>
--
Gitblit v1.9.1