From adbebf3a7d4e0d916d35ef0998cf949c7e63acf1 Mon Sep 17 00:00:00 2001
From: 19626 <1962676589@qq.com>
Date: 星期一, 26 六月 2023 17:24:28 +0800
Subject: [PATCH] Merge branch 'LEX_chenjingwu_dev' of http://47.92.229.245:8089/r/lightningupdate into LEX_chenjingwu_dev
---
force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.html | 44 +++++++++++++-------------------------------
1 files changed, 13 insertions(+), 31 deletions(-)
diff --git a/force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.html b/force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.html
index f15649e..baa2d12 100644
--- a/force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.html
+++ b/force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.html
@@ -4,7 +4,7 @@
* @Author: chen jing wu
* @Date: 2023-04-20 17:16:48
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-05-31 11:44:24
+ * @LastEditTime: 2023-06-25 17:28:26
-->
<template>
@@ -18,19 +18,14 @@
<div style="margin-left: 550px;">
<lightning-layout-item size="12">
<lightning-button label="杩藉姞鍝佺墝" onclick={addBrandJs}></lightning-button>
- <template if:true={isEdit}>
- <lightning-button name="save" label="淇濆瓨1" onclick={saveBrandToEditJs}></lightning-button>
- </template>
- <template if:false={isEdit}>
- <lightning-button name="save" label="淇濆瓨" onclick={saveBrandJs}></lightning-button>
- </template>
+ <lightning-button name="save" label="淇濆瓨" onclick={saveBrandJs}></lightning-button>
<lightning-button label="杩斿洖璇环" onclick={cancel}></lightning-button>
</lightning-layout-item>
</div>
</lightning-layout>
<div style="margin-top: 5px">
<lightning-layout>
- <lightning-layout-item size="2" padding="around-small">
+ <lightning-layout-item size="3" padding="around-small">
<div class="slds-form_horizontal my-combobox">
<label class="slds-form-element__label">澶卞崟绫诲瀷锛�</label>
<lightning-combobox name="progress" value={LostReport.lostReport.LostType__c} options={RecordTypeOptions}
@@ -38,7 +33,7 @@
</lightning-combobox>
</div>
</lightning-layout-item>
- <lightning-layout-item size="3" padding="around-small">
+ <lightning-layout-item size="4" padding="around-small">
<div style="padding: 10px 3px;font: 16px;">澶卞崟鎬婚噾棰濓紙鍏冿級:{LostReport.lostReport.LostTotalAmount__c}</div>
</lightning-layout-item>
<lightning-layout-item size="3" padding="around-small">
@@ -50,14 +45,9 @@
</lightning-layout>
<lightning-accordion allow-multiple-sections-open class="myAccordion">
<template for:each={LostReport.LostBrands} for:item="brand" for:index="i">
- <li key={brand.index}>
+ <li key={brand}>
<lightning-accordion-section class="" data-id={i} name="澶卞崟鍝佺墝" label="澶卞崟鍝佺墝">
- <template if:true={isEdit}>
- <lightning-button name="save" label="淇濆瓨1" onclick={saveBrandToEditJs}></lightning-button>
- </template>
- <template if:false={isEdit}>
- <lightning-button name="save" label="淇濆瓨" onclick={saveBrandJs}></lightning-button>
- </template>
+ <lightning-button name="save" label="淇濆瓨" onclick={saveBrandJs}></lightning-button>
<lightning-button name={i} label="鍒犻櫎" onclick={deleteBrandJs} disabled={isBrandCount2}></lightning-button>
<lightning-layout>
<lightning-layout-item size="4" padding="around-small">
@@ -119,7 +109,7 @@
<template for:each={brand.LostProducts} for:item="product" for:index="j">
<tr class="inputRows" key={product}>
<td>
- <lightning-combobox placeholder={product.LostProductss.LostBrandName__c} class="BrandName" name={j} title={i} options={brandOptions} value={product.LostProductss.LostBrandName__c} onchange={handleLostBrandNameChange} read-only="true"></lightning-combobox>
+ <lightning-combobox placeholder={product.LostProductss.LostBrandName__c} data-id={i} class="BrandName" name={j} title={i} options={brandOptions} value={product.LostProductss.LostBrandName__c} onchange={handleLostBrandNameChange} read-only="true"></lightning-combobox>
</td>
<td>
<!-- <lightning-record-edit-form
@@ -169,12 +159,7 @@
<div class="slds-align_absolute-center">
<lightning-layout-item size="12">
<lightning-button label="杩藉姞鍝佺墝" onclick={addBrandJs}></lightning-button>
- <template if:true={isEdit}>
- <lightning-button name="save" label="淇濆瓨1" onclick={saveBrandToEditJs}></lightning-button>
- </template>
- <template if:false={isEdit}>
- <lightning-button name="save" label="淇濆瓨" onclick={saveBrandJs}></lightning-button>
- </template>
+ <lightning-button name="save" label="淇濆瓨" onclick={saveBrandJs}></lightning-button>
<lightning-button label="杩斿洖璇环" onclick={cancel}></lightning-button>
</lightning-layout-item>
</div>
@@ -204,7 +189,7 @@
<label>澶卞崟绫诲瀷:</label>
</lightning-layout-item>
<lightning-layout-item size="1">
- <lightning-record-view-form object-api-name="Lost_cancel_report__c" record-id={reportId} density="comfy">
+ <lightning-record-view-form object-api-name="Lost_cancel_report__c" record-id={LostReport.lostReport.Id} density="comfy">
<lightning-output-field field-name="LostType__c" variant="label-hidden"></lightning-output-field>
</lightning-record-view-form>
</lightning-layout-item>
@@ -213,7 +198,7 @@
<label>澶卞崟鎬婚噾棰濓紙鍏冿級:</label>
</lightning-layout-item>
<lightning-layout-item size="1">
- <lightning-record-view-form object-api-name="Lost_cancel_report__c" record-id={reportId} density="comfy">
+ <lightning-record-view-form object-api-name="Lost_cancel_report__c" record-id={LostReport.lostReport.Id} density="comfy">
<lightning-output-field field-name="LostTotalAmount__c" variant="label-hidden"></lightning-output-field>
</lightning-record-view-form>
</lightning-layout-item>
@@ -222,7 +207,7 @@
<label>鍖呭惈瓒呭０:</label>
</lightning-layout-item>
<lightning-layout-item size="1">
- <lightning-record-view-form object-api-name="Lost_cancel_report__c" record-id={reportId} density="comfy">
+ <lightning-record-view-form object-api-name="Lost_cancel_report__c" record-id={LostReport.lostReport.Id} density="comfy">
<lightning-output-field field-name="InclusionUltrasound__c" variant="label-hidden"></lightning-output-field>
</lightning-record-view-form>
</lightning-layout-item>
@@ -231,14 +216,14 @@
<label>鐘舵��:</label>
</lightning-layout-item>
<lightning-layout-item size="1">
- <lightning-record-view-form object-api-name="Lost_cancel_report__c" record-id={reportId} density="comfy">
+ <lightning-record-view-form object-api-name="Lost_cancel_report__c" record-id={LostReport.lostReport.Id} density="comfy">
<lightning-output-field field-name="Report_Status__c" variant="label-hidden"></lightning-output-field>
</lightning-record-view-form>
</lightning-layout-item>
</lightning-layout>
<lightning-accordion allow-multiple-sections-open class="myAccordion">
<template for:each={LostReport.LostBrands} for:item="brand" for:index="i">
- <li key={brand.index}>
+ <li key={brand}>
<lightning-accordion-section class="text-container" data-id={i} name="澶卞崟鍝佺墝" label="澶卞崟鍝佺墝">
<lightning-layout>
<lightning-layout-item size="2" style="border-style:solid;border-width: 1px;">
@@ -322,9 +307,6 @@
</lightning-layout-item>
</div>
</lightning-layout>
- <template if:true={isSubmit}>
- <div>...test...</div>
- </template>
</div>
</div>
</lightning-card>
--
Gitblit v1.9.1