From 07390e2fcb4adf27c928335bf27ae7939c5a80ad Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期二, 23 五月 2023 11:28:12 +0800
Subject: [PATCH] bakcup20230523
---
force-app/main/default/lwc/lexArriveGoods/lexArriveGoods.html | 104 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 81 insertions(+), 23 deletions(-)
diff --git a/force-app/main/default/lwc/lexArriveGoods/lexArriveGoods.html b/force-app/main/default/lwc/lexArriveGoods/lexArriveGoods.html
index 107063b..cfc9efe 100644
--- a/force-app/main/default/lwc/lexArriveGoods/lexArriveGoods.html
+++ b/force-app/main/default/lwc/lexArriveGoods/lexArriveGoods.html
@@ -2,25 +2,42 @@
<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="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;">
<!-- 鎸夐挳 -->
<template if:false={returnFLGbln}>
- <lightning-button style="margin: 5px;" label="鍒拌揣纭" onclick={arriveGoodsConfim} disabled={saveFLGbln}></lightning-button>
+ <!-- <lightning-button style="margin: 5px;" label="鍒拌揣纭" onclick={arriveGoodsConfim} disabled={saveFLGbln}></lightning-button> -->
+ <button class="slds-button slds-button_neutral slds-button_stretch lexBorder" style="margin: 5px;" label="鍒拌揣纭" onclick={arriveGoodsConfim} disabled={saveFLGbln}>鍒拌揣纭</button>
</template>
<template if:true={returnFLGbln}>
- <lightning-button style="margin: 5px;" label="鐧诲綍杩斿搧" onclick={updateGoodsOfReturn}></lightning-button>
+ <!-- <lightning-button style="margin: 5px;" label="鐧诲綍杩斿搧" onclick={updateGoodsOfReturn}></lightning-button> -->
+ <button class="slds-button slds-button_neutral slds-button_stretch lexBorder" style="margin: 5px;" label="鐧诲綍杩斿搧" onclick={updateGoodsOfReturn}>鐧诲綍杩斿搧</button>
</template>
<p style="height: 10px;"></p>
<!-- 璁㈠崟淇℃伅 -->
<template if:true={showOrderDetail}>
<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>
@@ -64,20 +81,29 @@
<!-- BarCode褰曞叆 -->
<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>BarCode褰曞叆</strong></p>
+ <lightning-layout>
+ <lightning-layout-item padding="around-small">
+ <p style="font-size: 18px">
+ <strong>BarCode褰曞叆</strong>
+ </p>
+ </lightning-layout-item>
+ </lightning-layout>
+ <!-- <p style="font-size: 16px;"><strong>BarCode褰曞叆</strong></p> -->
</div>
<div style="padding:10px;">
<table>
<tbody>
<tr>
<td style="width:20px;"></td>
- <td style="width:60px;">BarCode</td>
+ <td style="width:60px;font-size:16px;">BarCode</td>
+ <td style="width:30px;"></td>
<td style="width:600px;">
- <lightning-textarea name="BarCode" value={barcode} label="" variant="label-hiden" onchange={barcodeChange}></lightning-textarea>
+ <lightning-textarea class="inputFont" name="BarCode" value={barcode} label="" variant="label-hidden" onchange={barcodeChange}></lightning-textarea>
</td>
- <td style="width:20px;"></td>
+ <td style="width:30px;"></td>
<td style="width:200px;">
- <lightning-button label="鑾峰彇鏄庣粏" title="鑾峰彇鏄庣粏" onclick={barcodeEntrys} style="width: 300px;"></lightning-button>
+ <!-- <lightning-button label="鑾峰彇鏄庣粏" title="鑾峰彇鏄庣粏" onclick={barcodeEntrys} style="width: 300px;"></lightning-button> -->
+ <button class="slds-button slds-button_neutral slds-button_stretch lexBorder" label="鑾峰彇鏄庣粏" onclick={barcodeEntrys}>鑾峰彇鏄庣粏</button>
</td>
<td></td>
</tr>
@@ -89,7 +115,7 @@
<template if:true={hasWarning}>
<div style="border: 1px solid #D4D4D4;border-radius:5px;margin-bottom:7px;">
<div style="border-bottom: 1px solid #D4D4D4;border-radius:5px;margin-bottom:7px;color:#ff6a00;font-size:17px;">
- <lightning-button-icon icon-name="utility:warning"></lightning-button-icon>
+ <lightning-icon icon-name="utility:warning"></lightning-icon>
<strong> 璀﹀憡</strong>
</div>
<template for:each={warningMsgs} for:item="msg">
@@ -101,7 +127,7 @@
<template if:true={hasError}>
<div style="border: 1px solid #D4D4D4;border-radius:5px;margin-bottom:7px;">
<div style="border-bottom: 1px solid #D4D4D4;border-radius:5px;margin-bottom:7px;color:red;font-size:17px;">
- <lightning-button-icon icon-name="utility:error"></lightning-button-icon>
+ <lightning-icon icon-name="utility:error"></lightning-icon>
<strong> 閿欒</strong>
</div>
<template for:each={errorMsgs} for:item="msg">
@@ -113,10 +139,17 @@
<template if:false={returnFLGbln}>
<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 hide-checkbox-column key-field="recordId" columns={currentArrProdCols} data={detailsSummary}></lightning-datatable>
+ <lightning-datatable class="wrapped-header-datatable" hide-checkbox-column key-field="recordId" columns={currentArrProdCols} data={detailsSummary}></lightning-datatable>
</div>
</div>
</template>
@@ -124,10 +157,16 @@
<template if:false={returnFLGbln}>
<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>
</div>
<div style="padding:10px;">
- <lightning-datatable hide-checkbox-column key-field="recordId" columns={arrDetailCols} data={consumableorderdetailsRecords}></lightning-datatable>
+ <lightning-datatable class="wrapped-header-datatable" hide-checkbox-column key-field="recordId" columns={arrDetailCols} data={consumableorderdetailsRecordsview}></lightning-datatable>
</div>
</div>
</template>
@@ -135,29 +174,48 @@
<template if:true={returnFLGbln}>
<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>
</div>
<div style="padding:10px;">
- <c-lex-custom-lightning-datatable hide-checkbox-column key-field="recordId" data={showGoodsofReturnList} columns={returnDetailCols} onchangereturncount={returnCountChange} onchangevalue={returnReasonChange}></c-lex-custom-lightning-datatable>
+ <c-lex-custom-lightning-datatable class="wrapped-header-datatable" hide-checkbox-column key-field="recordId" data={showGoodsofReturnListView} columns={returnDetailCols} onchangereturncount={returnCountChange} onchangevalue={returnReasonChange}></c-lex-custom-lightning-datatable>
</div>
</div>
</template>
<!-- 鍏ュ簱鏄庣粏 -->
- <div style="border: 1px solid #D4D4D4;border-top: 3px solid #51606E;border-radius:5px;margin-bottom:7px;">
+ <!-- <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: 16px">
+ <strong>鍏ュ簱鏄庣粏</strong>
+ </p>
+ </lightning-layout-item>
+ </lightning-layout>
</div>
<div style="padding:10px;">
- <lightning-datatable hide-checkbox-column key-field="recordId" columns={inDetailCols} data={consumableInventory}></lightning-datatable>
+ <lightning-datatable class="wrapped-header-datatable" hide-checkbox-column key-field="recordId" columns={inDetailCols} data={consumableInventory}></lightning-datatable>
</div>
- </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;">
- <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 hide-checkbox-column key-field="recordId" columns={errorDetailCols} data={consumableorderdetailsRecordserror}></lightning-datatable>
+ <lightning-datatable class="wrapped-header-datatable" hide-checkbox-column key-field="recordId" columns={errorDetailCols} data={consumableorderdetailsRecordserror}></lightning-datatable>
</div>
</div>
</div>
--
Gitblit v1.9.1