From 25f056535350a0b80bad50d2cc45311998e5d1cd Mon Sep 17 00:00:00 2001
From: 19626 <1962676589@qq.com>
Date: 星期一, 09 十月 2023 18:28:00 +0800
Subject: [PATCH] 近期修改

---
 force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.html |  377 +++++++++++++++++++++++++++++++++++------------------
 1 files changed, 246 insertions(+), 131 deletions(-)

diff --git a/force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.html b/force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.html
index 1cd0435..66e4503 100644
--- a/force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.html
+++ b/force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.html
@@ -2,9 +2,17 @@
  * @Description: 
  * @version: 
  * @Author: chen jing wu
+ * @Date: 2023-09-09 13:27:59
+ * @LastEditors: chen jing wu
+ * @LastEditTime: 2023-10-09 17:10:13
+-->
+<!--
+ * @Description: 
+ * @version: 
+ * @Author: chen jing wu
  * @Date: 2023-04-20 17:16:48
  * @LastEditors: chen jing wu
- * @LastEditTime: 2023-10-03 12:02:30
+ * @LastEditTime: 2023-10-07 15:50:52
 -->
 <template>
     <div if:true={IsLoading}>
@@ -15,10 +23,10 @@
     <template if:true={visible}>
         <template if:true={isSuccess}>
             <div class="slds-notify_container slds-is-relative" style="position:absolute;top:1rem;left:1rem;right:1rem;position: fixed;z-index: 9999;">
-                <div class="slds-notify slds-notify_toast slds-theme_success" role="status">
+                <div class="slds-notify slds-notify_toast slds-theme_success" role="status" style="top: 130px;">
                     <lightning-icon class="white" icon-name="utility:success" alternative-text="success"  variant="inverse" size="small" ></lightning-icon>
                   <div class="slds-notify__content"  style="padding-left: 20px;">
-                    <h2 style="color:white;font-size:large">{message}</h2>
+                    <span class="toastMessage forceActionsText">{message}</span>
                   </div>
                   <div class="slds-notify__close">
                     <lightning-button-icon icon-name="utility:close"  variant="bare-inverse" size="large" onclick={closeAction}></lightning-button-icon>
@@ -49,10 +57,10 @@
                 </div>
             </div> -->
             <div class="slds-notify_container slds-is-relative" style="position:absolute;top:1rem;left:1rem;right:1rem;position: fixed;z-index: 9999;">
-                <div class="slds-notify slds-notify_toast slds-theme_error" role="status">
+                <div class="slds-notify slds-notify_toast slds-theme_error" role="status" style="background-color: #BA0517;top: 130px;">
                     <lightning-icon class="white" icon-name="utility:error"  size="small" variant="inverse"></lightning-icon>
                   <div class="slds-notify__content" style="padding-left: 20px;">
-                    <h2 style="color:white;font-size:large">{message}</h2>
+                    <span class="toastMessage forceActionsText">{message}</span>
                   </div>
                   <div class="slds-notify__close"> 
                     <lightning-button-icon icon-name="utility:close" variant="bare-inverse" size="large" onclick={closeAction}></lightning-button-icon>
@@ -67,13 +75,12 @@
                 <div style="padding: 0 20px">
                     <div class="slds-box slds-p-around_medium slds-text-align_center">
                         <lightning-layout>
-                            <lightning-layout-item>
-                                <div class="mainTitle" style="padding: 10px 3px;font-weight: bold;font-size: large">澶卞崟鎶ュ憡缂栬緫椤甸潰</div>
-                            </lightning-layout-item>
-                                <lightning-layout-item alignment-bump="left">
-                                    <lightning-button class="slds-button lexBorder" label="杩藉姞鍝佺墝" onclick={addBrandJs}></lightning-button>
-                                    <lightning-button class="slds-button lexBorder1" name="save" label="淇濆瓨" onclick={saveBrandJs}></lightning-button>
-                                    <lightning-button class="slds-button lexBorder" label="杩斿洖璇环" onclick={cancel}></lightning-button>
+                            <div class="mainTitle" style="padding: 10px 3px;font-weight: bold;font-size: large">澶卞崟鎶ュ憡缂栬緫椤甸潰</div>
+                            
+                                <lightning-layout-item class="slds-align_absolute-center" style="padding-right: 143px;">
+                                    <lightning-button class="slds-button "  label="杩藉姞鍝佺墝" onclick={addBrandJs}></lightning-button>
+                                    <lightning-button class="slds-button  "  name="save" label="淇濆瓨" onclick={saveBrandJs}></lightning-button>
+                                    <lightning-button class="slds-button "  label="杩斿洖璇环" onclick={cancel}></lightning-button>
                                 </lightning-layout-item>
                         </lightning-layout>
                     </div>
@@ -84,14 +91,14 @@
                                     <div style="padding: 10px 3px;font: 16px;float: left">
                                         <span style="color:red;font-size: 10px;">*</span>
                                         澶卞崟绫诲瀷锛�</div>
