From 50ce6a5e5ae7ac6ce3e6281acca9a0db568306e6 Mon Sep 17 00:00:00 2001
From: unknown <sunxia@prec-tech.com>
Date: 星期三, 23 八月 2023 14:54:59 +0800
Subject: [PATCH] Merge branch 'LEX_dev' of http://47.92.229.245:8089/r/lightningupdate into LEX_dev

---
 force-app/main/default/lwc/lexBatchSelectRepairLWC/lexBatchSelectRepairLWC.html |  111 ++++++++++++++++++++++++-------------------------------
 1 files changed, 48 insertions(+), 63 deletions(-)

diff --git a/force-app/main/default/lwc/lexBatchSelectRepairLWC/lexBatchSelectRepairLWC.html b/force-app/main/default/lwc/lexBatchSelectRepairLWC/lexBatchSelectRepairLWC.html
index 07ec8af..362ebef 100644
--- a/force-app/main/default/lwc/lexBatchSelectRepairLWC/lexBatchSelectRepairLWC.html
+++ b/force-app/main/default/lwc/lexBatchSelectRepairLWC/lexBatchSelectRepairLWC.html
@@ -1,11 +1,4 @@
 <template>
- <!--  <div class="slds-box slds-theme--default">
-        Click on the link Below to Export data as csv/xls.
-        <p class="slds-m-top--large">
-            <a onclick={exportContactData}>Export Contact Data</a>
-            <lightning-button variant="brand" label="Export Contact data" title="Export Contact Data" onclick={exportContactData}></lightning-button>
-        </p>
-    </div> -->
   <lightning-card  variant="Narrow">
     <div style="padding: 0 20px">    
       <div>
@@ -13,67 +6,60 @@
           <div style="margin-top: 5px">
              <lightning-layout>
               <!-- cancelPaddingLeft -->
-                  <lightning-layout-item flexibility="auto" padding="around-small">
-                      <lightning-combobox name="progress" label="鐘舵��1" value={searchObj.Status1} options={status1Options} 
-                          onchange={handleStatus1Change} class="searchField"></lightning-combobox>
-                  </lightning-layout-item>
-                  <lightning-layout-item flexibility="auto" padding="around-small">
-                      <lightning-combobox
-                      name="progress" label="鐘舵��2" value={searchObj.Status2} options={status2Options} onchange={handleStatus2Change} 
-                      class="searchField"></lightning-combobox>
-                  </lightning-layout-item> 
-                  <lightning-layout-item flexibility="auto" padding="around-small">
-                      <lightning-combobox
-                      name="progress" label="鏈嶅姟鏂瑰紡" value={searchObj.onSiteRepair} options={siteRepairItems} onchange={handleSiteChange}
-                      class="searchField"></lightning-combobox>
-                  </lightning-layout-item> 
+                <lightning-layout-item size="4" padding="around-small">
+                  <lightning-combobox name="progress" label="鐘舵��1" value={searchObj.Status1} options={status1Options} 
+                        onchange={handleStatus1Change} class="searchField"></lightning-combobox>
+                </lightning-layout-item>
+                <lightning-layout-item size="4" padding="around-small">
+                  <lightning-combobox
+                    name="progress" label="鐘舵��2" value={searchObj.Status2} options={status2Options} onchange={handleStatus2Change} 
+                    class="searchField"></lightning-combobox>
+                </lightning-layout-item> 
+                <lightning-layout-item size="4" padding="around-small">
+                  <lightning-combobox
+                    name="progress" label="鏈嶅姟鏂瑰紡" value={searchObj.onSiteRepair} options={siteRepairItems} onchange={handleSiteChange}
+                    class="searchField"></lightning-combobox>
+                </lightning-layout-item> 
               </lightning-layout>
               <lightning-layout>
-                  <lightning-layout-item size="4" padding="horizontal-small">
-                    <lightning-input value={searchObj.RepairName} type="text" label="RS淇悊鍗曞彿" class="searchField" onchange={handleRepairNameChange}></lightning-input>
-                  </lightning-layout-item>
-                  <lightning-layout-item size="4" padding="horizontal-small">
-                    <lightning-input value={searchObj.SAPRepairNo} type="text" label="SAP淇悊鍗曞彿" class="searchField" onchange={handleSAPRepairNoChange}></lightning-input>
-                  </lightning-layout-item>
-                  <lightning-layout-item size="4" padding="horizontal-small">
-                    <lightning-input value={searchObj.workLocationSelect} type="text" label="缁翠慨涓績" class="searchField" onchange={handleWorkLocationChange}></lightning-input>
-                  </lightning-layout-item>
+                <lightning-layout-item size="4" padding="horizontal-small">
+                  <lightning-input value={searchObj.RepairName} type="text" label="RS淇悊鍗曞彿" class="searchField" onchange={handleRepairNameChange}></lightning-input>
+                </lightning-layout-item>
+                <lightning-layout-item size="4" padding="horizontal-small">
+                  <lightning-input value={searchObj.SAPRepairNo} type="text" label="SAP淇悊鍗曞彿" class="searchField" onchange={handleSAPRepairNoChange}></lightning-input>
+                </lightning-layout-item>
+                <lightning-layout-item size="4" padding="horizontal-small">
+                  <lightning-input value={searchObj.workLocationSelect} type="text" label="缁翠慨涓績" class="searchField" onchange={handleWorkLocationChange}></lightning-input>
+                </lightning-layout-item>
               </lightning-layout>
               <lightning-layout>
