From 90fac0710272079084730d97f6467ce87cd82448 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 07 七月 2023 14:29:21 +0800
Subject: [PATCH] ProdLEXCode0707

---
 force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.cmp |  291 +++++++++++++++++++++-------------------------------------
 1 files changed, 106 insertions(+), 185 deletions(-)

diff --git a/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.cmp b/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.cmp
index 42b2d98..baa6567 100644
--- a/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.cmp
+++ b/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.cmp
@@ -1,6 +1,6 @@
 <aura:component
   controller="RetrospectiveWeeklyReportController"
-  implements="force:appHostable,flexipage:availableForAllPageTypes,flexipage:availableForRecordHome,force:hasRecordId,force:lightningQuickAction,forceCommunity:availableForAllPageTypes,lightning:availableForFlowScreens"
+  implements="force:appHostable,flexipage:availableForAllPageTypes,flexipage:availableForRecordHome,force:hasRecordId,force:lightningQuickAction,forceCommunity:availableForAllPageTypes"
   access="global"
 >
   <ltng:require styles="{!$Resource.multilineToastCSS}" />聽
@@ -23,8 +23,7 @@
   <aura:attribute
     name="acondata"
     type="Agency_Contact__c"
-    default="{sobjectType:'Ag
-    ency_Contact__c'}"
+    default="{sobjectType:'Agency_Contact__c'}"
   />
   <aura:attribute name="successMessage" type="String" />
   <aura:attribute name="etEng" type="String" />
@@ -43,8 +42,6 @@
   <aura:attribute name="doclist" type="List" />
   <aura:attribute name="docmap" type="Map" />
   <aura:attribute name="login" type="Boolean" default="false" />
-  <aura:attribute name="loginEdit" type="Boolean" default="false" />
-  <aura:attribute name="modal_import_spinner" type="Boolean" default="false" />
   <aura:attribute name="loadOpp" type="Boolean" default="false" />
   <aura:attribute name="reportPageData" type="Map" />
   <aura:attribute name="selectbody" type="String" />
@@ -156,12 +153,6 @@
   <aura:attribute name="NumOfRecords" type="Integer" default="1000" />
   <aura:attribute name="showMain" type="Boolean" default="true" />
   <aura:attribute name="IsEventDefault" type="Boolean" default="true" />
-  <!-- start DTT-zhj 澧炲姞閿欒淇℃伅table 2023-05-16-->
-  <aura:attribute name="errorData" type="Object" />
-  <aura:attribute name="errorColumns" type="List" />
-  <!-- show Error information -->
-  <aura:attribute name="showErrorInfo" type="Boolean" default="false" />
-  <!-- end DTT-zhj 澧炲姞閿欒淇℃伅table 2023-05-16-->
 
   <aura:attribute name="PIConfig" type="Map" />
 
@@ -171,40 +162,27 @@
   <!-- 鎵归噺娣诲姞鏃ユ姤 end-->
   <!--銉兗銉変腑...-->
   <aura:renderIf isTrue="{!v.login}">
-    <aura:renderIf isTrue="{!!v.loginEdit}">
-      <!-- <div class="slds-spinner_container">
-                <div role="status" class="slds-spinner slds-spinner_medium slds-spinner_brand">
-                    聽 聽 <span class="slds-assistive-text">Loading</span>
-                    聽 聽 <div class="slds-spinner__dot-a"></div>
-                    聽 聽 <div class="slds-spinner__dot-b"></div>
-                </div>
-            </div> -->
+    <div class="slds-spinner_container height100vh">
       <div
-        class="slds-spinner_container"
-        id="spinner"
-        style="position: fixed; top: 123px"
+        class="slds-spinner--brand slds-spinner slds-spinner--medium"
+        role="alert"
       >
-        <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>
+        <span class="slds-assistive-text">Loading</span>
+        <div class="slds-spinner__dot-a"></div>
+        <div class="slds-spinner__dot-b"></div>
       </div>
-    </aura:renderIf>
+    </div>
   </aura:renderIf>