-                                    <div style="float: left;padding-top: 17px;">
+                                    <div style="float: left;">
                                         <lightning-combobox name="progress" value={LostReport.lostReport.LostType__c} options={RecordTypeOptions} 
-                                        onchange={handleLostTypeChange} class="searchField" style="bottom: 16px;">
+                                        onchange={handleLostTypeChange} class="searchField" style="padding-top: 4px;" variant="label-hidden">
                                         </lightning-combobox> 
                                     </div>
                                 </lightning-layout-item>
                                 <lightning-layout-item size="4" padding="around-small">
-                                    <div style="padding: 10px 3px;font: 16px;">澶卞崟鎬婚噾棰濓紙鍏冿級:
+                                    <div style="padding: 10px 3px;font: 16px;">澶卞崟鎬婚噾棰�(鍏�):
                                         <span style="margin-left: 5px;">{LostReport.lostReport.LostTotalAmount__c}</span>
                                         <!-- {LostReport.lostReport.LostTotalAmount__c} -->
                                     </div>
@@ -118,34 +125,49 @@
                                                     <lightning-accordion-section  class="" data-id={i} name={brand.brandTitle} label={brand.brandTitle} active>
                                                         <lightning-layout>
                                                             <lightning-layout-item alignment-bump="left">
-                                                                <lightning-button style="margin-top: 10px;" class="slds-button lexBorder1" name="save" label="淇濆瓨" onclick={saveBrandJs}></lightning-button>
-                                                                <lightning-button class="slds-button lexBorder1" name={i} label="鍒犻櫎" onclick={deleteBrandJs} disabled={isBrandCount2}></lightning-button>
+                                                                <lightning-button style="margin-top: 10px;" class="slds-button "  name="save" label="淇濆瓨" onclick={saveBrandJs}></lightning-button>
+                                                                <lightning-button  class="slds-button " name={i} label="鍒犻櫎" onclick={deleteBrandJs} disabled={isBrandCount2}></lightning-button>
                                                             </lightning-layout-item>
                                                         </lightning-layout>
                                                         <lightning-layout>
                                                             <lightning-layout-item size="4" padding="around-small">
                                                                 <template if:true={isEdit}>
-                                                                    <c-multi-select-combobox name={i} onselect={setBrandMannualName} data-id="Lost_By_Company" class="mycombobox" options={brandOptions} selected-value={reasonValue} label="澶卞崟鍝佺墝: " placeholder={brand.lostBrand.Lost_By_Company__c} required></c-multi-select-combobox>
+                                                                    <c-multi-select-combobox name={i} onselect={setBrandMannualName} data-id="Lost_By_Company" class="mycombobox" options={brandOptions} selected-value={brand.lostBrand.Lost_By_Company__c} label="澶卞崟鍝佺墝: "  required></c-multi-select-combobox>
                                                                 </template>
                                                                 <template if:false={isEdit}>
                                                                     <c-multi-select-combobox name={i} onselect={setBrandMannualName} data-id="Lost_By_Company" class="mycombobox" options={brandOptions} selected-value={reasonValue} label="澶卞崟鍝佺墝: " required></c-multi-select-combobox>
                                                                 </template> 
                                                             </lightning-layout-item>
                                                             <lightning-layout-item size="4"  padding="around-small">
-                                                                <lightning-combobox name={i} label="澶卞崟鍘熷洜锛堜富锛�:" value={brand.lostBrand.Lost_reason_main__c} options={columns2s} 
+                                                                <lightning-combobox name={i} label="澶卞崟鍘熷洜(涓�):" value={brand.lostBrand.Lost_reason_main__c} options={columns2s} 
                                                                 onchange={handleLostReasonMainChange} class="searchField" placeholder="--鏃�--" required></lightning-combobox>
                                                             </lightning-layout-item>
                                                             <lightning-layout-item size="4"  padding="around-small">
-                                                                <lightning-combobox name={i} label="澶卞崟鍘熷洜锛堟锛�:" value={brand.lostBrand.Lost_Reason_Sub__c} options={columns2s} 
+                                                                <lightning-combobox name={i} label="澶卞崟鍘熷洜(娆�):" value={brand.lostBrand.Lost_Reason_Sub__c} options={columns2s} 
                                                                 onchange={handleLostReasonSubChange} class="searchField" placeholder="--鏃�--"></lightning-combobox>
                                                             </lightning-layout-item>
                                                         </lightning-layout>
                                                         <lightning-layout> 
