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/lexArriveGsDetails/lexArriveGsDetails.html | 148 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 118 insertions(+), 30 deletions(-)
diff --git a/force-app/main/default/lwc/lexArriveGsDetails/lexArriveGsDetails.html b/force-app/main/default/lwc/lexArriveGsDetails/lexArriveGsDetails.html
index 55e52c6..df18831 100644
--- a/force-app/main/default/lwc/lexArriveGsDetails/lexArriveGsDetails.html
+++ b/force-app/main/default/lwc/lexArriveGsDetails/lexArriveGsDetails.html
@@ -1,11 +1,27 @@
<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="border-bottom: 1px solid #D4D4D4;padding:3px;">
+ <div
+ style="
+ border: 1px solid #d4d4d4;
+ border-top: 3px solid #51606e;
+ border-radius: 5px;
+ "
+ >
+ <div style="border-bottom: 1px solid #d4d4d4; padding: 3px">
<lightning-layout>
<lightning-layout-item padding="around-small">
<p style="font-size: 18px">
@@ -15,14 +31,29 @@
</lightning-layout>
<!-- <p style="font-size: 16px;"><strong>鍒拌揣</strong></p> -->
</div>
- <div style="padding:10px;">
+ <div style="padding: 10px">
<!-- 鎸夐挳 -->
<!-- <lightning-button style="margin: 5px;" label="鍑哄簱" onclick={proSale} disabled={arrivetoorder}></lightning-button> -->
- <button class="slds-button slds-button_neutral slds-button_stretch lexBorder" style="margin: 5px;" label="鍑哄簱" onclick={proSale} disabled={arrivetoorder}>鍑哄簱</button>
- <p style="height: 10px;"></p>
+ <button
+ class="slds-button slds-button_neutral slds-button_stretch lexBorder"
+ style="margin: 5px"
+ label="鍑哄簱"
+ onclick={proSale}
+ disabled={arrivetoorder}
+ >
+ 鍑哄簱
+ </button>
+ <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">
@@ -32,34 +63,77 @@
</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:140px;">
- <div style="color:#696969;font-size:16px;">鍒拌揣璁㈠崟鍚嶇О</div>
+ <td style="width: 10px"></td>
+ <td style="width: 140px">
+ <div
+ style="
+ color: #696969;
+ font-size: 16px;
+ "
+ >
+ 鍒拌揣璁㈠崟鍚嶇О
+ </div>
</td>
- <td style="width:200px;">
- <lightning-formatted-text style="font-size: 16px;" value={coc.Name}></lightning-formatted-text>
+ <td style="width: 200px">
+ <lightning-formatted-text
+ style="font-size: 16px"
+ value={coc.Name}
+ ></lightning-formatted-text>
</td>
- <td style="width:30px;"></td>
- <td style="width:140px;">
- <div style="color:#696969;font-size:16px;">鏈鍏ュ簱浜у搧閲戦</div>
+ <td style="width: 30px"></td>
+ <td style="width: 140px">
+ <div
+ style="
+ color: #696969;
+ font-size: 16px;
+ "
+ >
+ 鏈鍏ュ簱浜у搧閲戦
+ </div>
</td>
- <td style="width:100px;">
- <lightning-formatted-number style="font-size: 16px;" value={coc.Arrive_total_amount__c} minimum-fraction-digits="2"></lightning-formatted-number>
+ <td style="width: 100px">
+ <lightning-formatted-number
+ style="font-size: 16px"
+ value={coc.Arrive_total_amount__c}
+ minimum-fraction-digits="2"
+ ></lightning-formatted-number>
</td>
<td></td>
</tr>
- <tr style="height: 20px;"></tr>
+ <tr style="height: 20px"></tr>
<tr>
- <td style="width:10px;"></td>
- <td style="width:120px;">
- <div style="color:#696969;font-size:16px;">娑堣�楀搧璁㈠崟鍚嶇О<lightning-helptext style="--lwc-spacingXxSmall:0px;" content={label.helpText}></lightning-helptext></div>
+ <td style="width: 10px"></td>
+ <td style="width: 120px">
+ <div
+ style="
+ color: #696969;
+ font-size: 16px;
+ "
+ >
+ 娑堣�楀搧璁㈠崟鍚嶇О<lightning-helptext
+ style="
+ --lwc-spacingXxSmall: 0px;
+ "
+ content={label.helpText}
+ ></lightning-helptext>
+ </div>
</td>
- <td style="width:200px;">
- <lightning-formatted-text style="font-size: 16px;" value={coc.arriveOrder}></lightning-formatted-text>
+ <td style="width: 200px">
+ <a
+ style="
+ text-decoration: underline;
+ color: black;
+ "
+ onclick={clickOrder}
+ ><lightning-formatted-text
+ style="font-size: 16px"
+ value={coc.arriveOrder}
+ ></lightning-formatted-text
+ ></a>
<!-- <lightning-formatted-text value={coc.Arrive_Order__r.Name}></lightning-formatted-text> -->
</td>
<td></td>
@@ -69,8 +143,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">
@@ -80,11 +161,18 @@
</lightning-layout>
<!-- <p style="font-size: 16px;"><strong>鍦ㄥ簱鍟嗗搧搴撳瓨涓�瑙�</strong></p> -->
</div>
- <div style="padding:10px;">
- <lightning-datatable class="wrapped-header-datatable" hide-checkbox-column key-field="recordId" columns={colms} data={consumableorderdetailsRecords}></lightning-datatable>
+ <div style="padding: 10px">
+ <lightning-datatable
+ class="wrapped-header-datatable"
+ style="word-wrap: break-word; word-break: break-all"
+ hide-checkbox-column
+ key-field="recordId"
+ columns={colms}
+ data={consumableorderdetailsRecords}
+ ></lightning-datatable>
</div>
</div>
</div>
</div>
</template>
-</template>
\ No newline at end of file
+</template>
--
Gitblit v1.9.1