-  <div aura:id="report" id="report">
+  <div aura:id="report" id="report" class="contents_wrapper">
     <div class="slds-grid slds-wrap slds-grid--pull-padded">
-      <div style="width: 150px"></div>
+      <div style="width: 200px"></div>
       <div
-        class="tr mt5 slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-12 slds-large-size--1-of-12 fontSize"
+        class="tr mt5 slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-12 slds-large-size--1-of-12"
       >
         鍛�
       </div>
       <div
-        class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12 fontSize"
+        class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12"
       >
         <ui:inputSelect
           aura:id="select_date"
@@ -234,44 +212,35 @@
         class="tr slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12"
         style="display: contents"
       >
-        <ui:button
-          aura:id="new_button"
-          label="鏂板缓"
-          press="{!c.new_report}"
-          class="buttonFontSize"
-        />
+        <ui:button aura:id="new_button" label="鏂板缓" press="{!c.new_report}" />
       </div>
       <div
-        style="width: 400px"
-        class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--4-of-12 slds-large-size--4-of-12"
+        style="width: 350px"
+        class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12"
       >
         <ui:button
           aura:id="copy_button"
           label="澶嶅埗"
           press="{!c.copy_button}"
           disabled="true"
-          class="buttonFontSize"
         />
         <ui:button
           aura:id="delete_button"
           label="鍒犻櫎"
           press="{!c.delete_button}"
           disabled="true"
-          class="buttonFontSize"
         />
-        <ui:button
-          aura:id="import"
-          label="瀵煎叆"
-          press="{!c.import}"
-          class="buttonFontSize"
-        />
+        <ui:button aura:id="import" label="瀵煎叆" press="{!c.import}" />
         <ui:button
           aura:id="export"
           label="瀵煎嚭"
           press="{!c.export_condition}"
-          class="buttonFontSize"
         />
-        <!-- <ui:button aura:id="returnbutton" label="杩斿洖" press="{!c.return_main_page}" /> -->
+        <ui:button
+          aura:id="returnbutton"
+          label="杩斿洖"
+          press="{!c.return_main_page}"
+        />
       </div>
     </div>
   </div>
@@ -287,41 +256,33 @@
       >
         <thead>
           <tr class="slds-line-height--reset">
-            <th
-              class="table_header slds-text-title--caps fontSize"
-              style="width: 250px"
-            >
-              <span class="slds-truncate" title="Name">鏃ユ姤缂栧彿</span>
-            </th>
-            <th class="table_header slds-text-title--caps fontSize">
+            <th class="table_header slds-text-title--caps"></th>
+            <th class="table_header slds-text-title--caps">
               <span class="slds-truncate" title="Name"
                 >{!v.fieldsmap.Person_In_Charge2__c}</span
               >
               <!-- {!v.fieldsmap.Person_In_Charge2__c}  鎷呭綋-->
             </th>
-            <th
-              class="table_header slds-text-title--caps fontSize"
-              style="width: 250px"
-            >
+            <th class="table_header slds-text-title--caps">
               <span class="slds-truncate" title="Name">鍖婚櫌</span>
             </th>
-            <th class="table_header slds-text-title--caps fontSize">
+            <th class="table_header slds-text-title--caps">
               <span class="slds-truncate" title="Name"
                 >{!v.fieldsmap.Department_Cateogy__c}</span
               >
               <!-- {!v.fieldsmap.Department_Cateogy__c}    绉戝-->
             </th>
-            <th class="table_header slds-text-title--caps fontSize">
+            <th class="table_header slds-text-title--caps">
               <span class="slds-truncate" title="Name">鎷滆浜�</span>
               <!-- {!v.fieldsmap.doctor2__c}    鎷滆浜� -->
             </th>
-            <th class="table_header slds-text-title--caps fontSize">
+            <th class="table_header slds-text-title--caps">
               <span class="slds-truncate" title="Name"
                 >{!v.fieldsmap.DealerPersonnel__c}</span
               >
               <!-- {!v.fieldsmap.visitor_title__c}   鑱屼綅-->
             </th>