+                                                            <template if:true={isEdit}>
+                                                                <template if:true={brand.lostBrand.Lost_By_Company_Mannual__c}>
+                                                                    <lightning-layout-item size="4" padding="horizontal-small">
+                                                                        <lightning-input name={i} data-id="Lost_By_Company_Mannual" value={brand.lostBrand.Lost_By_Company_Mannual__c} type="text" label="澶卞崟鍝佺墝(鎵嬪姩): " class="searchField" onchange={handleLostByCompanyMannualChange}></lightning-input>
+                                                                    </lightning-layout-item>
+                                                                </template>
+                                                                <template if:false={brand.lostBrand.Lost_By_Company_Mannual__c}>
+                                                                    <lightning-layout-item size="4" padding="horizontal-small">
+                                                                        <lightning-input disabled="true" name={i} data-id="Lost_By_Company_Mannual" value={brand.lostBrand.Lost_By_Company_Mannual__c} type="text" label="澶卞崟鍝佺墝(鎵嬪姩): " class="searchField" onchange={handleLostByCompanyMannualChange}></lightning-input>
+                                                                    </lightning-layout-item>
+                                                                </template>
+                                                            </template>
+                                                            <template if:false={isEdit}>
+                                                                <lightning-layout-item size="4" padding="horizontal-small">
+                                                                    <lightning-input name={i} data-id="Lost_By_Company_Mannual" value={brand.lostBrand.Lost_By_Company_Mannual__c} type="text" label="澶卞崟鍝佺墝(鎵嬪姩): " class="searchField" onchange={handleLostByCompanyMannualChange}></lightning-input>
+                                                                </lightning-layout-item>
+                                                            </template>
+                                                            
                                                             <lightning-layout-item size="4" padding="horizontal-small">
-                                                                <lightning-input name={i} data-id="Lost_By_Company_Mannual" value={brand.lostBrand.Lost_By_Company_Mannual__c} type="text" label="澶卞崟鍝佺墝锛堟墜鍔級: " class="searchField" onchange={handleLostByCompanyMannualChange}></lightning-input>
-                                                            </lightning-layout-item>
-                                                            <lightning-layout-item size="4" padding="horizontal-small">
-                                                                <lightning-input data-id="TotalAmount" name={i} value={brand.lostBrand.LostPrice__c} type="number" label="澶卞崟閲戦锛堝厓锛�: " class="searchField" onchange={handleLostPriceOutChange} required></lightning-input>
+                                                                <lightning-input data-id="TotalAmount" name={i} value={brand.lostBrand.LostPrice__c} type="number" label="澶卞崟閲戦(鍏�): " class="searchField" onchange={handleLostPriceOutChange} required></lightning-input>
                                                             </lightning-layout-item>
                                                             <lightning-layout-item size="4" padding="horizontal-small">
                                                                 <lightning-record-edit-form
@@ -158,7 +180,7 @@
                                                         </lightning-layout>
                                                         <lightning-layout>
                                                             <lightning-layout-item size="4" padding="horizontal-small">
-                                                                <lightning-input name={i} value={brand.lostBrand.AgencyMannual__c} type="text" label="涓爣缁忛攢鍟嗭紙鎵嬪姩锛�:" class="searchField" onchange={handleAgencyMannualOutChange}></lightning-input>                                                         
+                                                                <lightning-input name={i} value={brand.lostBrand.AgencyMannual__c} type="text" label="涓爣缁忛攢鍟�(鎵嬪姩):" class="searchField" onchange={handleAgencyMannualOutChange}></lightning-input>                                                         
                                                             </lightning-layout-item>
                                                             <template if:true={brand.reasonFlag}>
                                                                 <lightning-layout-item size="4" padding="horizontal-small">
@@ -194,12 +216,12 @@
                                                                             <tbody>
                                                                                 <template for:each={brand.LostProducts} for:item="product" for:index="j">
                                                                                     <tr class="inputRows" key={product.lineNo2}>
-                                                                                        <td>
-                                                                                           <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 style="padding-left: 8px;">
+                                                                                           <lightning-combobox variant="label-hidden" 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>
                                                                                             <template if:true={isEdit}>
-                                                                                                <div style="padding-top: 4px;">
+                                                                                                <div>
                                                                                                     <template if:false={product.LostProductss.LostProduct__r}>
                                                                                                         <c-lex-lookup-lwc onbuttonclick={handleCustomButtonClick} class="Product" data-id={i} title={i} name={j} iconname="standard:product_item" query-brand={product.LostProductss.LostBrandName__c} objectname="Product2" onchange={handleClear} onselected={handleSelected} init-value={product.productName} style="margin-bottom: 17px;"></c-lex-lookup-lwc>
                                                                                                     </template>
@@ -209,20 +231,25 @@
                                                                                                 </div> 
                                                                                             </template>
                                                                                             <template if:false={isEdit}>
-                                                                                                <div style="padding-top: 4px;">
+                                                                                                <div>
                                                                                                     <c-lex-lookup-lwc onbuttonclick={handleCustomButtonClick} class="Product" data-id={i} title={i} name={j} iconname="standard:product_item" query-brand={product.LostProductss.LostBrandName__c} objectname="Product2" onchange={handleClear} onselected={handleSelected} style="margin-bottom: 17px;"></c-lex-lookup-lwc>
                                                                                                 </div>
                                                                                             </template>
                                                                                         </td>
                                                                                         <td style="width: 5%;">
