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/lexConsumableOrderManage/lexConsumableOrderManage.html | 69 +++++++++++++++++++++++----------- 1 files changed, 47 insertions(+), 22 deletions(-) diff --git a/force-app/main/default/lwc/lexConsumableOrderManage/lexConsumableOrderManage.html b/force-app/main/default/lwc/lexConsumableOrderManage/lexConsumableOrderManage.html index 028a891..2f7e121 100644 --- a/force-app/main/default/lwc/lexConsumableOrderManage/lexConsumableOrderManage.html +++ b/force-app/main/default/lwc/lexConsumableOrderManage/lexConsumableOrderManage.html @@ -2,49 +2,65 @@ <template if:true={showSpinner}> <lightning-spinner size="medium" variant="brand"></lightning-spinner> </template> + <c-common-toast></c-common-toast> <template if:true={showPage}> <div style="border: 1px solid #D4D4D4;border-top: 3px solid #51606E;border-radius:5px;"> <div style="padding:10px;"> <!-- 鎸夐挳 --> - <lightning-button style="margin: 5px;" label="鍗忚璁㈣揣" onclick={agreementorder}></lightning-button> + <!-- <lightning-button style="margin: 5px;" label="鍗忚璁㈣揣" onclick={agreementorder}></lightning-button> --> + <button class="slds-button slds-button_neutral slds-button_stretch lexBorder" style="margin-right: 150px;" onclick={agreementorder}>鍗忚璁㈣揣</button> <template if:true={showHop}> - <lightning-button style="margin: 5px;" label="鍖婚櫌鐗逛环" onclick={hospitalorder}></lightning-button> + <!-- <lightning-button style="margin: 5px;" label="鍖婚櫌鐗逛环" onclick={hospitalorder}></lightning-button> --> + <button class="slds-button slds-button_neutral slds-button_stretch lexBorder" style="margin-right: 150px;" onclick={hospitalorder}>鍖婚櫌鐗逛环</button> </template> <template if:true={hasSpecial}> - <lightning-button style="margin: 5px;" label="淇冮攢璁㈣揣" onclick={promotionorder}></lightning-button> + <!-- <lightning-button style="margin: 5px;" label="淇冮攢璁㈣揣" onclick={promotionorder}></lightning-button> --> + <button class="slds-button slds-button_neutral slds-button_stretch lexBorder" onclick={promotionorder}>淇冮攢璁㈣揣</button> </template> <p style="height: 10px;"></p> <!-- 鎼滅储 --> <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;"> - <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> + <!-- <p style="font-size: 16px;"><strong>妫�绱㈡潯浠�</strong></p> --> </div> <div style="padding:10px;"> <table> <tbody> <tr> - <td style="width: 9%;text-align: right;padding-right:7px;"> - <div style="color:#696969;font-size:12px;">娑堣�楀搧璁㈠崟鍚嶇О</div> + <td style="width:10px;"></td> + <td style="width:122px;"> + <div style="color:#696969;font-size:16px;">娑堣�楀搧璁㈠崟鍚嶇О</div> </td> - <td style="width: 22%;"> - <lightning-input type="text" label="娑堣�楀搧璁㈠崟鍚嶇О" value={category1} variant="label-hidden" onchange={category1Change}></lightning-input> + <td style="width: 200px;"> + <lightning-input class="inputFont" type="text" label="娑堣�楀搧璁㈠崟鍚嶇О" value={category1} variant="label-hidden" onchange={category1Change}></lightning-input> </td> - <td style="width: 8%;text-align: right;padding-right:7px;"> - <div style="color:#696969;font-size:12px;">璁㈠崟鏃ユ湡</div> + <td style="width:30px;"></td> + <td style="width: 74px;"> + <div style="color:#696969;font-size:16px;">璁㈠崟鏃ユ湡</div> </td> - <td style="width: 19%;"> - <lightning-input type="date" name="orderDate" value={orderDate} label="璁㈠崟鏃ユ湡" variant="label-hidden" onchange={orderDateChange}></lightning-input> + <td style="width: 200px;"> + <lightning-input class="inputFont" type="date" name="orderDate" value={orderDate} label="璁㈠崟鏃ユ湡" variant="label-hidden" onchange={orderDateChange}></lightning-input> </td> - <td style="width: 8%;text-align: right;padding-right:7px;"> - <div style="color:#696969;font-size:12px;">璁㈠崟鐘舵��</div> + <td style="width:30px;"></td> + <td style="width: 74px;"> + <div style="color:#696969;font-size:16px;">璁㈠崟鐘舵��</div> </td> - <td style="width: 19%;"> - <lightning-combobox name="orderStatus" label="璁㈠崟鐘舵��" value={orderStatus} placeholder="璇烽�夋嫨..." options={provinceOpts} variant="label-hidden" onchange={orderStatusChange}></lightning-combobox> + <td style="width: 200px;"> + <lightning-combobox class="inputFont" name="orderStatus" label="璁㈠崟鐘舵��" value={orderStatus} placeholder="璇烽�夋嫨..." options={provinceOpts} variant="label-hidden" onchange={orderStatusChange}></lightning-combobox> </td> - <td style="width: 2%;"></td> - <td style="width: 14%;"> - <lightning-button style="margin: 5px;" label="鎼滅储" onclick={searchProduct}></lightning-button> - <lightning-button style="margin: 5px;" label="娓呯┖" onclick={clear}></lightning-button> + <td style="width: 30px;"></td> + <td style="width: 400;"> + <!-- <lightning-button style="margin: 5px;" label="鎼滅储" onclick={searchProduct}></lightning-button> + <lightning-button style="margin: 5px;" label="娓呯┖" onclick={clear}></lightning-button> --> + <button class="slds-button slds-button_neutral slds-button_stretch lexsearchStyle" style="margin-right: 30px;height:32px;" onclick={searchProduct}>鎼滅储</button> + <button class="slds-button slds-button_neutral slds-button_stretch lexclearStyle" style="height:32px;" onclick={clear}>娓呯┖</button> </td> </tr> </tbody> @@ -54,10 +70,19 @@ <!-- 璁㈣揣鏄庣粏 --> <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;"> - <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> + <!-- <p style="font-size: 16px;"><strong>璁㈣揣鏄庣粏</strong></p> --> </div> <div style="padding:10px;"> - <lightning-datatable key-field="id" hide-checkbox-column="true" data={raesList} columns={cols}></lightning-datatable> + <div class="table-container"> + <lightning-datatable class="wrapped-header-datatable" key-field="id" hide-checkbox-column="true" data={raesList} columns={cols}></lightning-datatable> + </div> </div> </div> </div> -- Gitblit v1.9.1