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/lexInventory/lexInventory.html | 313 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 242 insertions(+), 71 deletions(-)
diff --git a/force-app/main/default/lwc/lexInventory/lexInventory.html b/force-app/main/default/lwc/lexInventory/lexInventory.html
index 356372e..c90c293 100644
--- a/force-app/main/default/lwc/lexInventory/lexInventory.html
+++ b/force-app/main/default/lwc/lexInventory/lexInventory.html
@@ -1,23 +1,59 @@
<template>
<template if:true={showSpinner}>
- <lightning-spinner size="medium" variant="brand"></lightning-spinner>
+ <!-- <lightning-spinner class="spinner-container" 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={showcount}>
- <div style="border: 1px solid #D4D4D4;border-radius:5px;">
- <div style="border-top: 3px solid #51606E;;border-bottom: 1px solid #D4D4D4;padding:3px;">
- <div style="margin:12px;">
- <p style="font-size: 18px;float:left"><strong>搴撳瓨鐩樼偣</strong></p>
+ <div style="border: 1px solid #d4d4d4; border-radius: 5px">
+ <div
+ style="
+ border-top: 3px solid #51606e;
+ border-bottom: 1px solid #d4d4d4;
+ padding: 3px;
+ "
+ >
+ <div style="margin: 12px">
+ <p style="font-size: 18px; float: left">
+ <strong>搴撳瓨鐩樼偣</strong>
+ </p>
</div>
- <div style="margin-left:400px;margin-bottom:12px;">
+ <div style="margin-left: 400px; margin-bottom: 12px">
<!-- <lightning-button class = 'lexstyle' label="鐩樼偣纭" title="鐩樼偣纭" onclick={saveConfirm}></lightning-button> -->
- <button class="slds-button slds-button_neutral slds-button_stretch lexBorder" label="鐩樼偣纭" onclick={saveConfirm}>鐩樼偣纭</button>
+ <button
+ class="slds-button slds-button_neutral slds-button_stretch lexBorder"
+ label="鐩樼偣纭"
+ onclick={saveConfirm}
+ >
+ 鐩樼偣纭
+ </button>
</div>
</div>
- <div style="padding:10px;">
- <div style="border: 1px solid #D4D4D4;border-radius:5px;margin-bottom:7px;">
- <div style="border-top: 3px solid #51606E;border-bottom: 1px solid #D4D4D4;padding:3px;">
+ <div style="padding: 10px">
+ <div
+ style="
+ border: 1px solid #d4d4d4;
+ border-radius: 5px;
+ margin-bottom: 7px;
+ "
+ >
+ <div
+ style="
+ border-top: 3px solid #51606e;
+ border-bottom: 1px solid #d4d4d4;
+ padding: 3px;
+ "
+ >
<table>
<colgroup>
<col width="160px" />
@@ -38,13 +74,28 @@
<tbody>
<tr>
<td></td>
- <td align="right" class="searchName">BarCode</td>
- <td style="width:600px"><lightning-textarea class="inputFont" name="BarCode" label=""
- onchange={handleChange}></lightning-textarea></td>
+ <td align="right" class="searchName">
+ BarCode
+ </td>
+ <td style="width: 600px">
+ <lightning-textarea
+ class="inputFont"
+ name="BarCode"
+ label=""
+ onchange={handleChange}
+ ></lightning-textarea>
+ </td>
<td align="right"></td>
<td></td>
- <td style="width:200px">
- <button style="margin-top:14px;" class="slds-button slds-button_neutral slds-button_stretch lexBorder" label="鑾峰彇鏄庣粏" onclick={barcodeEntrys}>鑾峰彇鏄庣粏</button>
+ <td style="width: 200px">
+ <button
+ style="margin-top: 14px"
+ class="slds-button slds-button_neutral slds-button_stretch lexBorder"
+ label="鑾峰彇鏄庣粏"
+ onclick={barcodeEntrys}
+ >
+ 鑾峰彇鏄庣粏
+ </button>
<!-- <lightning-button class = 'lexstyle' label="BarCode褰曞叆" title="BarCode褰曞叆"
onclick={barcodeEntrys} style="width: 300px;"></lightning-button> -->
</td>
@@ -54,8 +105,20 @@
</div>
</div>
- <div style="border: 1px solid #D4D4D4;border-radius:5px;margin-bottom:7px;">
- <div style="border-top: 3px solid #51606E;border-bottom: 1px solid #D4D4D4;padding:3px;">
+ <div
+ style="
+ border: 1px solid #d4d4d4;
+ border-radius: 5px;
+ margin-bottom: 7px;
+ "
+ >
+ <div
+ style="
+ border-top: 3px solid #51606e;
+ border-bottom: 1px solid #d4d4d4;
+ padding: 3px;
+ "
+ >
<!-- <p style="font-size: 16px;"><strong>鍦ㄥ簱鍟嗗搧搴撳瓨涓�瑙�</strong></p> -->
<lightning-layout>
<lightning-layout-item padding="around-small">
@@ -65,122 +128,230 @@
</lightning-layout-item>
</lightning-layout>
</div>
- <div style="padding:10px;">
-
- <div style="height: 300px;">
+ <div style="padding: 10px">
+ <div style="height: 300px">
<template if:true={showTable}>
- <c-lex-custom-lightning-datatable key-field="key" data={data} columns={columns}
- ondiffreasons={diffreasons} onrowselection={getSelectedRows}
- selected-rows={selectedRows} class="wrapped-header-datatable">
+ <c-lex-custom-lightning-datatable
+ key-field="key"
+ data={data}
+ columns={columns}
+ ondiffreasons={diffreasons}
+ onrowselection={getSelectedRows}
+ selected-rows={selectedRows}
+ class="wrapped-header-datatable"
+ >
</c-lex-custom-lightning-datatable>
</template>
-
-
</div>
-
</div>
</div>
- <div style="border: 1px solid #D4D4D4;border-radius:5px;margin-bottom:7px;">
- <div style="border-top: 3px solid #51606E;border-bottom: 1px solid #D4D4D4;padding:3px;">
+ <div
+ style="
+ border: 1px solid #d4d4d4;
+ border-radius: 5px;
+ margin-bottom: 7px;
+ "
+ >
+ <div
+ style="
+ border-top: 3px solid #51606e;
+ border-bottom: 1px solid #d4d4d4;
+ padding: 3px;
+ "
+ >
<table>
<tr>
<td>
<!-- <p style="font-size: 16px;"><strong>璋冩暣鏄庣粏</strong></p> -->
<lightning-layout>
- <lightning-layout-item padding="around-small">
+ <lightning-layout-item
+ padding="around-small"
+ >
<p style="font-size: 18px">
<strong>璋冩暣鏄庣粏</strong>
</p>
</lightning-layout-item>
</lightning-layout>
-
</td>
<template if:true={showbutton}>
- <td align="center">
+ <td align="center">
<!-- <lightning-button variant="brand" class='count' label="涓嬭浇鏈鐩樼偣搴撳瓨鍙樺寲鏄庣粏" title="涓嬭浇鏈鐩樼偣搴撳瓨鍙樺寲鏄庣粏"
onclick={exportData} style="width: 150px;"></lightning-button> -->
- <button class="slds-button slds-button_neutral slds-button_stretch changeDetail" label="涓嬭浇鏈鐩樼偣搴撳瓨鍙樺寲鏄庣粏" onclick={exportData}>涓嬭浇鏈鐩樼偣搴撳瓨鍙樺寲鏄庣粏</button>
- </td>
+ <button
+ class="slds-button slds-button_neutral slds-button_stretch changeDetail"
+ label="涓嬭浇鏈鐩樼偣搴撳瓨鍙樺寲鏄庣粏"
+ onclick={exportData}
+ >
+ 涓嬭浇鏈鐩樼偣搴撳瓨鍙樺寲鏄庣粏
+ </button>
+ </td>
</template>
</tr>
</table>
</div>
<!-- <template if:true={showTable}> -->
- <div style="padding:10px;">
- <lightning-datatable key-field="id" data={pageCodeRecords} columns={column}
- hide-checkbox-column={hidecheckbox} class="wrapped-header-datatable" style="word-wrap:break-word; word-break:break-all; ">
+ <div style="padding: 10px">
+ <lightning-datatable
+ key-field="id"
+ data={pageCodeRecords}
+ columns={column}
+ hide-checkbox-column={hidecheckbox}
+ class="wrapped-header-datatable"
+ style="word-wrap: break-word; word-break: break-all"
+ >
</lightning-datatable>
+<<<<<<< HEAD
+ <c-paginator
+ onprevious={handlePrevious}
+ onnext={handleNext}
+ onpageschange={handlePageschange}
+ onfirst={handleFirst}
+ onlast={handleLast}
+ page-size-options={pageSizeOptions}
+ previous-button-disabled={previousButtonDisabled}
+ next-button-disabled={nextButtonDisabled}
+ record-start={recordStart}
+ record-end={recordEnd}
+ total-records={totalRecords}
+ ></c-paginator>
+=======
<c-paginator onprevious={handlePrevious} onnext={handleNext} onpageschange={handlePageschange}
- onfirst={handleFirst} onlast={handleLast} page-size-options={pageSizeOptions}
+ onfirst={handleFirst} onlast={handleLast} page-size-options={pageSizeOptions} default-page-size={pageSize}
previous-button-disabled={previousButtonDisabled} next-button-disabled={nextButtonDisabled}
record-start={recordStart} record-end={recordEnd}
total-records={totalRecords}></c-paginator>
+>>>>>>> LEXCommunityLiJun
</div>
<!-- </template> -->
</div>
</div>
-
-
</div>
</template>
-
<template if:true={EditAble}>
- <div style="border: 1px solid #D4D4D4;border-radius:5px;">
- <div style="border-top: 3px solid #51606E;;border-bottom: 1px solid #D4D4D4;padding:3px;">
- <div style="border: 1px solid #D4D4D4;border-radius:5px;">
- <div style="border-top: 3px solid #51606E;;border-bottom: 1px solid #D4D4D4;padding:6px;">
- <p style="font-size: 19px;"><strong>鐩樼偣鎯呭喌涓�瑙�</strong></p>
+ <div style="border: 1px solid #d4d4d4; border-radius: 5px">
+ <div
+ style="
+ border-top: 3px solid #51606e;
+ border-bottom: 1px solid #d4d4d4;
+ padding: 3px;
+ "
+ >
+ <div style="border: 1px solid #d4d4d4; border-radius: 5px">
+ <div
+ style="
+ border-top: 3px solid #51606e;
+ border-bottom: 1px solid #d4d4d4;
+ padding: 6px;
+ "
+ >
+ <p style="font-size: 19px">
+ <strong>鐩樼偣鎯呭喌涓�瑙�</strong>
+ </p>
</div>
<div class="acc-container">
- <lightning-record-edit-form object-api-name="Consumable_order__c" record-id={conId}
- onload={handleLoad2} class="hideHelpText">
- <div class="slds-modal__content slds-p-around_medium" id="modal-content-id-1">
+ <lightning-record-edit-form
+ object-api-name="Consumable_order__c"
+ record-id={conId}
+ onload={handleLoad2}
+ class="hideHelpText"
+ >
+ <div
+ class="slds-modal__content slds-p-around_medium"
+ id="modal-content-id-1"
+ >
<div class="slds-grid">
<div class="slds-col slds-size_1-of-2">
- <lightning-output-field field-name="Name"
- class="hehe-layoutItem" style="padding-left:20px;"></lightning-output-field>
+ <lightning-output-field
+ field-name="Name"
+ class="hehe-layoutItem"
+ style="padding-left: 20px"
+ ></lightning-output-field>
</div>
<div class="slds-col slds-size_1-of-2">
- <lightning-output-field field-name="Inventory_date__c"
- class="hehe-layoutItem"></lightning-output-field>
+ <lightning-output-field
+ field-name="Inventory_date__c"
+ class="hehe-layoutItem"
+ ></lightning-output-field>
</div>
</div>
</div>
</lightning-record-edit-form>
</div>
</div>
- <div style="border: 1px solid #D4D4D4;border-radius:5px;margin-top:10px">
- <div style="border-top: 3px solid #51606E;;border-bottom: 1px solid #D4D4D4;padding:6px;">
- <lightning-accordion allow-multiple-sections-open class="slds-m-around_medium"
- active-section-name={activeSections}>
- <lightning-accordion-section name="dataExpand" label="鐩樼偣鏄庣粏" class="accordionClass">
- <lightning-datatable key-field="id" data={detailData} columns={dcolumns}
+ <div
+ style="
+ border: 1px solid #d4d4d4;
+ border-radius: 5px;
+ margin-top: 10px;
+ "
+ >
+ <div
+ style="
+ border-top: 3px solid #51606e;
+ border-bottom: 1px solid #d4d4d4;
+ padding: 6px;
+ "
+ >
+ <lightning-accordion
+ allow-multiple-sections-open
+ class="slds-m-around_medium"
+ active-section-name={activeSections}
+ >
+ <lightning-accordion-section
+ name="dataExpand"
+ label="鐩樼偣鏄庣粏"
+ class="accordionClass"
+ >
+ <lightning-datatable
+ key-field="id"
+ data={detailData}
+ columns={dcolumns}
hide-checkbox-column={hidecheckbox}
- class="wrapped-header-datatable accordionClass2">
+ class="wrapped-header-datatable accordionClass2"
+ >
</lightning-datatable>
</lightning-accordion-section>
</lightning-accordion>
-
-
</div>
</div>
- <div style="border: 1px solid #D4D4D4;border-radius:5px;margin-top:10px">
- <div style="border-top: 3px solid #51606E;;border-bottom: 1px solid #D4D4D4;padding:6px;">
- <lightning-accordion allow-multiple-sections-open class="slds-m-around_medium"
- active-section-name={activeSections}>
- <lightning-accordion-section name="dataExpand" label="鍦ㄥ簱璋冩暣鏄庣粏" class="accordionClass">
- <lightning-datatable key-field="id" data={adjustdata} columns={stockadjustcolumns}
+ <div
+ style="
+ border: 1px solid #d4d4d4;
+ border-radius: 5px;
+ margin-top: 10px;
+ "
+ >
+ <div
+ style="
+ border-top: 3px solid #51606e;
+ border-bottom: 1px solid #d4d4d4;
+ padding: 6px;
+ "
+ >
+ <lightning-accordion
+ allow-multiple-sections-open
+ class="slds-m-around_medium"
+ active-section-name={activeSections}
+ >
+ <lightning-accordion-section
+ name="dataExpand"
+ label="鍦ㄥ簱璋冩暣鏄庣粏"
+ class="accordionClass"
+ >
+ <lightning-datatable
+ key-field="id"
+ data={adjustdata}
+ columns={stockadjustcolumns}
hide-checkbox-column={hidecheckbox}
- class="wrapped-header-datatable accordionClass2">
+ class="wrapped-header-datatable accordionClass2"
+ >
</lightning-datatable>
</lightning-accordion-section>
</lightning-accordion>
-
</div>
</div>
</div>
</div>
-
</template>
-</template>
\ No newline at end of file
+</template>
--
Gitblit v1.9.1