-            <th class="table_header slds-text-title--caps fontSize">
+            <th class="table_header slds-text-title--caps">
               <span class="slds-truncate" title="Name"
                 >{!v.fieldsmap.WorkMark__c}</span
               >
@@ -332,7 +293,7 @@
         <tbody>
           <aura:iteration items="{!v.reports}" var="item" indexVar="index">
             <tr class="slds-hint-parent">
-              <td role="gridcell" class="slds-cell-edit fontSize">
+              <td role="gridcell" class="slds-cell-edit">
                 <ui:inputRadio
                   class="report_radio"
                   name="report_radio"
@@ -348,7 +309,7 @@
                   onclick="{!c.edit_button}"
                 />
               </td>
-              <td role="gridcell" class="slds-cell-edit fontSize">
+              <td role="gridcell" class="slds-cell-edit">
                 <span class="slds-grid slds-grid--align-spread">
                   <span
                     class="slds-truncate"
@@ -357,15 +318,12 @@
                   >
                 </span>
               </td>
-              <td scope="row" tabindex="0" class="slds-cell-edit fontSize">
-                <div
-                  class="slds-grid slds-grid--align-spread"
-                  style="word-wrap: break-word"
-                >
+              <th scope="row" tabindex="0" class="slds-cell-edit">
+                <span class="slds-grid slds-grid--align-spread">
                   {!item.Agency_Hospital__r.Name}
-                </div>
-              </td>
-              <td role="gridcell" class="slds-cell-edit fontSize">
+                </span>
+              </th>
+              <td role="gridcell" class="slds-cell-edit">
                 <span class="slds-grid slds-grid--align-spread">
                   <span
                     class="slds-truncate"
@@ -374,7 +332,7 @@
                   >
                 </span>
               </td>
-              <td role="gridcell" class="slds-cell-edit fontSize">
+              <td role="gridcell" class="slds-cell-edit">
                 <span class="slds-grid slds-grid--align-spread">
                   <span class="slds-truncate" title="{!item.doctor2__r.Name}">
                     <span class="encrypt">{!item.doctor2__r.Name}</span>
@@ -382,7 +340,7 @@
                   </span>
                 </span>
               </td>
-              <td role="gridcell" class="slds-cell-edit fontSize">
+              <td role="gridcell" class="slds-cell-edit">
                 <span class="slds-grid slds-grid--align-spread">
                   <span
                     class="slds-truncate"
@@ -391,7 +349,7 @@
                   >
                 </span>
               </td>
-              <td role="gridcell" class="slds-cell-edit fontSize">
+              <td role="gridcell" class="slds-cell-edit">
                 <span class="slds-grid slds-grid--align-spread">
                   <span class="slds-truncate" title="{!item.WorkMark__c}">
                     <lightning:input
@@ -421,9 +379,6 @@
     class="disp_none slds-modal slds-fade-in-open slds-modal--large"
     aria-labelledby="headerTarget"
   >
-    <aura:renderIf isTrue="{!v.modal_import_spinner}">
-      <lightning:spinner alternativeText="Loading" size="medium" />
-    </aura:renderIf>
     <div class="slds-modal slds-fade-in-open slds-hide" aura:id="successDiv01">
       <!-- <ui:inputText aura:id="articleURL" /> -->
       <div class="demo-only" style="height: 8rem">
@@ -449,24 +404,35 @@
         </div>
       </div>
     </div>
