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/lexSaleAndDelivery/lexSaleAndDelivery.html | 343 ++++++++++++++++++++++++++++++++++----------------------
1 files changed, 209 insertions(+), 134 deletions(-)
diff --git a/force-app/main/default/lwc/lexSaleAndDelivery/lexSaleAndDelivery.html b/force-app/main/default/lwc/lexSaleAndDelivery/lexSaleAndDelivery.html
index da463c5..509cd8c 100644
--- a/force-app/main/default/lwc/lexSaleAndDelivery/lexSaleAndDelivery.html
+++ b/force-app/main/default/lwc/lexSaleAndDelivery/lexSaleAndDelivery.html
@@ -1,130 +1,235 @@
<!-- sldsValidatorIgnore -->
<!-- sldsValidatorIgnore -->
<template>
+ <c-common-toast></c-common-toast>
<div class="outerBorderCss">
- <div style="padding:5px;">
+ <div style="padding: 5px">
<div class="borderCss">
- <div style="padding:10px;">
+ <div style="padding: 15px">
<div lwc:dom="manual" class="resultDiv"></div>
<div draggable="false">
- <div class="slds-m-top_small slds-m-bottom_medium">
- <lightning-button label="鏂板缓鍑哄簱鍗�" onclick={neworderhead} class="slds-m-left_x-small"></lightning-button>
- <lightning-button label="涓婁紶宸插嚭搴撲竴瑙�" onclick={editProductLimit} class="slds-m-left_x-small"></lightning-button>
- </div>
+ <!-- <div class="slds-m-top_small slds-m-bottom_medium"> -->
+ <!-- <lightning-button label="鏂板缓鍑哄簱鍗�" onclick={neworderhead}
+ class="slds-m-left_x-small" disabled></lightning-button>
+ <lightning-button label="涓婁紶宸插嚭搴撲竴瑙�" onclick={editProductLimit}
+ class="slds-m-left_x-small"></lightning-button> -->
+ 聽
+ <!-- <button class="slds-button slds-button_neutral slds-button_stretch lexBorder lexBorderWidth"
+ onclick={neworderhead}>
+ 鏂板缓鍑哄簱鍗�
+ </button>
+ 聽
+ <button
+ class="slds-button slds-button_neutral slds-button_stretch lexBorder buttonMarginLeft lexBorderWidth"
+ onclick={editProductLimit}>
+ 涓婁紶宸插嚭搴撲竴瑙�
+ </button> -->
+
+ <lightning-layout multiple-rows>
+ <lightning-layout-item size="6">
+ <div class="slds-text-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}>
+ 鏂板缓鍑哄簱鍗�
+ </button>
+ 聽
+ <div class="slds-form-element__label searchName" style="visibility: hidden">
+ 鍑哄簱鏃�　浠�
+ </div>
+ <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;">
+ 涓婁紶宸插嚭搴撲竴瑙�
+ </button>
+ </div>
+ </div>
+ </lightning-layout-item>
+ </lightning-layout>
+ <!-- </div> -->
</div>
</div>
</div>
<div class="borderCss">
<div class="headerDorderCss">
- <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>
</div>
- <div style="padding:10px;">
+ <div style="padding: 15px">
<div lwc:dom="manual" class="resultDiv"></div>
<div draggable="false">
- <!-- <table>
- <colgroup>
- <col width="50px" />
- <col width="200px" />
- <col width="10px" />
- <col width="50px" />
- <col width="100px" />
- <col width="10px" />
- <col width="50px" />
- <col width="100px" />
- <col width="150px" />
- <col width="200px" />
- <col width="200px" />
- <col width="100px" />
- </colgroup>
- <tr>
- <td>鍑哄簱鏃�</td>
- <td><lightning-input type="date" variant="label-inline" label="浠�" onchange={dataChange} data-field ="deliveryFromDate" value={deliveryFromDate}></lightning-input></td>
- <td></td>
- <td>鍑哄簱鍗曞彿</td>
- <td><lightning-input type="text" name="deliveryOrderNo" label="deliveryOrderNo"
- variant="label-hidden" onchange={dataChange} data-field ="deliveryOrderNo" value={deliveryOrderNo}></lightning-input></td>
- <td></td>
- <td>瀹㈡埛鍚�</td>
- <td><lightning-input type="text" name="contactName" label="contactName"
- variant="label-hidden" onchange={dataChange} data-field ="contactName" value={contactName}></lightning-input></td>
- <td style="text-align: center;"><lightning-button label="杩樻病鍑哄簱鐨勫嚭搴撳崟" onclick={searchConsumableorderdetailsJs}></lightning-button>
- </td>
- <td style="text-align: center;"><lightning-button label="宸插嚭搴撴湭寮�绁ㄧ殑鍑哄簱鍗�" onclick={searchOrderInstatusJs}></lightning-button>
- </td>
- <td style="text-align: center;"><lightning-button label="宸插嚭搴撳凡寮�绁ㄧ殑鍑哄簱鍗�" onclick={searchConsumableorFinishJs}></lightning-button>
- </td>
- <td style="text-align: center;"><lightning-button label="娓呯┖" onclick={clearJs}></lightning-button></td>
- </tr>
- <tr>
- <td></td>
- <td><lightning-input type="date" name="toDataInput" variant="label-inline" label="鍒�" onchange={dataChange} data-field ="deliveryToDate" value={deliveryToDate}></lightning-input></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
- </tr>
- </table> -->
<lightning-layout multiple-rows>
- <lightning-layout-item flexibility="auto">
+ <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">鍑哄簱鏃�　浠�</div>
+ <div class="slds-form-element__label searchName">
+ 鍑哄簱鏃�　浠�
+ </div>
<lightning-input type="date" variant="label-hidden" label="鍑哄簱鏃� 浠�"
- onchange={dataChange} data-field="deliveryFromDate"
- value={deliveryFromDate}></lightning-input>
- </div>
-
- </br>
- <div class="slds-grid slds-grid_vertical-align-center">
- <div class="slds-form-element__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}></lightning-input>
+ onchange={dataChange} data-field="deliveryToDate" value={deliveryToDate}
+ style="min-width: 200px" class="inputFont"></lightning-input>
</div>
</div>
</lightning-layout-item>
- <lightning-layout-item flexibility="auto">
- <div class="slds-grid slds-grid_vertical-align-center">
- <div class="slds-form-element__label">鍑哄簱鍗曞彿</div>
- <lightning-input variant="label-hidden" label="鍑哄簱鍗曞彿" onchange={dataChange}
- data-field="deliveryOrderNo" value={deliveryOrderNo}></lightning-input>
+
+ <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>
</div>
</lightning-layout-item>
- <lightning-layout-item flexibility="auto">
- <div class="slds-grid slds-grid_vertical-align-center">
- <div class="slds-form-element__label">瀹㈡埛鍚�</div>
- <lightning-input variant="label-hidden" label="瀹㈡埛鍚�" onchange={dataChange}
- data-field="contactName" value={contactName}></lightning-input>
+
+ <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>
+ <lightning-input variant="label-hidden" label="瀹㈡埛鍚�" onchange={dataChange}
+ data-field="contactName" value={contactName} style="min-width: 215px"
+ class="inputFont"></lightning-input>
+ </div>
</div>
</lightning-layout-item>
- <lightning-layout-item flexibility="auto">
- <div class="slds-grid slds-grid_vertical-align-center">
- <lightning-button label="杩樻病鍑哄簱鐨勫嚭搴撳崟" onclick={searchConsumableorderdetailsJs}></lightning-button>
+ </lightning-layout>
+
+ <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> -->
+ <button
+ class="slds-button slds-button_neutral slds-button_stretch lexsearchStyle"
+ onclick={searchConsumableorderdetailsJs} style="width: 200px;">
+ 杩樻病鍑哄簱鐨勫嚭搴撳崟
+ </button>
+
+ <div class="slds-form-element__label searchName" style="visibility: hidden">
+ 鍑哄簱鏃�　浠�
+ </div>
+ <div class="slds-form-element__label searchName" style="visibility: hidden">
+ 　鍒�
+ </div>
+ <button
+ class="slds-button slds-button_neutral slds-button_stretch lexsearchStyle"
+ onclick={searchOrderInstatusJs} style="width: 215px;margin-left: 4px;">
+ 宸插嚭搴撴湭寮�绁ㄧ殑鍑哄簱鍗�
+ </button>
+ </div>
</div>
</lightning-layout-item>
- <lightning-layout-item flexibility="auto">
- <div class="slds-grid slds-grid_vertical-align-center">
- <lightning-button label="宸插嚭搴撴湭寮�绁ㄧ殑鍑哄簱鍗�" onclick={searchOrderInstatusJs}></lightning-button>
+
+ <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-item flexibility="auto">
- <div class="slds-grid slds-grid_vertical-align-center">
- <lightning-button label="宸插嚭搴撳凡寮�绁ㄧ殑鍑哄簱鍗�" onclick={searchConsumableorFinishJs}></lightning-button>
+
+ <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>
</lightning-layout-item>
- <lightning-layout-item flexibility="auto">
- <div class="slds-grid slds-grid_vertical-align-center">
- <lightning-button label="娓呯┖" onclick={clearJs}></lightning-button>
+
+ <!-- <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>
+ <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>
@@ -135,52 +240,22 @@
<lightning-spinner alternative-text="Loading" size="large"></lightning-spinner>
</template>
<div class="headerDorderCss">
- <p style="font-size: 16px;"><strong>鍑哄簱鍗曚竴瑙堣〃</strong><span> {message}</span></p>
+ <lightning-layout>
+ <lightning-layout-item padding="around-small">
+ <p style="font-size: 18px">
+ <strong>鍑哄簱鍗曚竴瑙堣〃</strong>
+ </p>
+ </lightning-layout-item>
+ </lightning-layout>
</div>
- <div style="padding:10px;">
- <!-- <div style="height: 300px;">
- <lightning-datatable
- key-field="id"
- data={data}
- columns={columns}
- hide-checkbox-column
- default-sort-direction={defaultSortDirection}
- sorted-direction={sortDirection}
- sorted-by={sortedBy}
- onsort={onHandleSort}>
+ <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>
- </div> -->
- <template if:true={showTable}>
- <!-- <c-lwc-datatable-utility
- hidecheckboxcolumn = {hidecheckboxcolumn}
- records={data}
- total-records={data.length}
- columns = {columns}a
- key-field="Id"
- show-search-box="true"
- max-row-selection={data.length}
- onpaginatorchange={handlePaginatorChange}>
- </c-lwc-datatable-utility> -->
- <lightning-datatable
- key-field="id"
- data={data}
- columns={columns}
- hide-checkbox-column
- default-sort-direction={defaultSortDirection}
- sorted-direction={sortDirection}
- sorted-by={sortedBy}
- onsort={onHandleSort}>
- </lightning-datatable>
- </template>
-
-
- <!-- <c-my-custom-type-datatable
- key-field="Id"
- data={data}
- columns={columns}
- show-row-number-column>
- </c-my-custom-type-datatable> -->
- </div>
+ </div>
+ </template>
</div>
</div>
</div>
--
Gitblit v1.9.1