From 0c4796706fc9473d069b620321a54b20a119906c Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期二, 11 七月 2023 14:16:44 +0800
Subject: [PATCH] Merge branch 'LEXUpgrade2023-Deloitte'
---
force-app/main/default/lwc/lexSaleAndDelivery/lexSaleAndDelivery.html | 301 ++++++++++++++++++++++++++-----------------------
1 files changed, 159 insertions(+), 142 deletions(-)
diff --git a/force-app/main/default/lwc/lexSaleAndDelivery/lexSaleAndDelivery.html b/force-app/main/default/lwc/lexSaleAndDelivery/lexSaleAndDelivery.html
index 509cd8c..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>
@@ -71,165 +82,148 @@
<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-form-element__label searchName">
- 鍑哄簱鏃�　浠�
- </div>
- <lightning-input type="date" variant="label-hidden" label="鍑哄簱鏃� 浠�"
- onchange={dataChange} data-field="deliveryFromDate" value={deliveryFromDate}
- style="min-width: 200px" class="inputFont"></lightning-input>
- <div class="slds-form-element__label searchName">
- 　鍒�
- </div>
- <lightning-input type="date" variant="label-hidden" label="鍒�"
- onchange={dataChange} data-field="deliveryToDate" value={deliveryToDate}
- style="min-width: 200px" class="inputFont"></lightning-input>
- </div>
- </div>
- </lightning-layout-item>
+ <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>
+ <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="3" style="margin-left: -80px;">
- <div class="slds-text-align_center">
- <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}
- style="min-width: 215px" class="inputFont"></lightning-input>
- </div>
+ <lightning-layout-item size="6">
+ <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>
+ </div>
+ </lightning-layout-item>
+ </lightning-layout>
</div>
</lightning-layout-item>
<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>
+ </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>
- <lightning-input variant="label-hidden" label="瀹㈡埛鍚�" onchange={dataChange}
- data-field="contactName" value={contactName} style="min-width: 215px"
- class="inputFont"></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">
- <div class="slds-text-align_center">
- <div class="slds-grid slds-grid_vertical-align-center">
- <!-- <div class="slds-form-element__label searchName" style="visibility: hidden;">
- 鍑哄簱鏃�　浠�</div> -->
+ <lightning-layout multiple-rows>
+ <lightning-layout-item size="6">
<button
- class="slds-button slds-button_neutral slds-button_stretch lexsearchStyle"
- onclick={searchConsumableorderdetailsJs} style="width: 200px;">
+ class="slds-button slds-button_neutral slds-button_stretch lexsearchStyle"
+ onclick={searchConsumableorderdetailsJs}
+ style="min-width: 180px"
+ >
杩樻病鍑哄簱鐨勫嚭搴撳崟
</button>
+ </lightning-layout-item>
- <div class="slds-form-element__label searchName" style="visibility: hidden">
- 鍑哄簱鏃�　浠�
- </div>
- <div class="slds-form-element__label searchName" style="visibility: hidden">
- 　鍒�
- </div>
+ <lightning-layout-item size="6">
<button
- class="slds-button slds-button_neutral slds-button_stretch lexsearchStyle"
- onclick={searchOrderInstatusJs} style="width: 215px;margin-left: 4px;">
+ class="slds-button slds-button_neutral slds-button_stretch lexsearchStyle"
+ onclick={searchOrderInstatusJs}
+ style="min-width: 215px"
+ >
宸插嚭搴撴湭寮�绁ㄧ殑鍑哄簱鍗�
</button>
- </div>
- </div>
- </lightning-layout-item>
-
- <lightning-layout-item size="3" style="margin-left: -80px;">
- <div class="slds-text-align_center">
- <div class="slds-grid slds-grid_vertical-align-center">
- <div class="slds-form-element__label searchName" style="visibility: hidden">
- 鍑哄簱鍗曞彿
- </div>
- <button
- class="slds-button slds-button_neutral slds-button_stretch lexsearchStyle"
- onclick={searchConsumableorFinishJs} style="width: 215px">
- 宸插嚭搴撳凡寮�绁ㄧ殑鍑哄簱鍗�
- </button>
- </div>
- </div>
+ </lightning-layout-item>
+ </lightning-layout>
</lightning-layout-item>
<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" style="visibility: hidden">
- 瀹㈡埛鍚�
- </div>
- <button
- class="slds-button slds-button_neutral slds-button_stretch lexclearStyle"
- onclick={clearJs} style="width: 215px">
- 娓呯┖
- </button>
- </div>
- </div>
+ <button
+ class="slds-button slds-button_neutral slds-button_stretch lexsearchStyle"
+ onclick={searchConsumableorFinishJs}
+ style="min-width: 225px"
+ >
+ 宸插嚭搴撳凡寮�绁ㄧ殑鍑哄簱鍗�
+ </button>
</lightning-layout-item>
- <!-- <lightning-layout-item size="5">
- <div class="slds-text-align_center">
- <div class="slds-grid slds-grid_vertical-align-center">
- <div class="slds-form-element__label searchName" style="visibility: hidden;">
- 鍑哄簱鏃�　浠�</div>
- <lightning-input type="date" variant="label-hidden" label="鍑哄簱鏃� 浠�"
- onchange={dataChange} data-field="deliveryFromDate" value={deliveryFromDate}
- style="min-width: 200px;visibility: hidden;"></lightning-input>
-
- <div class="slds-form-element__label searchName" style="visibility: hidden;">
- 　鍒�
- </div>
- <button
- class="slds-button slds-button_neutral slds-button_stretch lexBorderWidth"
- onclick={searchConsumableorderdetailsJs}>杩樻病鍑哄簱鐨勫嚭搴撳崟</button>
- </div>
- </div>
+ <lightning-layout-item>
+ <button
+ class="slds-button slds-button_neutral slds-button_stretch lexclearStyle"
+ onclick={clearJs}
+ style="width: 206px"
+ >
+ 娓呯┖
+ </button>
</lightning-layout-item>
- <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" style="visibility: hidden;">
- 鍑哄簱鍗曞彿</div>
- <button
- class="slds-button slds-button_neutral slds-button_stretch lexBorderWidth"
- onclick={searchOrderInstatusJs} style="width: 215px;">宸插嚭搴撴湭寮�绁ㄧ殑鍑哄簱鍗�</button>
- </div>
- </div>
- </lightning-layout-item>
- <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" style="visibility: hidden;">瀹㈡埛鍚�
- </div>
- <button
- class="slds-button slds-button_neutral slds-button_stretch lexBorderWidth"
- onclick={searchConsumableorFinishJs}
- style="width: 215px;">宸插嚭搴撳凡寮�绁ㄧ殑鍑哄簱鍗�</button>
- </div>
- </div>
- </lightning-layout-item>
- <lightning-layout-item size="1">
- <div class="slds-grid slds-grid_vertical-align-center">
- <button class="slds-button slds-button_neutral slds-button_stretch lexBorderWidth"
- onclick={clearJs} style="width: 80px;">娓呯┖</button>
- </div>
- </lightning-layout-item> -->
-
- <!-- <div class="slds-m-top_small slds-m-bottom_medium">
- <button class="slds-button slds-button_neutral slds-button_stretch lexBorderWidth lexBorder"
- onclick={searchConsumableorderdetailsJs}>杩樻病鍑哄簱鐨勫嚭搴撳崟</button>
- 聽 <button class="slds-button slds-button_neutral slds-button_stretch lexBorderWidth lexBorder buttonMarginLeft"
- onclick={searchOrderInstatusJs} style="width: 215px;">宸插嚭搴撴湭寮�绁ㄧ殑鍑哄簱鍗�</button>
- <button class="slds-button slds-button_neutral slds-button_stretch lexBorderWidth lexBorder buttonMarginLeft"
- onclick={searchConsumableorFinishJs} style="width: 215px;">宸插嚭搴撳凡寮�绁ㄧ殑鍑哄簱鍗�</button>
- <button class="slds-button slds-button_neutral slds-button_stretch lexBorderWidth lexBorder buttonMarginLeft"
- onclick={clearJs} >娓呯┖</button>
- </div> -->
</lightning-layout>
</div>
</div>
@@ -237,7 +231,22 @@
<div class="borderCss">
<template if:true={isShowSpinner}>
- <lightning-spinner alternative-text="Loading" size="large"></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>
<div class="headerDorderCss">
<lightning-layout>
@@ -250,13 +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