-    <!-- <div class="slds-modal slds-fade-in-open slds-hide" aura:id="errorDiv01" style="z-index: 10001">
-            <div class="demo-only" style="height: 8rem;">
-                <div class="slds-notify_container slds-is-relative">
-                    <div class="slds-notify slds-notify_toast slds-theme_error" role="status">
-                        <div class=" slds-m-left_xx-large">
-                            <div
-                                class="slds-notify__content slds-m-left_small slds-align_absolute-center slds-m-left_xx-large">
-                                <lightning:icon alternativeText="error" iconName="utility:error" size="small"
-                                    class="buttonColor slds-m-right_small" />
-                                <h2 class="slds-text-heading_small ">{!v.errorMessage}</h2>
-                                <lightning:icon alternativeText="Close" iconName="utility:close" size="small"
-                                        onclick="{!c.closeErrorDiv}" />
-                            </div>
-                        </div>
-                    </div>
-                </div>
+    <div
+      class="slds-modal slds-fade-in-open slds-hide"
+      aura:id="errorDiv01"
+      style="z-index: 10001"
+    >
+      <!-- <ui:inputText aura:id="articleURL" /> -->
+      <div class="demo-only" style="height: 8rem">
+        <div class="slds-notify_container slds-is-relative">
+          <div
+            class="slds-notify slds-notify_toast slds-theme_error"
+            role="status"
+          >
+            <div class="slds-m-left_xx-large">
+              <div
+                class="slds-notify__content slds-m-left_small slds-align_absolute-center slds-m-left_xx-large"
+              >
+                <lightning:icon
+                  alternativeText="error"
+                  iconName="utility:error"
+                  size="small"
+                  class="buttonColor slds-m-right_small"
+                />
+                <h2 class="slds-text-heading_small">{!v.errorMessage}</h2>
+              </div>
             </div>
-        </div> -->
+          </div>
+        </div>
+      </div>
+    </div>
     <div class="slds-modal__container">
       <div class="slds-modal__header">
         <h4 id="headerTarget" class="slds-float--left"></h4>
@@ -476,12 +442,12 @@
         <ui:button
           aura:id="close_button"
           label="鍏抽棴"
-          class="close_button slds-button slds-button--neutral slds-order--1 buttonFontSize"
+          class="close_button slds-button slds-button--neutral slds-order--1"
           press="{!c.close_import}"
         />
       </div>
       <div
-        class="slds-modal__content slds-scrollable slds-grow slds-p-around--medium fontSize"
+        class="slds-modal__content slds-scrollable slds-grow slds-p-around--medium"
       >
         <aura:if isTrue="{!v.showMain}">
           <div>
@@ -494,7 +460,7 @@
           </div>
           <aura:set attribute="else">
             <ui:outputRichText
-              class="uiOutputRichText slds-m--around-large fontSize"
+              class="uiOutputRichText slds-m--around-large"
               value="{!v.TableContent}"
             />
             <div class="slds-p-around--large slds-align--absolute-center">
@@ -502,34 +468,13 @@
                 label="淇濆瓨"
                 variant="brand"
                 onclick="{!c.processFileContent}"
-                class="buttonFontSize"
               />
               <lightning:button
                 label="鍙栨秷"
                 variant="brand"
                 onclick="{!c.cancel}"
-                class="buttonFontSize"
               />
             </div>
-            <aura:if isTrue="{!v.showErrorInfo}">
-              <div class="slds-p-around--large slds-align--absolute-center">
-                <lightning:button
-                  label="瀵煎嚭閿欒淇℃伅"
-                  variant="brand"
-                  onclick="{!c.exportErrorInfo}"
-                />
-              </div>
-              <div class="slds-p-around--large slds-align--absolute-center">
-                <div style="height: 300px; overflow-x: scroll">
-                  <lightning:datatable
-                    keyField="id"
-                    data="{! v.errorData }"
-                    columns="{! v.errorColumns }"
-                    hideCheckboxColumn="true"
-                  />
-                </div>
-              </div>
-            </aura:if>
           </aura:set>
         </aura:if>
       </div>
@@ -694,46 +639,35 @@
           </div>
         </div>
       </div>