-                                                                                           <lightning-input class="Quantity" title={i} name={j} value={product.LostProductss.Quantity__c} onchange={handleQuantityChange} style=""></lightning-input>
+                                                                                           <lightning-input variant="label-hidden" class="Quantity" title={i} name={j} value={product.LostProductss.Quantity__c} onchange={handleQuantityChange} style=""></lightning-input>
                                                                                         </td>
                                                                                         <td>
-                                                                                            <lightning-input class="LostProductMannual" title={i} name={j} value={product.LostProductss.LostProductMannual__c} onchange={handleLostProductMannualChange} style=""></lightning-input>
+                                                                                            <lightning-input variant="label-hidden" class="LostProductMannual" title={i} name={j} value={product.LostProductss.LostProductMannual__c} onchange={handleLostProductMannualChange} style=""></lightning-input>
                                                                                         </td>
                                                                                         <td>
                                                                                             <template if:true={isEdit}>
-                                                                                                <lightning-combobox read-only="true" class="ProductClass" data-id={i} placeholder="--鏃�--" title={i} name={j} options={productClassOptions} value={product.LostProductss.ProductClass__c} onchange={handleProductClassChange}></lightning-combobox> 
+                                                                                                <template if:true={product.LostProductss.ProductClass__c}>
+                                                                                                    <lightning-combobox variant="label-hidden" read-only="true" class="ProductClass" data-id={i} placeholder="--鏃�--" title={i} name={j} options={productClassOptions} value={product.LostProductss.ProductClass__c} onchange={handleProductClassChange}></lightning-combobox> 
+                                                                                                </template>
+                                                                                                <template if:false={product.LostProductss.ProductClass__c}>
+                                                                                                    <lightning-combobox variant="label-hidden"  class="ProductClass" data-id={i} placeholder="--鏃�--" title={i} name={j} options={productClassOptions} value={product.LostProductss.ProductClass__c} onchange={handleProductClassChange}></lightning-combobox> 
+                                                                                                </template>
                                                                                                 <!-- <template if:true={product.LostProductss.ProductClass__c}>
                                                                                                     <lightning-combobox read-only="true" class="ProductClass" data-id={i} placeholder="--鏃�--" title={i} name={j} options={productClassOptions} value={product.LostProductss.ProductClass__c} onchange={handleProductClassChange}></lightning-combobox> 
                                                                                                 </template>
@@ -232,16 +259,16 @@
                                                                                             </template>
                                                                                             
                                                                                             <template if:false={isEdit}>
-                                                                                                <lightning-combobox class="ProductClass" data-id={i} placeholder="--鏃�--" title={i} name={j} options={productClassOptions} value={product.LostProductss.ProductClass__c} onchange={handleProductClassChange}></lightning-combobox> 
+                                                                                                <lightning-combobox variant="label-hidden" class="ProductClass" data-id={i} placeholder="--鏃�--" title={i} name={j} options={productClassOptions} value={product.LostProductss.ProductClass__c} onchange={handleProductClassChange}></lightning-combobox> 
                                                                                             </template>
                                                                                         </td>
                                                                                         <td>
                                                                                            
                                                                                             <template if:true={isEdit}>
-                                                                                                <lightning-combobox class="ProductCategory" data-id={i} placeholder={product.LostProductss.ProductCategory__c} title={i} name={j} options={product.productOptions} value={product.LostProductss.ProductCategory__c} onchange={handleProductCategoryChange} read-only="true"></lightning-combobox> 
+                                                                                                <lightning-combobox variant="label-hidden" class="ProductCategory" data-id={i} placeholder={product.LostProductss.ProductCategory__c} title={i} name={j} options={product.productOptions} value={product.LostProductss.ProductCategory__c} onchange={handleProductCategoryChange} read-only="true"></lightning-combobox> 
                                                                                             </template>
                                                                                             <template if:false={isEdit}>
-                                                                                                <lightning-combobox class="ProductCategory" data-id={i} placeholder="--鏃�--" title={i} name={j} options={product.productOptions} value={product.LostProductss.ProductCategory__c} onchange={handleProductCategoryChange} read-only="true"></lightning-combobox> 
+                                                                                                <lightning-combobox variant="label-hidden" class="ProductCategory" data-id={i} placeholder="--鏃�--" title={i} name={j} options={product.productOptions} value={product.LostProductss.ProductCategory__c} onchange={handleProductCategoryChange} read-only="true"></lightning-combobox> 
                                                                                             </template>
                                                                                         </td>
                                         
@@ -275,9 +302,9 @@
                             <lightning-layout style="margin-top: 20px;">
                                 <div class="slds-align_absolute-center">
                                     <lightning-layout-item size="12">