-                  <lightning-layout-item size="4" padding="horizontal-small">
-                    <lightning-input value={searchObj.SerialNumber} type="text" label="鏈鸿韩缂栫爜" class="searchField" onchange={handleSerialNumberChange}></lightning-input>
-                  </lightning-layout-item>
-                  <lightning-layout-item size="4" padding="horizontal-small">
-                    <lightning-input value={searchObj.State_Hospital} type="text" label="鐪佷唤" class="searchField" onchange={handleStateHospitalChange}></lightning-input>
-                  </lightning-layout-item>
-                  <lightning-layout-item size="4" padding="horizontal-small">
-                    <lightning-input value={searchObj.HospitalName} type="text" label="鍖婚櫌鍚嶇О" class="searchField" onchange={handleHospitalChange}></lightning-input>
-                  </lightning-layout-item>
+                <lightning-layout-item size="4" padding="horizontal-small">
+                  <lightning-input value={searchObj.SerialNumber} type="text" label="鏈鸿韩缂栫爜" class="searchField" onchange={handleSerialNumberChange}></lightning-input>
+                </lightning-layout-item>
+                <lightning-layout-item size="4" padding="horizontal-small">
+                  <lightning-input value={searchObj.State_Hospital} type="text" label="鐪佷唤" class="searchField" onchange={handleStateHospitalChange}></lightning-input>
+                </lightning-layout-item>
+                <lightning-layout-item size="4" padding="horizontal-small">
+                  <lightning-input value={searchObj.HospitalName} type="text" label="鍖婚櫌鍚嶇О" class="searchField" onchange={handleHospitalChange}></lightning-input>
+                </lightning-layout-item>
               </lightning-layout>
               <lightning-layout>
-                  <lightning-layout-item size="2" padding="horizontal-small">
-                    <lightning-input type="date" label="FSE鐢宠鏃�(寮�濮�)" value={repair.Aware_date__c} onchange={handleAwareDateDStart}></lightning-input>
-                  </lightning-layout-item>
-                  <!-- cancelPaddingLeft -->
-                  <lightning-layout-item size="2" padding="horizontal-small">
-                    <!-- variant="label-hidden" -->
-                    <lightning-input type="date" label="FSE鐢宠鏃�(缁撴潫)" value={repair.Aware_date2__c} onchange={handleAwareDateDEnd}></lightning-input>
-                  </lightning-layout-item>
-                  <lightning-layout-item size="4" padding="horizontal-small">
-                    <!-- record-id={recordId} 淇悊濮旀墭鑰�  Incharge_Staff__c-->
-                    <!-- <lightning-record-edit-form
-                        object-api-name={objectApiName}
-                        record-id=''
-                    >
-                        <lightning-input-field field-name={nameField} onclick={handleInchargeStaffChange}> </lightning-input-field>
-                    </lightning-record-edit-form> -->
-                    <lightning-record-edit-form
-                        object-api-name='Repair__c'
-                        record-id=''
-                    >
-                        <lightning-input-field field-name='Incharge_Staff__c' onclick={handleInchargeStaffChange}> </lightning-input-field>
-                    </lightning-record-edit-form>
-                  </lightning-layout-item>
+                <lightning-layout-item size="2" padding="horizontal-small">
+                  <lightning-input type="date" label="FSE鐢宠鏃�(寮�濮�)" value={repair.Aware_date__c} onchange={handleAwareDateDStart}></lightning-input>
+                </lightning-layout-item>
+                <!-- cancelPaddingLeft -->
+                <lightning-layout-item size="2" padding="horizontal-small">
+                  <!-- variant="label-hidden" -->
+                  <lightning-input type="date" label="FSE鐢宠鏃�(缁撴潫)" value={repair.Aware_date2__c} onchange={handleAwareDateDEnd}></lightning-input>
+                </lightning-layout-item>
+                <lightning-layout-item size="4" padding="horizontal-small">
+                  <lightning-record-edit-form
+                      object-api-name='Repair__c'
+                      record-id=''
+                  >
+                      <lightning-input-field field-name='Incharge_Staff__c' onchange={handleInchargeStaffChange}> </lightning-input-field>
+                  </lightning-record-edit-form>
+                </lightning-layout-item>
               </lightning-layout>
               <lightning-layout>
                   <lightning-layout-item flexibility="auto" padding="around-small">
@@ -88,7 +74,6 @@
             <lightning-button label="鎵撳嵃PDF" onclick={skipPage}></lightning-button>
             
             <lightning-button label="瀵煎嚭Excel" onclick={exportContactData}></lightning-button>
-            <!-- <lightning-button label="瀵煎嚭Excel" onclick={downloadCSVFile}></lightning-button> -->
           </div>
           <div>
             <lightning-datatable

--
Gitblit v1.9.1