-
-      <div
-        class="slds-modal__content slds-grow slds-p-around--medium"
-        style="position: relative"
-      >
-        <aura:renderIf isTrue="{!v.loginEdit}">
-          <lightning:spinner
-            alternativeText="Loading"
-            size="medium"
-            style="width: 100%; height: 100%"
-          />
-        </aura:renderIf>
-        <div class="slds-modal__header">
-          <h2 id="headerTarget" class="slds-text-heading--medium">
-            鏃ユ姤({!v.selected_date}&nbsp;{!v.selected_agency_person})
-          </h2>
-          <ui:button
-            aura:id="close_button"
-            label="鍏抽棴"
-            class="close_button slds-button slds-button--neutral slds-order--1"
-            press="{!c.toggle_report}"
-          />
-        </div>
+      <div class="slds-modal__header">
+        <h4 id="headerTarget" class="slds-float--left">{!v.dialog_type}</h4>
+        <h2 id="headerTarget" class="slds-text-heading--medium">
+          鏃ユ姤({!v.selected_date}&nbsp;{!v.selected_agency_person})
+        </h2>
+        <ui:button
+          aura:id="close_button"
+          label="鍏抽棴"
+          class="close_button slds-button slds-button--neutral slds-order--1"
+          press="{!c.toggle_report}"
+        />
+      </div>
+      <div class="slds-modal__content slds-grow slds-p-around--medium">
         <div class="slds-box slds-theme--shade">
           <div class="slds-grid slds-wrap slds-grid--pull-padded">
             <div
-              class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-7 slds-large-size--1-of-7"
+              class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6"
             >
               娲诲姩鏃�
               <lightning:input
                 type="date"
                 value="{!v.data.Report_Date__c}"
                 aura:id="input-report-date"
-                variant="label-hidden"
               />
             </div>
             <!-- 鍖婚櫌 -->
             <div
               aura:id="hospital_list"
-              class="slds-form-element slds-lookup slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-7 slds-large-size--1-of-7"
+              class="slds-form-element slds-lookup slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6"
               data-select="single"
             >
               <!-- label="鍖婚櫌" -->
@@ -743,7 +677,6 @@
                 class="field"
                 value="{!v.hospital}"
                 updateOn="keyup"
-                variant="label-hidden"
               />
               <div class="slds-lookup__menu" id="lookup-66">
                 <ul class="slds-lookup__list" role="listbox">
@@ -772,21 +705,18 @@
             </div>
             <!-- 绉戝鍒嗙被 -->
             <div
-              class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-7 slds-large-size--1-of-7"
+              class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6"
             >
               {!v.fieldsmap.Department_Cateogy__c}
-              <!-- <ui:inputText aura:id="select_department" class="slds-select"
-                                change="{!c.select_department}"/> -->
-              <lightning:input
-                type="text"
-                onchange="{!c.select_department}"
+              <ui:inputText
                 aura:id="select_department"
-                variant="label-hidden"
+                class="slds-select"
+                change="{!c.select_department}"
               />
             </div>
             <!-- 缁忛攢鍟嗕汉鍛�  change="{!c.select_DealerPersonnel}" -->
             <div
-              class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-7 slds-large-size--1-of-7"
+              class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6"
               style="width: 145px"
             >
               {!v.fieldsmap.DealerPersonnel__c}
@@ -797,7 +727,7 @@
             </div>
             <!-- 娲诲姩鍖哄垎   -->
             <div
-              class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-7 slds-large-size--1-of-7"
+              class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6"
             >
               {!v.fieldsmap.WorkRecord__c}
               <ui:inputSelect
@@ -808,7 +738,7 @@
             </div>
             <!-- 鎷滆浜� {!v.fieldsmap.doctor2__c}-->
             <div
-              class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-7 slds-large-size--1-of-7"
+              class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6"
               style="width: 145px"
             >
               鎷滆浜�
@@ -821,7 +751,7 @@
             <!-- <p hidden="hidden"> -->
 
             <div
-              class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-7 slds-large-size--1-of-7"
+              class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-12"
             >
               <br />
               <ui:button
@@ -837,7 +767,7 @@
             <hr />
             <!-- 浜у搧鍒嗙被(绗笁鍒嗙被) change="{!c.select_ProductClassification}" -->
             <div
-              class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-5"
+              class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6"
             >
               浜у搧鍒嗙被(绗笁鍒嗙被)
               <ui:inputSelect