-                                        <lightning-button class="slds-button lexBorder" label="杩藉姞鍝佺墝" onclick={addBrandJs}></lightning-button>
-                                        <lightning-button class="slds-button lexBorder1" name="save" label="淇濆瓨" onclick={saveBrandJs}></lightning-button>
-                                        <lightning-button class="slds-button lexBorder" label="杩斿洖璇环" onclick={cancel}></lightning-button>
+                                        <lightning-button  class="slds-button " label="杩藉姞鍝佺墝" onclick={addBrandJs}></lightning-button>
+                                        <lightning-button  class="slds-button " name="save" label="淇濆瓨" onclick={saveBrandJs}></lightning-button>
+                                        <lightning-button  class="slds-button " label="杩斿洖璇环" onclick={cancel}></lightning-button>
                                     </lightning-layout-item>
                                 </div>
                             </lightning-layout>
@@ -291,18 +318,17 @@
                     <div style="padding: 0 20px">
                         <div class="slds-box slds-p-around_medium slds-text-align_center">
                             <lightning-layout>
-                                <lightning-layout-item>
-                                    <div class="mainTitle" style="padding: 10px 3px;font-weight: bold;font-size: large">澶卞崟鎶ュ憡鏌ョ湅椤甸潰</div>
-                                </lightning-layout-item>
-                                    <lightning-layout-item alignment-bump="left">
+                                
+                                <h2 class="mainTitle" style="padding: 10px 3px;font-weight: bold;font-size: large">澶卞崟鎶ュ憡鏌ョ湅椤甸潰</h2>
+                                    <lightning-layout-item class="slds-align_absolute-center" style="padding-right: 143px;">
                                         <template if:true={isCanSubmit}>
-                                            <lightning-button class="slds-button lexBorder1" label="鎻愪氦" onclick={submitJs}></lightning-button>
+                                            <lightning-button class="slds-button " label="鎻愪氦" onclick={submitJs}></lightning-button>
                                             
                                         </template>
                                         <template if:true={isCanEdit}>
-                                            <lightning-button class="slds-button lexBorder1" name="缂栬緫" label="缂栬緫" onclick={editJs}></lightning-button>
+                                            <lightning-button  class="slds-button " name="缂栬緫" label="缂栬緫" onclick={editJs}></lightning-button>
                                         </template>
-                                        <lightning-button class="slds-button lexBorder" label="杩斿洖璇环" onclick={cancel}></lightning-button>
+                                        <lightning-button  class="slds-button " label="杩斿洖璇环" onclick={cancel}></lightning-button>
                                     </lightning-layout-item>
                             </lightning-layout>
                             <lightning-layout>
@@ -313,7 +339,7 @@
                                     </div>
                                 </lightning-layout-item>
                                 <lightning-layout-item size="3" padding="around-small">
-                                    <div style="float: left;padding-top: 17px;">澶卞崟鎬婚噾棰濓紙鍏冿級:
+                                    <div style="float: left;padding-top: 17px;">澶卞崟鎬婚噾棰�(鍏�):
                                         <span style="margin-left: 5px;">{LostReport.lostReport.LostTotalAmount__c}</span>
                                         <!-- {LostReport.lostReport.LostTotalAmount__c} -->
                                     </div>
@@ -361,7 +387,7 @@
                                                         </lightning-layout-item>
                                                         <lightning-layout-item size="3"></lightning-layout-item>
                                                         <lightning-layout-item style="width: 135px;">
-                                                            <label>澶卞崟鍝佺墝锛堟墜鍔級锛�</label>
+                                                            <label>澶卞崟鍝佺墝(鎵嬪姩)锛�</label>
                                                         </lightning-layout-item>
                                                         <lightning-layout-item size="3">
                                                             <lightning-record-view-form object-api-name="PCLLostBrand__c" record-id={brand.lostBrand.Id} density="comfy">
@@ -371,7 +397,7 @@
                                                     </lightning-layout>
                                                     <lightning-layout>
                                                         <lightning-layout-item style="width: 135px;height: 30px;">
-                                                            <label>澶卞崟鍘熷洜锛堜富锛夛細</label>
+                                                            <label>澶卞崟鍘熷洜(涓�)锛�</label>
                                                         </lightning-layout-item>
                                                         <lightning-layout-item size="3">
                                                             <lightning-record-view-form object-api-name="PCLLostBrand__c" record-id={brand.lostBrand.Id} density="comfy">
@@ -380,7 +406,7 @@
                                                         </lightning-layout-item>
                                                         <lightning-layout-item size="3"></lightning-layout-item>
                                                         <lightning-layout-item style="width: 135px;">
-                                                            <label>澶卞崟鍘熷洜锛堟锛夛細</label>
+                                                            <label>澶卞崟鍘熷洜(娆�)锛�</label>
                                                         </lightning-layout-item>
                                                         <lightning-layout-item size="3">
                                                             <lightning-record-view-form object-api-name="PCLLostBrand__c" record-id={brand.lostBrand.Id} density="comfy">
@@ -401,7 +427,7 @@
                                                         </lightning-layout-item>
                                                         <lightning-layout-item size="3"></lightning-layout-item>
                                                         <lightning-layout-item style="width: 135px;">
