From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte
---
force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.html | 947 -----------------------------------------------------------
1 files changed, 2 insertions(+), 945 deletions(-)
diff --git a/force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.html b/force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.html
index 5a34891..5a8517f 100644
--- a/force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.html
+++ b/force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.html
@@ -4,7 +4,6 @@
<c-common-toast></c-common-toast>
<template if:true={isShowSpinner}>
<div class="slds-spinner_container">
-<<<<<<< HEAD
聽 聽 聽 聽 聽 聽
<div
role="status"
@@ -117,52 +116,6 @@
padding: 3px;
"
>
-=======
-聽 聽 聽 聽 聽 聽 <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>
- <!-- 鎼滅储瀹㈡埛鍚� -->
- <template if:true={isModalOpen}>
- <section role="dialog" tabindex="-1" aria-labelledby="modal-heading-01" aria-modal="true"
- aria-describedby="modal-content-id-1" class="slds-modal slds-fade-in-open slds-modal_medium"
- style="border: 1px solid #D4D4D4;">
- <div class="slds-modal__container">
- <header class="slds-modal__header" style="background-color: #F3F3F3;">
- <button style="" class="slds-button slds-button_icon slds-modal__close slds-button_icon-inverse"
- title="Close" onclick={closeModal}>
- <lightning-icon icon-name="utility:close" alternative-text="close" variant="inverse"
- size="small"></lightning-icon>
- <span class="slds-assistive-text">Close</span>
- </button>
- <h2 id="modal-heading-01" class="slds-text-heading_medium slds-hyphenate">缁忛攢鍟嗗尰闄㈡绱�</h2>
- </header>
- <div class="slds-modal__content slds-p-around_medium" id="modal-content-id-1"
- style="border: 1px solid #F3F3F3;">
- <table style="width: 100%;">
- <tbody>
- <tr>
- <td style="width: 74px;">
- <div style="color:#696969;font-size:16px;text-align: left;">鍖婚櫌鍚嶇О</div>
- </td>
- <td style="width: 60%;"><lightning-input class="inputFont" label="鍖婚櫌鍚嶇О"
- variant="label-hidden" placeholder="璇疯緭鍏ュ尰闄㈠悕绉�" value={searchHospitalName}
- data-field="searchHospitalName" onchange={dataChange}></lightning-input></td>
- <td style="width: 10px;"></td>
- <td><button class="slds-button slds-button_neutral slds-button_stretch lexsearchStyle"
- style="height: 32px;" label="鎼滅储" onclick={searchHospital}>鎼滅储</button></td>
- </tr>
- </tbody>
- </table>
- <p style="height: 20px;"></p>
- <!-- <p>宸查�夋嫨鍖婚櫌锛歿chooseHospital}</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;">
->>>>>>> LEXCommunityLiJun
<lightning-layout>
<lightning-layout-item padding="around-small">
<p style="font-size: 18px">
@@ -172,7 +125,6 @@
</lightning-layout>
<!-- <p style="font-size: 16px;"><strong>鎼滅储缁撴灉</strong></p> -->
</div>
-<<<<<<< HEAD
<div class="myTable" style="padding: 10px">
<!-- <lightning-datatable class="wrapped-header-datatable" key-field="id"
hide-checkbox-column="true" data={hospitalList} columns={hosCols}
@@ -185,21 +137,11 @@
hide-checkbox-column="true"
onrowaction={searchHandleRowAction}
>
-=======
- <div class="myTable" style="padding:10px;">
- <!-- <lightning-datatable class="wrapped-header-datatable" key-field="id"
- hide-checkbox-column="true" data={hospitalList} columns={hosCols}
- onrowaction={chooseHos}></lightning-datatable> -->
- <lightning-datatable class="datatabel slds-border_top wrapped-header-datatable"
- key-field="id" data={hospitalList} columns={hospitalColumns} hide-checkbox-column="true"
- onrowaction={searchHandleRowAction}>
->>>>>>> LEXCommunityLiJun
</lightning-datatable>
</div>
</div>
</div>
<footer class="slds-modal__footer">
-<<<<<<< HEAD
<button
class="slds-button slds-button_neutral slds-button_stretch lexclearStyle"
label="鍙栨秷"
@@ -207,10 +149,6 @@
>
鍙栨秷
</button>
-=======
- <button class="slds-button slds-button_neutral slds-button_stretch lexclearStyle" label="鍙栨秷"
- onclick={closeModal}>鍙栨秷</button>
->>>>>>> LEXCommunityLiJun
</footer>
</div>
</section>
@@ -219,7 +157,6 @@
<!-- 涓婁紶闄勪欢寮圭獥 -->
<template if:true={showAttPop}>
-<<<<<<< HEAD
<section
role="dialog"
tabindex="-1"
@@ -279,33 +216,6 @@
<p style="font-size: 16px">
宸查�夋嫨鏂囦欢锛歿fileName}
-=======
- <section role="dialog" tabindex="-1" aria-labelledby="modal-heading-01" aria-modal="true"
- aria-describedby="modal-content-id-1" class="slds-modal slds-fade-in-open slds-modal_small"
- style="border: 1px solid #D4D4D4;">
- <template if:true={showPopSpinner}>
- <lightning-spinner size="medium" variant="brand"></lightning-spinner>
- </template>
- <div class="slds-modal__container">
- <header class="slds-modal__header" style="background-color: #F3F3F3;">
- <button style="" class="slds-button slds-button_icon slds-modal__close slds-button_icon-inverse"
- title="Close" onclick={closePop}>
- <lightning-icon icon-name="utility:close" alternative-text="close" variant="inverse"
- size="small"></lightning-icon>
- <span class="slds-assistive-text">Close</span>
- </button>
- <h2 id="modal-heading-02" class="slds-text-heading_medium slds-hyphenate">涓婁紶闄勪欢</h2>
- </header>
- <div class="slds-modal__content slds-p-around_medium" id="modal-content-id-2"
- style="border: 1px solid #F3F3F3;">
- <div class="slds-m-top_medium slds-m-bottom_x-large">
- <div class="slds-p-around_medium lgc-bg">
- <lightning-input class="fileUpload" type="file" label="闄勪欢涓婁紶"
- accept=".xlsx, .xls, .csv, .png, .doc, .docx, .pdf"
- onchange={attChange}></lightning-input>
- </div>
- <p style="font-size: 16px;">宸查�夋嫨鏂囦欢锛歿fileName}
->>>>>>> LEXCommunityLiJun
<template if:true={attDelBtn}>
<a onclick={removeAtt}>绉婚櫎</a>
</template>
@@ -317,7 +227,6 @@
onclick={closePop}></lightning-button>
<lightning-button style="margin-left: 10px;" variant="neutral" label="涓婁紶"
onclick={handleSave}></lightning-button> -->
-<<<<<<< HEAD
<button
class="slds-button slds-button_neutral slds-button_stretch lexclearStyle"
style="margin-left: 10px"
@@ -334,12 +243,6 @@
>
涓婁紶
</button>
-=======
- <button class="slds-button slds-button_neutral slds-button_stretch lexclearStyle" style="margin-left: 10px;" label="鍙栨秷"
- onclick={closePop}>鍙栨秷</button>
- <button class="slds-button slds-button_neutral slds-button_stretch lexsearchStyle" style="margin-left: 10px;" label="涓婁紶"
- onclick={handleSave}>涓婁紶</button>
->>>>>>> LEXCommunityLiJun
</footer>
</div>
</section>
@@ -378,14 +281,10 @@
style="width: 150px"></lightning-button> -->
<button
class="slds-button slds-button_neutral slds-button_stretch lexBorder"
-<<<<<<< HEAD
onclick={saveConfirmJs}
>
淇濆瓨
</button>
-=======
- onclick={saveConfirmJs}>淇濆瓨</button>
->>>>>>> LEXCommunityLiJun
</template>
</td>
<td colspan="4">
@@ -403,15 +302,11 @@
style="width: 150px" disabled={isEditDisabled}></lightning-button> -->
<button
class="slds-button slds-button_neutral slds-button_stretch lexBorder"
-<<<<<<< HEAD
onclick={EditConsumable}
disabled={isEditDisabled}
>
缂栬緫鍑哄簱鍗�
</button>
-=======
- onclick={EditConsumable} disabled={isEditDisabled}>缂栬緫鍑哄簱鍗�</button>
->>>>>>> LEXCommunityLiJun
</template>
</td>
@@ -421,15 +316,11 @@
style="width: 150px;" disabled={isDeliveryDisabled}></lightning-button> -->
<button
class="slds-button slds-button_neutral slds-button_stretch lexBorder"
-<<<<<<< HEAD
onclick={GoodsDeliveryJs}
disabled={isDeliveryDisabled}
>
鍑鸿揣/閿�鍞�
</button>
-=======
- onclick={GoodsDeliveryJs} disabled={isDeliveryDisabled}>鍑鸿揣/閿�鍞�</button>
->>>>>>> LEXCommunityLiJun
</template>
</td>
@@ -439,15 +330,11 @@
disabled={isOpenToInvoiceDisabled}></lightning-button> -->
<button
class="slds-button slds-button_neutral slds-button_stretch lexBorder"
-<<<<<<< HEAD
onclick={openToInvoiceJs}
disabled={isOpenToInvoiceDisabled}
>
寮�绁�
</button>
-=======
- onclick={openToInvoiceJs} disabled={isOpenToInvoiceDisabled}>寮�绁�</button>
->>>>>>> LEXCommunityLiJun
</template>
</td>
@@ -455,7 +342,6 @@
<template if:false={EditAble}>
<button
class="slds-button slds-button_neutral slds-button_stretch lexBorder"
-<<<<<<< HEAD
onclick={uploadOrder}
>
涓婁紶闄勪欢
@@ -464,13 +350,6 @@
</td>
</tr>
<tr style="height: 5px"></tr>
-=======
- onclick={uploadOrder}>涓婁紶闄勪欢</button>
- </template>
- </td>
- </tr>
- <tr style="height: 5px;"></tr>
->>>>>>> LEXCommunityLiJun
<tr>
<td></td>
<td>
@@ -479,29 +358,20 @@
disabled={isPraseToPDFDisabled}></lightning-button> -->
<button
class="slds-button slds-button_neutral slds-button_stretch lexBorder"
-<<<<<<< HEAD
onclick={PraseToPDFJs}
disabled={isPraseToPDFDisabled}
>
鎵撳嵃鎸囩ず鍗�
</button>
-=======
- onclick={PraseToPDFJs} disabled={isPraseToPDFDisabled}>鎵撳嵃鎸囩ず鍗�</button>
->>>>>>> LEXCommunityLiJun
</template>
</td>
<td>
-<<<<<<< HEAD
-=======
-
->>>>>>> LEXCommunityLiJun
<template if:true={isOpenReportShow}>
<!-- <lightning-button label="鏄剧ず鏄庣粏 " onclick={openReportJs}
style="width: 150px" disabled={isOpenReportDisabled}></lightning-button> -->
<button
class="slds-button slds-button_neutral slds-button_stretch lexBorder"
-<<<<<<< HEAD
onclick={openReportJs}
disabled={isOpenReportDisabled}
>
@@ -510,27 +380,16 @@
</template>
</td>
<td>
-=======
- onclick={openReportJs} disabled={isOpenReportDisabled}>鏄剧ず鏄庣粏</button>
- </template>
- </td>
- <td>
-
->>>>>>> LEXCommunityLiJun
<template if:true={isDeleteShow}>
<!-- <lightning-button label="鍒犻櫎" onclick={DeleteConsumable} style="width: 150px"
disabled={isDeleteDisabled}></lightning-button> -->
<button
class="slds-button slds-button_neutral slds-button_stretch lexBorder"
-<<<<<<< HEAD
onclick={DeleteConsumable}
disabled={isDeleteDisabled}
>
鍒犻櫎
</button>
-=======
- onclick={DeleteConsumable} disabled={isDeleteDisabled}>鍒犻櫎</button>
->>>>>>> LEXCommunityLiJun
</template>
</td>
<td></td>
@@ -556,7 +415,6 @@
<div lwc:dom="manual" class="resultDiv"></div>
<div draggable="false">
<!-- SummonsStatus_c__c == '浠锋牸鏈畾' -->
-<<<<<<< HEAD
<template
if:true={summonsStatusPriceNotDetermined}
>
@@ -1575,6 +1433,7 @@
onfirst={handleFirst}
onlast={handleLast}
page-size-options={pageSizeOptions}
+ default-page-size={pageSize}
previous-button-disabled={previousButtonDisabled}
next-button-disabled={nextButtonDisabled}
record-start={recordStart}
@@ -1613,6 +1472,7 @@
onfirst={editHandleFirst}
onlast={editHandleLast}
page-size-options={pageSizeOptions}
+ default-page-size={pageSize}
previous-button-disabled={previousButtonDisabled}
next-button-disabled={nextButtonDisabled}
record-start={recordStart}
@@ -1655,639 +1515,6 @@
</div>
</template>
-=======
- <template if:true={summonsStatusPriceNotDetermined}>
- <lightning-record-edit-form object-api-name="Consumable_order__c" record-id={cocId}
- onload={handleLoad}>
- <!-- 鍑哄簱鍗曞彿 鍑哄簱鍗曠姸鎬� -->
- <lightning-layout multiple-rows="true">
- <template if:true={isSummonsFlag}>
- <lightning-layout-item size="1"></lightning-layout-item>
-
- <lightning-layout-item size="5">
- <lightning-output-field field-name="Name"
- class="hehe-layoutItem"></lightning-output-field>
- </lightning-layout-item>
-
- <lightning-layout-item class="hehe-layoutItem" size="5"
- style="padding-left: 100px;">
- <lightning-output-field
- field-name="SummonsStatus_c__c"></lightning-output-field>
- </lightning-layout-item>
-
- <lightning-layout-item size="1"></lightning-layout-item>
-
-
- </template>
- </lightning-layout>
-
- <!-- 鐩殑 寮�绁ㄧ姸鎬� -->
- <lightning-layout multiple-rows="true">
- <lightning-layout-item size="1"></lightning-layout-item>
-
- <lightning-layout-item class="hehe-layoutItem" size="5">
- <lightning-output-field field-name="SummonsForDirction__c"
- class="searchName"></lightning-output-field>
- </lightning-layout-item>
-
- <lightning-layout-item class="hehe-layoutItem" size="5"
- style="padding-left: 100px;">
- <lightning-output-field field-name="Billed_Status__c"
- class="searchName"></lightning-output-field>
- </lightning-layout-item>
-
- <lightning-layout-item size="1"></lightning-layout-item>
-
-
- </lightning-layout>
-
- <!-- 浜岀骇缁忛攢鍟� -->
- <template if:true={isSummonsForDirctionTwoShow}>
- <lightning-layout multiple-rows="true">
-
- <lightning-layout-item size="1"></lightning-layout-item>
-
- <lightning-layout-item class="hehe-layoutItem" size="5">
- <lightning-output-field
- field-name="Order_Dealer_Info__c"></lightning-output-field>
- </lightning-layout-item>
-
-
- </lightning-layout>
- </template>
-
- <!-- 瀹㈡埛鍚� 鍙戠エ-->
- <lightning-layout multiple-rows="true">
- <lightning-layout-item size="1"></lightning-layout-item>
-
- <lightning-layout-item class="hehe-layoutItem" size="5">
- <lightning-output-field class="hideHelpText"
- field-name="ShipmentAccount__c"></lightning-output-field>
- </lightning-layout-item>
-
- <lightning-layout-item class="hehe-layoutItem" size="5"
- style="padding-left: 100px;">
- <lightning-input-field data-field={ConInvoice_Code__c}
- onchange={invoiceChange} field-name="ConInvoice_Code__c"
- class="inputFont"></lightning-input-field>
- </lightning-layout-item>
-
- <lightning-layout-item size="1"></lightning-layout-item>
-
-
- </lightning-layout>
-
- <!-- 绉戝 鍑哄簱閲戦 -->
- <lightning-layout multiple-rows="true">
- <lightning-layout-item size="1"></lightning-layout-item>
-
- <lightning-layout-item class="hehe-layoutItem" size="5">
- <lightning-output-field
- field-name="Order_ForCustomerText__c"></lightning-output-field>
- </lightning-layout-item>
-
- <lightning-layout-item class="hehe-layoutItem" size="5"
- style="padding-left: 100px;">
- <lightning-output-field
- field-name="Shipment_total_amount__c"></lightning-output-field>
- </lightning-layout-item>
-
- <lightning-layout-item size="1"></lightning-layout-item>
-
-
- </lightning-layout>
-
- <!-- 娌℃湁纭畾浠锋牸 -->
- <lightning-layout multiple-rows="true">
-
-
- <lightning-layout-item size="1"></lightning-layout-item>
-
- <lightning-layout-item class="hehe-layoutItem" size="5">
- <lightning-output-field
- field-name="NoConfirmedPrice__c"></lightning-output-field>
- </lightning-layout-item>
-
-
- </lightning-layout>
- </lightning-record-edit-form>
- </template>
-
- <!-- SummonsStatus_c__c != '浠锋牸鏈畾' -->
- <template if:false={summonsStatusPriceNotDetermined}>
- <lightning-record-edit-form object-api-name="Consumable_order__c" record-id={cocId}
- onsubmit={handleSubmit} onload={handleLoad}>
- <!-- 鍑哄簱鍗曞彿 鍑哄簱鍗曠姸鎬� -->
- <lightning-layout multiple-rows="true">
- <template if:true={isSummonsFlag}>
- <lightning-layout-item size="1"></lightning-layout-item>
-
- <lightning-layout-item class="hehe-layoutItem" size="5">
- <lightning-output-field field-name="Name"></lightning-output-field>
- </lightning-layout-item>
-
- <lightning-layout-item class="hehe-layoutItem" size="5"
- style="padding-left: 100px;">
- <lightning-output-field
- field-name="SummonsStatus_c__c"></lightning-output-field>
- </lightning-layout-item>
-
- <lightning-layout-item size="1"></lightning-layout-item>
- </template>
- </lightning-layout>
-
- <!-- 鐩殑 浜岀骇缁忛攢鍟� -->
- <lightning-layout multiple-rows="true">
- <lightning-layout-item size="1"></lightning-layout-item>
-
- <lightning-layout-item class="hehe-layoutItem" size="5">
- <lightning-input-field data-field="summonsForDirction"
- value={summonsForDirction} field-name="SummonsForDirction__c"
- required="true" onchange={ChangeDirction}
- class="inputFont"></lightning-input-field>
- </lightning-layout-item>
-
- <lightning-layout-item class="hehe-layoutItem" size="5"
- style="padding-left: 100px;">
- <lightning-combobox data-field="secondaryDistributor"
- name="secondaryDistributor" label="浜岀骇缁忛攢鍟�"
- value={secondaryDistributor} placeholder="璇烽�夋嫨..."
- options={secondaryDistributorOptions} variant="label-inline"
- onchange={dataChange} disabled={isDisabledSecondaryDistributor}
- class="inputFont"></lightning-combobox>
- </lightning-layout-item>
-
- <lightning-layout-item size="1"></lightning-layout-item>
-
-
- </lightning-layout>
-
- <!-- 瀹㈡埛鍚� 缁忛攢鍟嗗綍鍏� -->
- <lightning-layout multiple-rows="true">
- <lightning-layout-item size="1"></lightning-layout-item>
-
- <lightning-layout-item class="hehe-layoutItem" size="5">
- <div
- class="slds-form-element__control slds-input-has-icon slds-input-has-icon_right">
- <lightning-icon size="x-small"
- class="iconMargin slds-icon slds-input__icon slds-input__icon_right slds-icon-text-default"
- icon-name="utility:search"></lightning-icon>
- <lightning-input type="text" name="HospitalName" label="瀹㈡埛鍚�"
- value={HospitalName} variant="label-inline"
- onclick={searchHospitalNameModal} data-field="HospitalName"
- disabled={isDisabledHospitalName} onchange={clearAgencyI}
- class="inputFont"></lightning-input>
- </div>
- </lightning-layout-item>
-
- <lightning-layout-item class="hehe-layoutItem" size="5"
- style="padding-left: 100px;">
- <template if:true={isMutualTransferGoods}>
- <c-lex-lookup onsearch={handleSearch}
- onselectionchange={handleSelectionChange} label="缁忛攢鍟�(褰曞叆)"
- variant="label-inline" placeholder="鎼滅储缁忛攢鍟�"
- onisdisabledfordealertext={isDisabledForDealerText}
- account-value={accountValue} onblur={vpClear2Delay}
- disabled={isDisabledForDealerText} class="inputFont">
- </c-lex-lookup>
- </template>
- <template if:false={isMutualTransferGoods}>
- <lightning-input type="text" name="Order_ForDealerText__c"
- label="缁忛攢鍟�(褰曞叆)" value={ForDealerText} onchange={dataChange}
- data-field="Order_ForDealerText__c"
- disabled={isDisabledForDealerText} variant="label-inline"
- class="inputFont">
- </lightning-input>
- </template>
- </lightning-layout-item>
-
- <lightning-layout-item size="1"></lightning-layout-item>
-
-
- </lightning-layout>
-
- <!-- 绉戝 鎬婚噾棰� -->
- <lightning-layout multiple-rows="true">
- <lightning-layout-item size="1"></lightning-layout-item>
-
- <lightning-layout-item class="hehe-layoutItem" size="5">
- <lightning-input-field onchange={dataChange}
- data-field="ForCustomerText" value={ForCustomerText}
- field-name="Order_ForCustomerText__c"
- disabled={isDisabledForCustomerText}
- class="inputFont"></lightning-input-field>
- </lightning-layout-item>
-
-
-
- <lightning-layout-item class="hehe-layoutItem" size="5"
- style="padding-left: 100px;">
- <lightning-input type="text" name="sumPrice" label="鎬婚噾棰�"
- value={sumPrice} variant="label-inline" onchange={dataChange}
- data-field="sumPrice" readonly></lightning-input>
- </lightning-layout-item>
-
- <lightning-layout-item size="1"></lightning-layout-item>
- </lightning-layout>
-
- <!-- 娌℃湁纭畾浠锋牸 -->
- <lightning-layout multiple-rows="true">
-
- <lightning-layout-item size="1"></lightning-layout-item>
-
- <lightning-layout-item class="hehe-layoutItem" size="5">
- <lightning-input-field value={NoConfirmedPrice}
- field-name="NoConfirmedPrice__c" data-field="NoConfirmedPrice"
- onchange={dataChange}></lightning-input-field>
- </lightning-layout-item>
-
-
-
- </lightning-layout>
- </lightning-record-edit-form>
- </template>
- </div>
- </div>
- </div>
- </template>
-
- <!-- 鍑哄簱鍗曚俊鎭� EditAble = false -->
- <template if:false={EditAble}>
- <div class="borderCss">
- <div class="headerDorderCss">
- <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: 7px">
- <div lwc:dom="manual" class="resultDiv"></div>
- <div draggable="false">
- <lightning-record-edit-form object-api-name="Consumable_order__c" record-id={cocId}
- onload={handleLoad2}>
- <!-- 鍑哄簱鍗曞彿 鍑哄簱鍗曠姸鎬� -->
- <lightning-layout multiple-rows="true">
- <template if:true={isSummonsFlag}>
- <lightning-layout-item size="1"></lightning-layout-item>
-
- <lightning-layout-item size="5">
- <lightning-output-field field-name="Name"
- class="hehe-layoutItem"></lightning-output-field>
- </lightning-layout-item>
-
-
-
- <lightning-layout-item size="5" style="padding-left: 100px;">
- <lightning-output-field field-name="SummonsStatus_c__c"
- class="hehe-layoutItem"></lightning-output-field>
- </lightning-layout-item>
-
- <lightning-layout-item size="1"></lightning-layout-item>
- </template>
- </lightning-layout>
-
- <!-- 鐩殑 寮�绁ㄧ姸鎬� -->
- <lightning-layout multiple-rows="true">
- <lightning-layout-item size="1"></lightning-layout-item>
-
- <lightning-layout-item size="5">
- <lightning-output-field field-name="SummonsForDirction__c"
- class="hehe-layoutItem"></lightning-output-field>
- </lightning-layout-item>
-
- <lightning-layout-item size="5" style="padding-left: 100px;">
- <lightning-output-field field-name="Billed_Status__c"
- class="hehe-layoutItem"></lightning-output-field>
- </lightning-layout-item>
-
- <lightning-layout-item size="1"></lightning-layout-item>
-
-
- </lightning-layout>
-
- <!-- 浜岀骇缁忛攢鍟� -->
- <template if:true={isSummonsForDirctionTwoShow}>
- <lightning-layout multiple-rows="true">
- <lightning-layout-item size="1"></lightning-layout-item>
-
- <lightning-layout-item size="5">
- <lightning-output-field field-name="Order_Dealer_Info__c"
- class="hehe-layoutItem"></lightning-output-field>
- </lightning-layout-item>
- </lightning-layout>
- </template>
-
- <!-- 瀹㈡埛鍚� 鍙戠エ-->
- <lightning-layout multiple-rows="true">
- <lightning-layout-item size="1"></lightning-layout-item>
-
- <lightning-layout-item size="5" class="hehe-layoutItem">
- <lightning-output-field class="hideHelpText"
- field-name="ShipmentAccount__c"></lightning-output-field>
- </lightning-layout-item>
-
- <template if:true={isConInvoiceShow}>
- <lightning-layout-item size="5" style="padding-left: 100px;">
- <lightning-input-field data-field={ConInvoice_Code__c}
- onchange={invoiceChange} field-name="ConInvoice_Code__c"
- class="hehe-layoutItem inputFont"></lightning-input-field>
- </lightning-layout-item>
- </template>
-
- <lightning-layout-item size="1"></lightning-layout-item>
-
-
- </lightning-layout>
-
- <!-- 绉戝 鍑哄簱閲戦 -->
- <lightning-layout multiple-rows="true">
- <lightning-layout-item size="1"></lightning-layout-item>
-
- <lightning-layout-item size="5">
- <lightning-output-field field-name="Order_ForCustomerText__c"
- class="hehe-layoutItem"></lightning-output-field>
- </lightning-layout-item>
-
- <lightning-layout-item size="5" style="padding-left: 100px;">
- <lightning-output-field field-name="Shipment_total_amount__c"
- class="hehe-layoutItem"></lightning-output-field>
- </lightning-layout-item>
-
- <lightning-layout-item size="1"></lightning-layout-item>
-
-
- </lightning-layout>
-
- <!-- 娌℃湁纭畾浠锋牸 -->
- <lightning-layout multiple-rows="true">
-
- <lightning-layout-item size="1"></lightning-layout-item>
-
- <lightning-layout-item size="5">
- <lightning-output-field field-name="NoConfirmedPrice__c"
- class="hehe-layoutItem"></lightning-output-field>
- </lightning-layout-item>
- </lightning-layout>
-
- <!-- 闄勪欢棰勮 -->
- <template if:false={EditAble}>
- <lightning-layout multiple-rows="true">
- <lightning-layout-item size="1">
- </lightning-layout-item>
- <lightning-layout-item size="10">
- <lightning-card class="attListTitle" variant="Narrow" title="闄勪欢鍒楄〃"
- icon-name="utility:attach">
-
- <lightning-layout slot="footer" multiple-rows="true">
- <template for:each={fileData} for:item="item" for:index="index">
- <lightning-layout-item padding="around-none" size="2"
- key={item.recordId}
- style="text-align: left;padding:5px;word-wrap:break-word; word-break:break-all;">
- <lightning-icon title={item.Title}
- style="margin-left: 20px;" icon-name="doctype:gform"
- alternative-text={item.Title}
- size="large"></lightning-icon><br />
- <div title={item.Title} style="width: 100px;text-overflow: ellipsis;overflow: hidden;white-space: nowrap;">
- {item.Title}
- </div>
- <p>
- <!-- <a data-fileid ={item.documentId} onclick={previweAtt}> -->
- <a href={item.attUrl} target="_blank">
- 棰勮
- </a> 路
- <a href={item.downloadUrl}>
- 涓嬭浇
- </a> 路
- <a data-fileid={item.Id} onclick={deleteAtt}>
- 鍒犻櫎
- </a>
- </p>
- <!-- <p>{item.updateDate} 路 {item.ownerName}</p> -->
- </lightning-layout-item>
- </template>
- </lightning-layout>
- </lightning-card>
- </lightning-layout-item>
- </lightning-layout>
- </template>
-
- </lightning-record-edit-form>
- </div>
- </div>
- </div>
- </template>
-
- <!-- 妫�绱� -->
- <template if:true={isSearchShow}>
- <div class="borderCss">
- <div style="padding: 3px;">
- <div lwc:dom="manual" class="resultDiv"></div>
- <div draggable="false">
- <lightning-layout multiple-rows style="margin-top: 10px;">
- <lightning-layout-item style="padding-left: 10px;" flexibility="auto">
- <div class="slds-grid slds-grid_vertical-align-center">
- <div class="slds-form-element__label">娑堣�楀搧鍚嶇О</div>
- <lightning-input type="text" name="consumableName" label="娑堣�楀搧鍚嶇О"
- value={consumableName} variant="label-hidden" onchange={dataChange}
- data-field="consumableName" class="inputFont"
- style="width:150px"></lightning-input>
- </div>
- </lightning-layout-item>
- <lightning-layout-item flexibility="auto">
- <div class="slds-grid slds-grid_vertical-align-center">
- <div class="slds-form-element__label" style="width:80px">绗�3鍒嗙被</div>
- <lightning-combobox name="progress" label="绗�3鍒嗙被" value={Category3}
- variant="label-hidden" options={category3Options} onchange={dataChange}
- data-field="Category3" style="min-width: 120px;"
- class="inputFont"></lightning-combobox>
- </div>
- </lightning-layout-item>
- <lightning-layout-item flexibility="auto">
- <div class="slds-grid slds-grid_vertical-align-center">
- <div class="slds-form-element__label" style="width:80px">绗�4鍒嗙被</div>
- <lightning-combobox name="progress" label="绗�4鍒嗙被" value={Category4}
- variant="label-hidden" options={category4Options} onchange={dataChange}
- data-field="Category4" style="min-width: 120px;"
- class="inputFont"></lightning-combobox>
- </div>
-
- </lightning-layout-item>
- <lightning-layout-item flexibility="auto">
- <div class="slds-grid slds-grid_vertical-align-center">
- <div class="slds-form-element__label" style="width:80px">绗�5鍒嗙被</div>
- <lightning-combobox name="progress" label="绗�5鍒嗙被" value={Category5}
- variant="label-hidden" onchange={dataChange} data-field="Category5"
- options={category5Options} style="min-width: 120px;"
- class="inputFont"></lightning-combobox>
- </div>
-
- </lightning-layout-item>
- <template if:true={hasHosPro}>
- <lightning-layout-item flexibility="auto">
- <div class="slds-grid slds-grid_vertical-align-center">
- <div class="slds-form-element__label">鍖婚櫌鐗逛环</div>
- <lightning-combobox name="progress" label="鍖婚櫌鐗逛环" value={outOutPattern}
- variant="label-hidden" options={outOutPatternOptionList}
- onchange={dataChange} data-field="outOutPattern"
- style="min-width: 120px;" class="inputFont"></lightning-combobox>
- </div>
- </lightning-layout-item>
- </template>
- </lightning-layout>
-
- <lightning-layout multiple-rows style="margin-top: 10px;">
- <lightning-layout-item style="padding-left: 10px;visibility:hidden;"
- flexibility="auto">
- <div class="slds-grid slds-grid_vertical-align-center">
- <div class="slds-form-element__label">娑堣�楀搧鍚嶇О</div>
- <lightning-input type="text" name="consumableName" label="娑堣�楀搧鍚嶇О"
- value={consumableName} variant="label-hidden" onchange={dataChange}
- data-field="consumableName" class="inputFont"
- style="width:150px"></lightning-input>
- </div>
- </lightning-layout-item>
- <lightning-layout-item flexibility="auto" style="visibility:hidden;">
- <div class="slds-grid slds-grid_vertical-align-center">
- <div class="slds-form-element__label" style="width:80px">绗�3鍒嗙被</div>
- <lightning-combobox name="progress" label="绗�3鍒嗙被" value={Category3}
- variant="label-hidden" options={category3Options} onchange={dataChange}
- data-field="Category3" style="min-width: 120px;"
- class="inputFont"></lightning-combobox>
- </div>
- </lightning-layout-item>
- <lightning-layout-item flexibility="auto" style="visibility:hidden;">
- <div class="slds-grid slds-grid_vertical-align-center">
- <div class="slds-form-element__label" style="width:80px">绗�4鍒嗙被</div>
- <lightning-combobox name="progress" label="绗�4鍒嗙被" value={Category4}
- variant="label-hidden" options={category4Options} onchange={dataChange}
- data-field="Category4" style="min-width: 120px;"
- class="inputFont"></lightning-combobox>
- </div>
-
- </lightning-layout-item>
- <template if:false={hasHosPro}>
- <lightning-layout-item flexibility="auto">
- <div class="slds-grid slds-grid_vertical-align-center">
- <button
- class="slds-button slds-button_neutral slds-button_stretch lexBorder lexsearchStyle"
- onclick={searchProductJs}
- style="min-width: 80px;max-width: 100px;">妫�绱�</button>
- <button style="margin-left:10px;min-width: 80px;max-width: 100px;"
- class="slds-button slds-button_neutral slds-button_stretch lexBorder lexclearStyle"
- onclick={ClearJs}>娓呯┖</button>
- </div>
- </lightning-layout-item>
- </template>
- <template if:true={hasHosPro}>
- <lightning-layout-item flexibility="auto" style="visibility:hidden;">
- <div class="slds-grid slds-grid_vertical-align-center">
- <div class="slds-form-element__label" style="width:80px">绗�5鍒嗙被</div>
- <lightning-combobox name="progress" label="绗�5鍒嗙被" value={Category5}
- variant="label-hidden" onchange={dataChange} data-field="Category5"
- options={category5Options} style="min-width: 120px;"
- class="inputFont"></lightning-combobox>
- </div>
- </lightning-layout-item>
- <lightning-layout-item flexibility="auto">
- <div class="slds-grid slds-grid_vertical-align-center">
- <button
- class="slds-button slds-button_neutral slds-button_stretch lexBorder lexsearchStyle"
- onclick={searchProductJs}
- style="min-width: 80px;max-width: 110px;">妫�绱�</button>
- <button style="margin-left:10px;min-width: 80px;max-width: 110px;"
- class="slds-button slds-button_neutral slds-button_stretch lexBorder lexclearStyle"
- onclick={ClearJs}>娓呯┖</button>
- </div>
- </lightning-layout-item>
- </template>
- </lightning-layout>
- </div>
- </div>
- </div>
- </template>
-
- <!-- 鍑哄簱鍗曟槑缁� -->
- <div class="borderCss">
- <div class="headerDorderCss">
- <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: 7px">
- <template if:true={EditAble}>
- <template if:true={showTable}>
- <c-lex-custom-lightning-datatable key-field="Id" data={data} columns={columns}
- hide-checkbox-column={hideCheckboxColumn} onunitchange={handleUnitChange}
- onshipmentnumber={handleShipmentNumber}
- onshipmentunitprice={handleShipmentUnitPrice} onrowselection={getSelectedRows}
- selected-rows={selectedRows} default-sort-direction={defaultSortDirection}
- sorted-direction={sortDirection} sorted-by={sortedBy} onsort={onHandleSort}
- style="word-wrap:break-word; word-break:break-all; "
- class="wrapped-header-datatable slds-is-selected">
- </c-lex-custom-lightning-datatable>
- </template>
- <c-paginator onprevious={handlePrevious} onnext={handleNext}
- onpageschange={handlePageschange} 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>
- </template>
-
- <template if:false={EditAble}>
- <template if:true={showTable}>
- <c-lex-custom-lightning-datatable hide-checkbox-column key-field="Id" data={editData}
- columns={editColumns} onunitchange={handleUnitChange}
- onshipmentnumber={handleShipmentNumber}
- onshipmentunitprice={handleShipmentUnitPrice} onrowselection={getSelectedRows}
- selected-rows={selectedRows} default-sort-direction={defaultSortDirection}
- sorted-direction={sortDirection} sorted-by={sortedBy} onsort={onHandleSort}
- style="word-wrap:break-word; word-break:break-all; "
- class="wrapped-header-datatable slds-is-selected">
- </c-lex-custom-lightning-datatable>
- <c-paginator onprevious={editHandlePrevious} onnext={editHandleNext}
- onpageschange={editHandlePageschange} onfirst={editHandleFirst}
- onlast={editHandleLast} 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>
- </template>
- </template>
-
- <template if:true={isEditShowSpinner}>
- <lightning-spinner alternative-text="Uploading now"></lightning-spinner>
- </template>
- </div>
- </div>
-
- <!-- 鍑哄簱浜у搧鏄庣粏 -->
- <template if:true={isShowOutboundProductDetails}>
- <div class="borderCss">
- <div class="headerDorderCss">
- <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: 7px">
- <lightning-datatable key-field="id" data={consumableorderdetails2Records}
- columns={consumableorderdetails2RecordsColumns} hide-checkbox-column
- class="wrapped-header-datatable">
- </lightning-datatable>
- </div>
- </div>
- </template>
-
->>>>>>> LEXCommunityLiJun
<!-- 涓婁紶闄勪欢 -->
<!-- <template if:false={EditAble}>
<div class="borderCss">
@@ -2339,7 +1566,6 @@
</lightning-layout-item>
</lightning-layout>
</div>
-<<<<<<< HEAD
<div style="padding: 7px">
<div lwc:dom="manual" class="resultDiv"></div>
<div draggable="false">
@@ -2385,47 +1611,16 @@
class="hehe-layoutItem"
size="4"
>
-=======
- <div style="padding: 7px;">
- <div lwc:dom="manual" class="resultDiv"></div>
- <div draggable="false">
- <lightning-layout multiple-rows="true" style="height:50px">
- <lightning-layout-item class="hehe-layoutItem" size="4">
- </lightning-layout-item>
- <template if:true={isSales}>
- <lightning-layout-item class="hehe-layoutItem" size="4">
- <!-- <lightning-button label="閿�鍞�" onclick={SaveP}
- style="margin-top:-10px"></lightning-button> -->
- <button class="slds-button slds-button_neutral slds-button_stretch lexBorder"
- onclick={SaveP}>閿�鍞�</button>
- </lightning-layout-item>
- </template>
- <template if:false={isSales}>
- <lightning-layout-item class="hehe-layoutItem" size="4">
- <!-- <lightning-button label="鍑鸿揣" onclick={SaveE}></lightning-button> -->
- <button class="slds-button slds-button_neutral slds-button_stretch lexBorder"
- onclick={SaveE}>鍑鸿揣</button>
- </lightning-layout-item>
- </template>
- <lightning-layout-item class="hehe-layoutItem" size="4">
->>>>>>> LEXCommunityLiJun
</lightning-layout-item>
</lightning-layout>
<template if:true={isShowInformation}>
-<<<<<<< HEAD
<div class="borderCss" style="margin-top: 5px">
<div class="headerDorderCss">
<lightning-layout>
<lightning-layout-item
padding="around-small"
>
-=======
- <div class="borderCss" style="margin-top: 5px;">
- <div class="headerDorderCss">
- <lightning-layout>
- <lightning-layout-item padding="around-small">
->>>>>>> LEXCommunityLiJun
<p style="font-size: 18px">
<strong>鍑哄簱鍗曚俊鎭�</strong>
</p>
@@ -2433,7 +1628,6 @@
</lightning-layout>
</div>
<div style="padding: 7px">
-<<<<<<< HEAD
<div
lwc:dom="manual"
class="resultDiv"
@@ -2536,52 +1730,6 @@
field-name="SummonsForDirction__c"
variant="label-hidden"
></lightning-output-field>
-=======
- <div lwc:dom="manual" class="resultDiv"></div>
- <div draggable="false">
- <lightning-record-edit-form object-api-name="Consumable_order__c"
- record-id={cocId} onload={handleLoad2}>
- <lightning-layout multiple-rows="true">
- <lightning-layout-item size="3" padding="around-small">
- <!-- <lightning-output-field field-name="Name"></lightning-output-field> -->
- <div class="slds-grid slds-grid_vertical-align-center">
- <div class="slds-form-element__label" style="padding: 0px;">
- 鍑哄簱鍗曞彿锛�</div>
- <lightning-output-field field-name="Name"
- variant="label-hidden"></lightning-output-field>
- </div>
- </lightning-layout-item>
- <lightning-layout-item size="4" padding="around-small">
- <!-- <lightning-output-field
- field-name="ShipmentAccount__c" class="hideHelpText"></lightning-output-field> -->
- <div
- class="slds-grid slds-grid_vertical-align-center hehe-layoutItem">
- <div class="slds-form-element__label" style="padding: 0px;">
- 瀹㈡埛鍚嶏細</div>
- <lightning-output-field field-name="ShipmentAccount__c"
- variant="label-hidden"></lightning-output-field>
- </div>
- </lightning-layout-item>
- <lightning-layout-item size="2" padding="around-small">
- <!-- <lightning-output-field
- field-name="Order_ForCustomerText__c"></lightning-output-field> -->
- <div class="slds-grid slds-grid_vertical-align-center">
- <div class="slds-form-element__label" style="padding: 0px;">
- 绉戝锛�</div>
- <lightning-output-field
- field-name="Order_ForCustomerText__c"
- variant="label-hidden"></lightning-output-field>
- </div>
- </lightning-layout-item>
- <lightning-layout-item size="2" padding="around-small">
- <!-- <lightning-output-field
- field-name="SummonsForDirction__c"></lightning-output-field> -->
- <div class="slds-grid slds-grid_vertical-align-center">
- <div class="slds-form-element__label" style="padding: 0px;">
- 鐩殑锛�</div>
- <lightning-output-field field-name="SummonsForDirction__c"
- variant="label-hidden"></lightning-output-field>
->>>>>>> LEXCommunityLiJun
</div>
</lightning-layout-item>
</lightning-layout>
@@ -2594,7 +1742,6 @@
<div class="borderCss">
<div class="headerDorderCss">
<lightning-layout>
-<<<<<<< HEAD
<lightning-layout-item
padding="around-small"
>
@@ -2602,17 +1749,11 @@
<strong
>BarCode褰曞叆</strong
>
-=======
- <lightning-layout-item padding="around-small">
- <p style="font-size: 18px">
- <strong>BarCode褰曞叆</strong>
->>>>>>> LEXCommunityLiJun
</p>
</lightning-layout-item>
</lightning-layout>
</div>
<div style="padding: 7px">
-<<<<<<< HEAD
<div
lwc:dom="manual"
class="resultDiv"
@@ -2631,21 +1772,11 @@
<lightning-layout-item
padding="around-small"
>
-=======
- <div lwc:dom="manual" class="resultDiv"></div>
- <div draggable="false">
- <lightning-record-edit-form object-api-name="Consumable_order__c"
- record-id={cocId}>
- <lightning-layout multiple-rows="true">
- <lightning-layout-item size="1"></lightning-layout-item>
- <lightning-layout-item padding="around-small">
->>>>>>> LEXCommunityLiJun
<!-- <lightning-textarea name="Barcode" label="BarCode鍙�"
onchange={dataChange} variant="label-inline"
data-field="Barcode"
value={Barcode}></lightning-textarea> -->
-<<<<<<< HEAD
<div
class="slds-grid"
>
@@ -2676,31 +1807,14 @@
<div
class="slds-form-element__label"
>
-=======
- <div class="slds-grid">
- <div class="slds-form-element__label">BarCode鍙�</div>
- <lightning-textarea name="Barcode" label="BarCode鍙�"
- onchange={dataChange} variant="label-hidden"
- data-field="Barcode" value={Barcode}
- style="min-width: 400px;"></lightning-textarea>
- </div>
- </lightning-layout-item>
- <lightning-layout-item padding="around-small">
- <div class="slds-grid slds-grid_vertical-align-center">
- <div class="slds-form-element__label">
->>>>>>> LEXCommunityLiJun
<!-- <lightning-button label="纭"
onclick={SalesearchProductJs}></lightning-button> -->
<button
class="slds-button slds-button_neutral slds-button_stretch lexBorder"
-<<<<<<< HEAD
onclick={SalesearchProductJs}
>
鑾峰彇鏄庣粏
</button>
-=======
- onclick={SalesearchProductJs}>鑾峰彇鏄庣粏</button>
->>>>>>> LEXCommunityLiJun
</div>
</div>
</lightning-layout-item>
@@ -2714,13 +1828,9 @@
<div class="borderCss">
<div class="headerDorderCss">
<lightning-layout>
-<<<<<<< HEAD
<lightning-layout-item
padding="around-small"
>
-=======
- <lightning-layout-item padding="around-small">
->>>>>>> LEXCommunityLiJun
<p style="font-size: 18px">
<strong>鍑鸿揣鏄庣粏</strong>
</p>
@@ -2728,21 +1838,16 @@
</lightning-layout>
</div>
<div style="padding: 7px">
-<<<<<<< HEAD
<div
lwc:dom="manual"
class="resultDiv"
></div>
-=======
- <div lwc:dom="manual" class="resultDiv"></div>
->>>>>>> LEXCommunityLiJun
<div draggable="false">
<!-- <lightning-datatable key-field="id" data={salesData} columns={salesColumns}
hide-checkbox-column
style="word-wrap:break-word; word-break:break-all; "
class="wrapped-header-datatable">
</lightning-datatable> -->
-<<<<<<< HEAD
<c-lex-custom-lightning-datatable
key-field="Id"
data={salesData}
@@ -2755,13 +1860,6 @@
"
class="wrapped-header-datatable"
>
-=======
- <c-lex-custom-lightning-datatable key-field="Id" data={salesData}
- columns={salesColumns} onoutboundcount={handleOutboundCount}
- hide-checkbox-column
- style="word-wrap:break-word; word-break:break-all; "
- class="wrapped-header-datatable">
->>>>>>> LEXCommunityLiJun
</c-lex-custom-lightning-datatable>
</div>
</div>
@@ -2770,7 +1868,6 @@
<div class="borderCss">
<div class="headerDorderCss">
<lightning-layout>
-<<<<<<< HEAD
<lightning-layout-item
padding="around-small"
>
@@ -2778,17 +1875,11 @@
<strong
>鍑鸿揣閿欒鏄庣粏</strong
>
-=======
- <lightning-layout-item padding="around-small">
- <p style="font-size: 18px">
- <strong>鍑鸿揣閿欒鏄庣粏</strong>
->>>>>>> LEXCommunityLiJun
</p>
</lightning-layout-item>
</lightning-layout>
</div>
<div style="padding: 7px">
-<<<<<<< HEAD
<div
lwc:dom="manual"
class="resultDiv"
@@ -2805,21 +1896,12 @@
"
class="wrapped-header-datatable"
>
-=======
- <div lwc:dom="manual" class="resultDiv"></div>
- <div draggable="false">
- <lightning-datatable key-field="id" data={salesErrorData}
- columns={salesErrorColumns} hide-checkbox-column
- style="word-wrap:break-word; word-break:break-all; "
- class="wrapped-header-datatable">
->>>>>>> LEXCommunityLiJun
</lightning-datatable>
</div>
</div>
</div>
<lightning-layout multiple-rows="true">
-<<<<<<< HEAD
<lightning-layout-item
class="hehe-layoutItem"
size="4"
@@ -2857,27 +1939,6 @@
class="hehe-layoutItem"
size="4"
>
-=======
- <lightning-layout-item class="hehe-layoutItem" size="4">
- </lightning-layout-item>
- <template if:true={isSales}>
- <lightning-layout-item class="hehe-layoutItem" size="4">
- <!-- <lightning-button label="閿�鍞�" onclick={SaveP}></lightning-button> -->
- <button
- class="slds-button slds-button_neutral slds-button_stretch lexBorder"
- onclick={SaveP}>閿�鍞�</button>
- </lightning-layout-item>
- </template>
- <template if:false={isSales}>
- <lightning-layout-item class="hehe-layoutItem" size="4">
- <!-- <lightning-button label="鍑鸿揣" onclick={SaveE}></lightning-button> -->
- <button
- class="slds-button slds-button_neutral slds-button_stretch lexBorder"
- onclick={SaveE}>鍑鸿揣</button>
- </lightning-layout-item>
- </template>
- <lightning-layout-item class="hehe-layoutItem" size="4">
->>>>>>> LEXCommunityLiJun
</lightning-layout-item>
</lightning-layout>
</template>
@@ -2887,8 +1948,4 @@
</template>
</div>
</div>
-<<<<<<< HEAD
</template>
-=======
-</template>
->>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1