@@ -849,7 +779,7 @@
             <!-- 浣跨敤浜у搧1(浜у搧鍨嬪彿)   UseProduct1__c  -->
             <div
               aura:id="UseProduct1_List"
-              class="slds-form-element slds-lookup slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-5"
+              class="slds-form-element slds-lookup slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6"
               data-select="single"
             >
               <!-- label="浣跨敤浜у搧1(浜у搧鍨嬪彿)" -->
@@ -859,7 +789,6 @@
                 class="field"
                 value="{!v.UseProduct1}"
                 updateOn="keyup"
-                variant="label-hidden"
               />
               <div class="slds-lookup__menu" id="lookup-11">
                 <ul
@@ -896,7 +825,7 @@
             <!-- 浣跨敤浜у搧2   UseProduct2__c  -->
             <div
               aura:id="UseProduct2_List"
-              class="slds-form-element slds-lookup slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-5"
+              class="slds-form-element slds-lookup slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6"
               data-select="single"
             >
               <!-- label="浣跨敤浜у搧2" -->
@@ -906,7 +835,6 @@
                 class="field"
                 value="{!v.UseProduct2}"
                 updateOn="keyup"
-                variant="label-hidden"
               />
               <div class="slds-lookup__menu" id="lookup-22">
                 <ul
@@ -943,7 +871,7 @@
             <!-- 浣跨敤浜у搧3   UseProduct3__c  -->
             <div
               aura:id="UseProduct3_List"
-              class="slds-form-element slds-lookup slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-5"
+              class="slds-form-element slds-lookup slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6"
               data-select="single"
             >
               <!-- label="浣跨敤浜у搧3" -->
@@ -953,7 +881,6 @@
                 class="field"
                 value="{!v.UseProduct3}"
                 updateOn="keyup"
-                variant="label-hidden"
               />
               <div class="slds-lookup__menu" id="lookup-33">
                 <ul
@@ -990,7 +917,7 @@
             <!-- 鏁堟灉/杩涘害  EffectProgress__c-->
             <div
               aura:id="product_category_select1"
-              class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-5"
+              class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6"
             >
               {!v.fieldsmap.EffectProgress__c}
               <ui:inputSelect
@@ -1001,16 +928,13 @@
             <hr />
             <!-- 浜у搧1鍚岀被鑰楁潗绉戝鏈堜娇鐢ㄩ噺  ConsumptionOfConsumables__c-->
             <div
-              class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-5"
+              class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6"
             >
               {!v.fieldsmap.ConsumptionOfConsumables__c}
-              <!-- <ui:inputText aura:id="select_ConsumptionOfConsumables" class="slds-select"
-                                change="{!c.select_ConsumptionOfConsumables}" /> -->
-              <lightning:input
-                type="text"
-                onchange="{!c.select_ConsumptionOfConsumables}"
+              <ui:inputText
                 aura:id="select_ConsumptionOfConsumables"
-                variant="label-hidden"
+                class="slds-select"
+                change="{!c.select_ConsumptionOfConsumables}"
               />
             </div>
             <!-- 鏈+鍒嗙被   WarlockClassification__c   -->
@@ -1050,17 +974,14 @@
               class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6"
             >
               {!v.fieldsmap.warlocksNumber__c}
-              <!-- <ui:inputText aura:id="select_warlocksNumber" class="slds-select"
-                                change="{!c.select_warlocksNumber}" /> -->
-              <lightning:input
-                type="text"
-                onchange="{!c.select_warlocksNumber}"
+              <ui:inputText
                 aura:id="select_warlocksNumber"
-                variant="label-hidden"
+                class="slds-select"
+                change="{!c.select_warlocksNumber}"
               />
             </div>
             <!-- 鏀彺闇�姹�      WorkMark__c-->
-            <div style="padding-left: 12px">
+            <div style="padding-left: 20px">
               {!v.fieldsmap.WorkMark__c}
               <lightning:input type="checkbox" aura:id="select_WorkMark" />
             </div>

--
Gitblit v1.9.1