-                                                            <label>涓爣缁忛攢鍟嗭紙鎵嬪姩锛夛細</label>
+                                                            <label>涓爣缁忛攢鍟�(鎵嬪姩)锛�</label>
                                                         </lightning-layout-item>
                                                         <lightning-layout-item size="3">
                                                             <lightning-record-view-form object-api-name="PCLLostBrand__c" record-id={brand.lostBrand.Id} density="comfy">
@@ -411,7 +437,7 @@
                                                     </lightning-layout>
                                                     <lightning-layout>
                                                         <lightning-layout-item style="width: 135px;height: 30px;">
-                                                            <label>澶卞崟閲戦锛堝厓锛夛細</label>
+                                                            <label>澶卞崟閲戦(鍏�)锛�</label>
                                                         </lightning-layout-item>
                                                         <lightning-layout-item size="3">
                                                             <lightning-record-view-form object-api-name="PCLLostBrand__c" record-id={brand.lostBrand.Id} density="comfy">
@@ -451,7 +477,7 @@
                                                                 <tbody>
                                                                     <template for:each={brand.LostProducts} for:item="product" for:index="j">
                                                                         <tr class="inputRows" key={product.lineNo2}>
-                                                                            <td>
+                                                                            <td style="padding-left: 8px;">
                                                                                 <div>{product.LostProductss.LostBrandName__c}</div>
                                                                             </td>
                                                                             <template if:false={product.LostProductss.LostProduct__r}>
@@ -493,119 +519,209 @@
                                     <div class="slds-align_absolute-center">
                                         <lightning-layout-item size="12">
                                             <template if:true={isCanSubmit}>
-                                                <lightning-button class="slds-button lexBorder1" label="鎻愪氦" onclick={submitJs}></lightning-button>
+                                                <lightning-button  class="slds-button " label="鎻愪氦" onclick={submitJs}></lightning-button>
                                                 
                                             </template>
                                             <template if:true={isCanEdit}>
-                                                <lightning-button class="slds-button lexBorder1" name="缂栬緫" label="缂栬緫" onclick={editJs}></lightning-button>
+                                                <lightning-button  class="slds-button " name="缂栬緫" label="缂栬緫" onclick={editJs}></lightning-button>
                                             </template>
-                                            <lightning-button class="slds-button lexBorder" label="杩斿洖璇环" onclick={cancel}></lightning-button>
+                                            <lightning-button  class="slds-button " label="杩斿洖璇环" onclick={cancel}></lightning-button>
                                         </lightning-layout-item>
                                     </div>
                                 </lightning-layout>
                             </div> 
                         </div>
-                        <template if:true={haveApprovalHistorys}>
-                            <div class="slds-box slds-p-around_medium slds-text-align_center">
-                                <lightning-layout>
-                                    <lightning-layout-item>
-                                        <div class="mainTitle" style="padding: 10px 3px;font-weight: bold;font-size: large">鎵瑰噯鍘嗗彶</div>
-                                    </lightning-layout-item>
-                                    <lightning-layout-item alignment-bump="left">
-                                        <template if:false={isCaoAn}>
-                                            <lightning-button class="slds-button lexBorder1" label="鎵瑰噯" onclick={handleSubmitApp}></lightning-button>
-                                            <lightning-button class="slds-button lexBorder1" label="鎷掔粷" onclick={handleNoApp}></lightning-button>
-                                            <lightning-button class="slds-button lexBorder" label="閲嶆柊鍒嗛厤" onclick={handleReStartApp}></lightning-button>
-                                            <lightning-button class="slds-button lexBorder3" label="鎾ゅ洖鎵瑰噯璇锋眰" onclick={handleCancelApp}></lightning-button>
-                                        </template>
-                                    </lightning-layout-item>
-                                </lightning-layout>
-                                <lightning-layout>
-                                    <table class="custom-table slds-table slds-table_bordered slds-table_cell-buffer slds-var-m-bottom_large"> 
-                                        <thead>
-                                            <tr class="slds-text-title_caps">
-                                                    <!-- <th><div class="slds-truncate">鎿嶄綔</div></th> -->
-                                                    <th><div class="slds-truncate">鏃ユ湡</div></th>
-                                                    <th><div class="slds-truncate">鐘舵��</div></th>
-                                                    <th><div class="slds-truncate">琚垎閰嶄汉</div></th>
-                                                    <th><div class="slds-truncate">瀹為檯鎵瑰噯浜�</div></th>
-                                                    <th><div class="slds-truncate">璇勮</div></th>
-                                            </tr>
-                                        </thead>
-                                        <tbody>
-                                            <template for:each={LostReport.approvalHistorys} for:item="approvalHistory" for:index="j">
-                                                <tr class="inputRows" key={approvalHistory.Id}>
-                                                    <!-- <td>
-                                                        <template if:true={approvalHistory.IsPending}>
-                                                            <a onclick={onApproveChange}>閲嶆柊鍒嗛厤</a>
-                                                            <label>&nbsp;</label>
-                                                            <label>|</label>
-                                                            <a onclick={onApproveChange}>鎵瑰噯/鎷掔粷</a>
-                                                        </template>
-                                                    </td> -->
-                                                    <td>
-                                                        <div>{approvalHistory.CreatedDate}</div>
-                                                    </td>
-                                                    <td>
-                                                        <div>{approvalHistory.StepStatus}</div>
-                                                    </td>
-                                                    <td>
-                                                        <div>{approvalHistory.Actor.Name}</div>
-                                                    </td>
-                                                    <td>
-                                                        <div>{approvalHistory.OriginalActor.Name}</div>
-                                                    </td>
-                                                    <td>
-                                                        <div>{approvalHistory.Comments}</div>
-                                                    </td>
-                                                </tr>
-                                            </template>
-                                        </tbody>
-                                    </table>
-                                </lightning-layout>
-                            </div>
-                        </template>
+                        
                     </div>   
                 </lightning-card>
