From 36d15f189de2e83ce2576715dac30c3c260388dd Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:47:50 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/lwc/lexConsumableOrderManage/lexConsumableOrderManage.html | 182 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 148 insertions(+), 34 deletions(-)
diff --git a/force-app/main/default/lwc/lexConsumableOrderManage/lexConsumableOrderManage.html b/force-app/main/default/lwc/lexConsumableOrderManage/lexConsumableOrderManage.html
index 7e0cb72..f04a522 100644
--- a/force-app/main/default/lwc/lexConsumableOrderManage/lexConsumableOrderManage.html
+++ b/force-app/main/default/lwc/lexConsumableOrderManage/lexConsumableOrderManage.html
@@ -1,26 +1,66 @@
<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}>
- <div style="border: 1px solid #D4D4D4;border-top: 3px solid #51606E;border-radius:5px;">
- <div style="padding:10px;">
+ <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> -->
- <button class="slds-button slds-button_neutral slds-button_stretch lexBorder" style="margin-right: 150px;" onclick={agreementorder}>鍗忚璁㈣揣</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> -->
- <button class="slds-button slds-button_neutral slds-button_stretch lexBorder" style="margin-right: 150px;" onclick={hospitalorder}>鍖婚櫌鐗逛环</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> -->
- <button class="slds-button slds-button_neutral slds-button_stretch lexBorder" onclick={promotionorder}>淇冮攢璁㈣揣</button>
+ <button
+ class="slds-button slds-button_neutral slds-button_stretch lexBorder"
+ onclick={promotionorder}
+ >
+ 淇冮攢璁㈣揣
+ </button>
</template>
- <p style="height: 10px;"></p>
+ <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;">
+ <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">
@@ -30,42 +70,103 @@
</lightning-layout>
<!-- <p style="font-size: 16px;"><strong>妫�绱㈡潯浠�</strong></p> -->
</div>
- <div style="padding:10px;">
+ <div style="padding: 10px">
<table>
<tbody>
<tr>
- <td style="width:10px;"></td>
- <td style="width:122px;">
- <div style="color:#696969;font-size:16px;">娑堣�楀搧璁㈠崟鍚嶇О</div>
+ <td style="width: 10px"></td>
+ <td style="width: 122px">
+ <div
+ style="
+ color: #696969;
+ font-size: 16px;
+ "
+ >
+ 娑堣�楀搧璁㈠崟鍚嶇О
+ </div>
</td>
- <td >
- <lightning-input class="inputFont" type="text" label="娑堣�楀搧璁㈠崟鍚嶇О" value={category1} variant="label-hidden" onchange={category1Change}></lightning-input>
+ <td>
+ <lightning-input
+ class="inputFont"
+ type="text"
+ label="娑堣�楀搧璁㈠崟鍚嶇О"
+ value={category1}
+ variant="label-hidden"
+ onchange={category1Change}
+ ></lightning-input>
</td>
- <td style="width:30px;"></td>
- <td style="width: 74px;">
- <div style="color:#696969;font-size:16px;">璁㈠崟鏃ユ湡</div>
+ <td style="width: 30px"></td>
+ <td style="width: 74px">
+ <div
+ style="
+ color: #696969;
+ font-size: 16px;
+ "
+ >
+ 璁㈠崟鏃ユ湡
+ </div>
</td>
- <td >
- <lightning-input class="inputFont" type="date" name="orderDate" value={orderDate} label="璁㈠崟鏃ユ湡" variant="label-hidden" onchange={orderDateChange}></lightning-input>
+ <td>
+ <lightning-input
+ class="inputFont"
+ type="date"
+ name="orderDate"
+ value={orderDate}
+ label="璁㈠崟鏃ユ湡"
+ variant="label-hidden"
+ onchange={orderDateChange}
+ ></lightning-input>
</td>
- <td style="width:30px;"></td>
- <td style="width: 74px;">
- <div style="color:#696969;font-size:16px;">璁㈠崟鐘舵��</div>
+ <td style="width: 30px"></td>
+ <td style="width: 74px">
+ <div
+ style="
+ color: #696969;
+ font-size: 16px;
+ "
+ >
+ 璁㈠崟鐘舵��
+ </div>
</td>
- <td style="width: 250px;">
- <lightning-combobox class="inputFont" name="orderStatus" label="璁㈠崟鐘舵��" value={orderStatus} placeholder="璇烽�夋嫨..." options={provinceOpts} variant="label-hidden" onchange={orderStatusChange}></lightning-combobox>
+ <td style="width: 250px">
+ <lightning-combobox
+ class="inputFont"
+ name="orderStatus"
+ label="璁㈠崟鐘舵��"
+ value={orderStatus}
+ placeholder="璇烽�夋嫨..."
+ options={provinceOpts}
+ variant="label-hidden"
+ onchange={orderStatusChange}
+ ></lightning-combobox>
</td>
</tr>
</tbody>
</table>
- <p style="height:10px;"></p>
+ <p style="height: 10px"></p>
<table>
<tbody>
<tr>
<td></td>
- <td style="width:325px;">
- <button class="slds-button slds-button_neutral slds-button_stretch lexsearchStyle" style="margin-right: 20px;height:32px;width: 150px;" onclick={searchProduct}>鎼滅储</button>
- <button class="slds-button slds-button_neutral slds-button_stretch lexclearStyle" style="height:32px;width: 150px;" onclick={clear}>娓呯┖</button>
+ <td style="width: 325px">
+ <button
+ class="slds-button slds-button_neutral slds-button_stretch lexsearchStyle"
+ style="
+ margin-right: 20px;
+ height: 32px;
+ width: 150px;
+ "
+ onclick={searchProduct}
+ >
+ 鎼滅储
+ </button>
+ <button
+ class="slds-button slds-button_neutral slds-button_stretch lexclearStyle"
+ style="height: 32px; width: 150px"
+ onclick={clear}
+ >
+ 娓呯┖
+ </button>
</td>
</tr>
</tbody>
@@ -73,8 +174,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">
@@ -84,13 +192,19 @@
</lightning-layout>
<!-- <p style="font-size: 16px;"><strong>璁㈣揣鏄庣粏</strong></p> -->
</div>
- <div style="padding:10px;">
+ <div style="padding: 10px">
<div class="table-container">
- <lightning-datatable class="wrapped-header-datatable" key-field="id" hide-checkbox-column="true" data={raesList} columns={cols}></lightning-datatable>
+ <lightning-datatable
+ class="wrapped-header-datatable"
+ key-field="id"
+ hide-checkbox-column="true"
+ data={raesList}
+ columns={cols}
+ ></lightning-datatable>
</div>
</div>
</div>
</div>
</div>
</template>
-</template>
\ No newline at end of file
+</template>
--
Gitblit v1.9.1