+        </template>
+        <template if:true={haveApprovalHistorys}>
+            <div class="slds-box slds-p-around_medium slds-text-align_center" style="background-color: white;margin-top: 10px;">
+                <lightning-layout>
+                    <lightning-layout-item>
+                        <div class="mainTitle" style="padding: 10px 3px;font-weight: bold;font-size: large">鎵瑰噯鍘嗗彶</div>
+                    </lightning-layout-item>
+                    <lightning-layout-item alignment-bump="left">
+                        <template if:false={isCaoAn}>
+                            <template if:true={isAllowUser}>
+                                <lightning-button  class="slds-button " label="鎵瑰噯" onclick={handleSubmitApp}></lightning-button>
+                                <lightning-button  class="slds-button " label="鎷掔粷" onclick={handleNoApp}></lightning-button>
+                                <lightning-button  class="slds-button " label="閲嶆柊鍒嗛厤" onclick={handleReStartApp}></lightning-button>
+                            </template>
+                            <template if:true={isSubmitUser}>
+                                <lightning-button  class="slds-button " label="鎾ゅ洖鎵瑰噯璇锋眰" onclick={handleCancelApp}></lightning-button>
+                            </template>
+                            
+                        </template>
+                    </lightning-layout-item>
+                </lightning-layout>
+                <lightning-layout>
+                    <table class="custom-table slds-table slds-table_bordered slds-table_cell-buffer slds-var-m-bottom_large"> 
+                        <thead>
+                            <tr class="slds-text-title_caps">
+                                    <!-- <th><div class="slds-truncate">鎿嶄綔</div></th> -->
+                                    <th><div class="slds-truncate">鏃ユ湡</div></th>
+                                    <th><div class="slds-truncate">鐘舵��</div></th>
+                                    <th><div class="slds-truncate">琚垎閰嶄汉</div></th>
+                                    <th><div class="slds-truncate">瀹為檯鎵瑰噯浜�</div></th>
+                                    <th><div class="slds-truncate">璇勮</div></th>
+                                    <th><div class="slds-truncate">鏁翠綋鐘舵��</div></th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <template for:each={LostReport.approvalHistorys} for:item="approvalHistory" for:index="j">
+                                <template if:true={approvalHistory.isRemoved}>
+                                    <tr class="inputRows" key={approvalHistory.Id}>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td>
+                                            <div style="background-color: #C0BEBC;">
+                                                <lightning-icon style="padding-left: 3px;" size="small" icon-name="utility:ban"></lightning-icon>
+                                                <span style="padding-left: 10px;">宸叉挙鍥�</span>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                </template>
+                                <template if:true={approvalHistory.isApproved}>
+                                    <tr class="inputRows" key={approvalHistory.Id}>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td>
+                                            <div style="background-color: #A1F78D;">
+                                                <lightning-icon style="padding-left: 3px;" size="small" icon-name="utility:success"></lightning-icon>
+                                                <span style="padding-left: 10px;">宸叉壒鍑�</span>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                </template>
+                                <template if:true={approvalHistory.isPending}>
+                                    <tr class="inputRows" key={approvalHistory.Id}>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td>
+                                            <div style="background-color: #FFD74B;">
+                                                <lightning-icon style="padding-left: 3px;" size="small" icon-name="utility:clock"></lightning-icon>
+                                                <span style="padding-left: 10px;">寰呭鐞�</span>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                </template>
+                                <template if:true={approvalHistory.isRejected}>
+                                    <tr class="inputRows" key={approvalHistory.Id}>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td></td>
+                                        <td>
+                                            <div style="background-color: #FB8A8C;">
+                                                <lightning-icon style="padding-left: 3px;" size="small" icon-name="utility:clear"></lightning-icon>
+                                                <span style="padding-left: 10px;">宸叉嫆缁�</span>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                </template>
+                                <tr class="inputRows" key={approvalHistory.Id} style="height: 33px;">
+                                    <!-- <td>
+                                        <template if:true={approvalHistory.IsPending}>
+                                            <a onclick={onApproveChange}>閲嶆柊鍒嗛厤</a>
+                                            <label>&nbsp;</label>
+                                            <label>|</label>
+                                            <a onclick={onApproveChange}>鎵瑰噯/鎷掔粷</a>
+                                        </template>
+                                    </td> -->
+                                    <td>
+                                        <div>{approvalHistory.CreatedDate}</div>
+                                    </td>
+                                    <td>
+                                        <div>{approvalHistory.StepStatus}</div>
+                                    </td>
+                                    <td>
+                                        <!-- <a href='/lightning/r/User/{approvalHistory.OriginalActor.Id}/view'>
+                                            <div>{approvalHistory.OriginalActor.Name}</div>
+                                        </a> -->
+                                        <c-lex-lightning-link link-id={approvalHistory.OriginalActor.Id} link-name={approvalHistory.OriginalActor.Name}></c-lex-lightning-link>
+                                    </td>
+                                    <td>
+                                        <!-- <a href='/lightning/r/User/{approvalHistory.OriginalActor.Id}/view'>
+                                            <div>{approvalHistory.Actor.Name}</div>
+                                        </a> -->
+                                        <c-lex-lightning-link link-id={approvalHistory.Actor.Id} link-name={approvalHistory.Actor.Name}></c-lex-lightning-link>
+                                        
+                                    </td>
+                                    <td>
+                                        <div>{approvalHistory.Comments}</div>
+                                    </td>
+                                    <td></td>
+                                </tr>
+                            </template>
+                        </tbody>
+                    </table>
+                </lightning-layout>
+            </div>
         </template>
         <template if:true={isPop}>
             <section role="dialog" aria-labelledby="modal-heading-01" aria-describedby="modal-content-id-1" tabindex="-1" aria-modal="true" class="slds-modal slds-fade-in-open " data-aura-rendered-by="478:0">
                 <div style="height: 50px;"></div>
-                <div style="background-color: white;height:200px;" class="slds-modal__container" data-aura-rendered-by="479:0">
+                <div style="background-color: white;height:196px;" class="slds-modal__container" data-aura-rendered-by="479:0">
                     
-                    <template if:false={isLookup}>
+
                         <div style="align-self: center;font-size: large;padding-bottom: 10px" slot="header">{modalsubmitLabel}椤甸潰</div>
-                        <div style="height: 100px;">
-                            <lightning-textarea class="comment" style="width: 95%;padding-left: 10px;" data-id="comment" label="璇勮" value=""></lightning-textarea>
+                        <template if:true={isLookup}>
+                           
+                                <lightning-record-edit-form
+                                object-api-name='Lost_Report__c'
+                                record-id=''
+                            >
+                                <div style="width: 95%;padding-left: 10px;">
+                                
+                                    <lightning-input-field  variant="label-hidden" value={newActorId} field-name='Manager__c' onchange={handleActorChange} required> </lightning-input-field>
+                                </div>
+                            </lightning-record-edit-form>
                             
-                        </div>
-                    </template>
+                        </template>
+                        <template if:false={isLookup}>
+                            <div style="height: 100px;">
+                                <lightning-textarea class="comment" style="width: 95%;padding-left: 10px;" data-id="comment" label="璇勮" value=""></lightning-textarea>
+                                
+                            </div>
+                        </template>
+                        
                     
-                    <template if:true={isLookup}>
+                    <!-- <template if:true={isLookup}>
                         <div style="align-self: center;font-size: large;padding-bottom: 36px" slot="header">{modalsubmitLabel}椤甸潰</div>
                         <lightning-layout-item size="10" style="align-self: center;">
                             <div>
-                                <lightning-record-edit-form
-                                    object-api-name='Lost_Report__c'
-                                    record-id=''
-                                >
-                                    <lightning-input-field variant="label-hidden" value={newActorId} field-name='Manager__c' onchange={handleActorChange} required> </lightning-input-field>
-                                </lightning-record-edit-form>
+                                
+                                <div style="height: 100px;">
+                                    <lightning-textarea class="comment" style="width: 95%;padding-left: 10px;" data-id="comment" label="璇勮" value=""></lightning-textarea>
+                                    
+                                </div>
                               </div>  
                         </lightning-layout-item>
                           
-                    </template>
+                    </template> -->
                     <div slot="footer" style="align-self: center;padding-top: 10px;">
                         <lightning-button
+                            class="slds-button "
                           data-id="Cancel"
                           label="鍙栨秷"
                           onclick={handleModalCancel}
                         ></lightning-button>
                         <lightning-button
+                            class="slds-button"
                           data-id="Submit"
                           label={modalsubmitLabel}
                           variant="brand"
-                          class="slds-p-left_small"
                           onclick={handleModalSubmit}
                         ></lightning-button>
                     </div>
@@ -615,6 +731,5 @@
         </template>
         
     </template>
-
     
 </template>
\ No newline at end of file

--
Gitblit v1.9.1