From 41625c74ad92b72151f4d1009ea0c791635d9dac Mon Sep 17 00:00:00 2001
From: binxie <137736985@qq.com>
Date: 星期一, 19 六月 2023 22:02:56 +0800
Subject: [PATCH] test

---
 force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.cmp |  300 +++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 199 insertions(+), 101 deletions(-)

diff --git a/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.cmp b/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.cmp
index b82bc29..35fb000 100644
--- a/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.cmp
+++ b/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.cmp
@@ -1,5 +1,5 @@
 <aura:component controller="RetrospectiveWeeklyReportController"
-    implements="force:appHostable,flexipage:availableForAllPageTypes,flexipage:availableForRecordHome,force:hasRecordId,force:lightningQuickAction,forceCommunity:availableForAllPageTypes"
+    implements="force:appHostable,flexipage:availableForAllPageTypes,flexipage:availableForRecordHome,force:hasRecordId,force:lightningQuickAction,forceCommunity:availableForAllPageTypes,lightning:availableForFlowScreens"
     access="global">
     <ltng:require styles="{!$Resource.multilineToastCSS}" />聽
     <aura:handler name="init" value="{!this}" action="{!c.doInit}" />
@@ -17,9 +17,10 @@
     <aura:attribute name="StageName__c_o" type="String" />
     <aura:attribute name="fieldsmap" type="Map" />
     <aura:attribute name="AgencyReportMap" type="Boolean" default="false" />
-    <!-- 鍛ㄦ姤鍒嗙被 -->
+    <!-- 鏃ユ姤鍒嗙被 -->
 
     <aura:attribute name="alldata" type="List" />
+    <aura:attribute name="setdoctorlisthos" type="Boolean" default="false" />
     <aura:attribute name="allselectlist" type="Map" />
     <aura:attribute name="doclist" type="List" />
     <aura:attribute name="docmap" type="Map" />
@@ -36,25 +37,38 @@
     <!-- //鍖婚櫌 鐐归�夐渶瑕�    -->
     <aura:attribute name="hospital" type="string" default="" />
     <aura:attribute name="hospitalId" type="string" default="" />
+    <aura:attribute name="hospitals" type="string" default="" />
     <aura:attribute name="hospitalLinkId" type="string" default="" />
     <aura:handler name="change" value="{!v.hospital}" action="{!c.hosChange}" />
     <aura:attribute name="hospitalList" type="Map" />
     <!-- 浣跨敤浜у搧1(浜у搧鍨嬪彿) -->
     <aura:attribute name="UseProduct1" type="string" default="" />
+    <aura:attribute name="UseProduct1s" type="string" default="" />
     <aura:handler name="change" value="{!v.UseProduct1}" action="{!c.UseProduct1Change}" />
     <aura:attribute name="UseProduct1List" type="Map" />
     <aura:attribute name="UseProduct1Id" type="string" default="" />
     <!-- 浣跨敤浜у搧2 -->
     <aura:attribute name="UseProduct2" type="string" default="" />
+    <aura:attribute name="UseProduct2s" type="string" default="" />
     <aura:handler name="change" value="{!v.UseProduct2}" action="{!c.UseProduct2Change}" />
     <aura:attribute name="UseProduct2List" type="Map" />
     <aura:attribute name="UseProduct2Id" type="string" default="" />
     <!-- 浣跨敤浜у搧3 -->
     <aura:attribute name="UseProduct3" type="string" default="" />
+    <aura:attribute name="UseProduct3s" type="string" default="" />
     <aura:handler name="change" value="{!v.UseProduct3}" action="{!c.UseProduct3Change}" />
     <aura:attribute name="UseProduct3List" type="Map" />
     <aura:attribute name="UseProduct3Id" type="string" default="" />
-
+    <!--SWAG-CF58C3 fy start -->
+    <aura:attribute name="AWStoken" type="String" />
+    <aura:attribute name="AWSsearch" type="String" />
+    <aura:attribute name="AWSinsert" type="String" />
+    <aura:attribute name="AWStransactionURL" type="String" />
+    <aura:attribute name="AWSDoctor2Map" type="String" />
+    <aura:attribute name="awsurl" type="Map" />
+    <aura:attribute name="contactawsurl" type="Map" />
+    <aura:attribute name="allselectlistAgencyPerson" type="Map" />
+    <!--SWAG-CF58C3 fy end -->
 
 
     <aura:attribute name="doctor_list" type="Map" />
@@ -69,6 +83,7 @@
     <aura:attribute name="select_report_data" type="Map" />
     <aura:attribute name="select_report_data_radio" type="Map" />
     <aura:attribute name="default_select_doctor_id" type="String" />
+    <aura:attribute name="default_select_doctor_id2" type="String" />
     <aura:attribute name="default_select_opportunity_id" type="String" />
     <aura:attribute name="report_count" type="Integer" />
     <aura:attribute name="dialog_type" type="String" />
@@ -77,10 +92,13 @@
     <aura:attribute name="confirm_status" type="Integer" default="0" />
     <aura:attribute name="modal_confirm_title" type="String" />
     <aura:attribute name="modal_confirm_text" type="String" />
+    <!-- <aura:attribute name="new_falg" type="String" /> -->
+    <!-- fy -->
+    <aura:attribute name="UserProType" type="String" />
     <!-- 绉戝 -->
     <aura:attribute name="opportunity_cfilter" type="String" />
     <aura:attribute name="update_select_report_data_id" type="String" default="" />
-    <!-- 鎵归噺娣诲姞鍛ㄦ姤 start-->
+    <!-- 鎵归噺娣诲姞鏃ユ姤 start-->
     <aura:attribute name="reports_date" type="List" />
     <aura:attribute name="TableContent" type="String" description=" Show the Result class" />
     <aura:attribute name="TableContent2" type="String" description=" Show the Result class" />
@@ -91,7 +109,19 @@
     <aura:attribute name="NumOfRecords" type="Integer" default="1000" />
     <aura:attribute name="showMain" type="Boolean" default="true" />
     <aura:attribute name="IsEventDefault" type="Boolean" default="true" />
-    <!-- 鎵归噺娣诲姞鍛ㄦ姤 end-->
+    <!-- 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" />
+
+    <ltng:require scripts="{! $Resource.AWSService+'/AWSService.js' }" />
+    <ltng:require scripts="{! $Resource.jquery183minjs }" />
+
+    <!-- 鎵归噺娣诲姞鏃ユ姤 end-->
     <!--銉兗銉変腑...-->
     <aura:renderIf isTrue="{!v.login}">
         <div class="slds-spinner_container height100vh">
@@ -102,14 +132,14 @@
             </div>
         </div>
     </aura:renderIf>
-    <div aura:id="report" id="report" class="contents_wrapper">
+    <div aura:id="report" id="report">
         <div class="slds-grid slds-wrap slds-grid--pull-padded">
-            <div style="width: 230px;"></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">
+                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">
                 鍛�
             </div>
-            <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12">
+            <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12 fontSize">
                 <ui:inputSelect aura:id="select_date" class="slds-select" change="{!c.select_date_change}" />
             </div>
             <!-- 浠g悊搴楁媴褰撹�� -->
@@ -122,16 +152,19 @@
                 <ui:inputSelect aura:id="select_agency_person" class="slds-select agency_person_select"
                     change="{!c.select_agency_change}" />
             </div>
-            <div style="width: 200px;">
+            <div style="width: 100px;">
             </div>
             <div 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}" />
+                <ui:button aura:id="new_button" label="鏂板缓" press="{!c.new_report}" class="buttonFontSize"/>
             </div>
-            <div 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" />
-                <ui:button aura:id="import" label="瀵煎叆" press="{!c.import}" />
-                <ui:button aura:id="export" label="瀵煎嚭" press="{!c.export_condition}" />
+            <div style="width: 450px;"
+                class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--4-of-12 slds-large-size--4-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="export" label="瀵煎嚭" press="{!c.export_condition}" class="buttonFontSize"/>
+                <!-- <ui:button aura:id="returnbutton" label="杩斿洖" press="{!c.return_main_page}" /> -->
             </div>
         </div>
     </div>
@@ -141,25 +174,29 @@
                 role="grid" style="width:66.75rem;">
                 <thead>
                     <tr class="slds-line-height--reset">
-                        <th class="table_header slds-text-title--caps">
+                        <th class="table_header slds-text-title--caps" style="width:250px">
                         </th>
-                        <th class="table_header slds-text-title--caps">
+                        <th class="table_header slds-text-title--caps fontSize">
                             <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">
+                        <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">
+                        <th class="table_header slds-text-title--caps fontSize">
                             <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">
-                            <span class="slds-truncate" title="Name">鍖婚櫌浜哄憳</span>
-                            <!-- {!v.fieldsmap.doctor2__c}    鍖婚櫌浜哄憳 -->
+                        <th class="table_header slds-text-title--caps fontSize">
+                            <span class="slds-truncate" title="Name">鎷滆浜�</span>
+                            <!-- {!v.fieldsmap.doctor2__c}    鎷滆浜� -->
                         </th>
-                        <th class="table_header slds-text-title--caps">
+                        <th class="table_header slds-text-title--caps fontSize">
                             <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">
+                            <span class="slds-truncate" title="Name">{!v.fieldsmap.WorkMark__c}</span>
                             <!-- {!v.fieldsmap.visitor_title__c}   鑱屼綅-->
                         </th>
                     </tr>
@@ -167,39 +204,50 @@
                 <tbody>
                     <aura:iteration items="{!v.reports}" var="item" indexVar="index">
                         <tr class="slds-hint-parent">
-                            <td role="gridcell" class="slds-cell-edit">
+                            <td role="gridcell" class="slds-cell-edit fontSize">
                                 <ui:inputRadio class="report_radio" name="report_radio" label="{!item.Name}"
                                     change="{!c.change_report_radio}" />
                                 <lightning:buttonIcon class="edit_button" iconName="utility:edit" size="small"
                                     alternativeText="edit" value="{!index}" onclick="{!c.edit_button}" />
+
                             </td>
-                            <td role="gridcell" class="slds-cell-edit">
+                            <td role="gridcell" class="slds-cell-edit fontSize">
                                 <span class="slds-grid slds-grid--align-spread">
                                     <span class="slds-truncate"
                                         title="{!item.Person_In_Charge2__r.Name}">{!item.Person_In_Charge2__r.Name}</span>
                                 </span>
                             </td>
-                            <th scope="row" tabindex="0" class="slds-cell-edit">
+                            <th scope="row" tabindex="0" class="slds-cell-edit fontSize">
                                 <span class="slds-grid slds-grid--align-spread">
                                     {!item.Agency_Hospital__r.Name}
                                 </span>
                             </th>
-                            <td role="gridcell" class="slds-cell-edit">
+                            <td role="gridcell" class="slds-cell-edit fontSize">
                                 <span class="slds-grid slds-grid--align-spread">
                                     <span class="slds-truncate"
-                                        title="{!item.Department_Cateogy__c}">{!item.Department_Cateogy__c}</span>
+                                        title="{!item.Department_Cateogy_text__c}">{!item.Department_Cateogy_text__c}</span>
                                 </span>
                             </td>
-                            <td role="gridcell" class="slds-cell-edit">
+                            <td role="gridcell" class="slds-cell-edit fontSize">
                                 <span class="slds-grid slds-grid--align-spread">
-                                    <span class="slds-truncate"
-                                        title="{!item.doctor2__r.Name}">{!item.doctor2__r.Name}</span>
+                                    <span class="slds-truncate" title="{!item.doctor2__r.Name}">
+                                        <span class="encrypt">{!item.doctor2__r.Name}</span>
+                                        <span class="decrypt">{!item.doctor2__r.awsdata.name}</span>
+                                    </span>
                                 </span>
                             </td>
-                            <td role="gridcell" class="slds-cell-edit">
+                            <td role="gridcell" class="slds-cell-edit fontSize">
                                 <span class="slds-grid slds-grid--align-spread">
                                     <span class="slds-truncate"
                                         title="{!item.DealerPersonnel__r.Name}">{!item.DealerPersonnel__r.Name}</span>
+                                </span>
+                            </td>
+                            <td role="gridcell" class="slds-cell-edit fontSize">
+                                <span class="slds-grid slds-grid--align-spread">
+                                    <span class="slds-truncate" title="{!item.WorkMark__c}">
+                                        <lightning:input type="checkbox" checked="{!item.WorkMark__c}"
+                                            disabled="true" />
+                                    </span>
                                 </span>
                             </td>
                         </tr>
@@ -215,11 +263,11 @@
             </aura:set>
         </aura:renderIf>
     </div>
-    <!-- 鎵归噺娣诲姞鍛ㄦ姤 start-->
+    <!-- 鎵归噺娣诲姞鏃ユ姤 start-->
     <div aura:id="modal_import" role="dialog" tabindex="-1"
         class="disp_none slds-modal slds-fade-in-open slds-modal--large" aria-labelledby="headerTarget">
         <div class="slds-modal slds-fade-in-open slds-hide" aura:id="successDiv01">
-            <ui:inputText aura:id="articleURL" />
+            <!-- <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_success" role="alert">
@@ -235,40 +283,68 @@
                 </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 class="slds-modal__container ">
             <div class="slds-modal__header ">
                 <h4 id="headerTarget" class="slds-float--left"></h4>
-                <h2 id="headerTarget" class="slds-text-heading--medium">鍛ㄦ姤鎵归噺瀵煎叆</h2>
+                <h2 id="headerTarget" class="slds-text-heading--medium">鏃ユ姤鎵归噺瀵煎叆</h2>
                 <ui:button aura:id="close_button" label="鍏抽棴"
-                    class="close_button slds-button slds-button--neutral slds-order--1" press="{!c.close_import}" />
+                    class="close_button slds-button slds-button--neutral slds-order--1 buttonFontSize" press="{!c.close_import}" />
             </div>
-            <div class="slds-modal__content slds-scrollable slds-grow slds-p-around--medium ">
+            <div class="slds-modal__content slds-scrollable slds-grow slds-p-around--medium fontSize">
                 <aura:if isTrue="{!v.showMain}">
                     <div>
                         <lightning:input type="file" class="file" uara:id="file" onchange="{!c.CreateRecord}" />
                     </div>
                     <aura:set attribute="else">
-                        <ui:outputRichText class="uiOutputRichText slds-m--around-large" value="{!v.TableContent}" />
+                        <ui:outputRichText class="uiOutputRichText slds-m--around-large fontSize" value="{!v.TableContent}" />
                         <div class="slds-p-around--large slds-align--absolute-center">
-                            <lightning:button label="淇濆瓨" variant="brand" onclick="{!c.processFileContent}" />
-                            <lightning:button label="鍙栨秷" variant="brand" onclick="{!c.cancel}" />
+                            <lightning:button 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;">
+                                    <lightning:datatable keyField="id" data="{! v.errorData }"
+                                        columns="{! v.errorColumns }" hideCheckboxColumn="true" />
+                                </div>
+                            </div>
+                        </aura:if>
                     </aura:set>
+
                 </aura:if>
             </div>
         </div>
     </div>
     <div aura:id="modal_importbg" class="disp_none slds-backdrop slds-backdrop--open"></div>
-    <!-- 鎵归噺娣诲姞鍛ㄦ姤 end-->
+    <!-- 鎵归噺娣诲姞鏃ユ姤 end-->
 
-    <!-- 鎵归噺瀵煎嚭鍛ㄦ姤 start-->
+    <!-- 鎵归噺瀵煎嚭鏃ユ姤 start-->
     <div aura:id="modal_export" role="dialog" tabindex="-1"
         class="disp_none slds-modal slds-fade-in-open slds-modal--large">
         <div class="slds-modal__container">
             <div class="slds-modal__header">
                 <h4 id="headerTarget" class="slds-float--left"></h4>
-                <h2 id="headerTarget" class="slds-text-heading--medium">鍛ㄦ姤鎵归噺瀵煎嚭</h2>
+                <h2 id="headerTarget" class="slds-text-heading--medium">鏃ユ姤鎵归噺瀵煎嚭</h2>
                 <ui:button aura:id="close_button" label="鍏抽棴"
                     class="close_button slds-button slds-button--neutral slds-order--1" press="{!c.close_export}" />
             </div>
@@ -310,12 +386,12 @@
         </div>
     </div>
     <div aura:id="modal_exportbg" class="disp_none slds-backdrop slds-backdrop--open"></div>
-    <!-- 鎵归噺瀵煎嚭鍛ㄦ姤 end-->
+    <!-- 鎵归噺瀵煎嚭鏃ユ姤 end-->
     <div aura:id="modal_window" role="dialog" tabindex="-1"
         class="disp_none slds-modal slds-fade-in-open slds-modal--large" aria-labelledby="headerTarget">
         <div class="slds-modal__container">
             <div class="slds-modal slds-fade-in-open slds-hide" aura:id="successDiv">
-                <ui:inputText aura:id="articleURL" />
+                <!-- <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_success" role="alert">
@@ -332,7 +408,7 @@
                 </div>
             </div>
             <div class="slds-modal slds-fade-in-open slds-hide" aura:id="errorDiv" style="z-index: 10001">
-                <ui:inputText aura:id="articleURL" />
+                <!-- <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">
@@ -349,9 +425,8 @@
                 </div>
             </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>
+                    鏃ユ姤({!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>
@@ -361,14 +436,17 @@
                         <div
                             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" />
+                            <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-5 slds-large-size--1-of-6"
+                            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">
-                            <lightning:input aura:id="hospital_input_text" label="鍖婚櫌" class="field"
-                                value="{!v.hospital}" updateOn="keyup" />
+                            <!-- label="鍖婚櫌" -->
+                            鍖婚櫌
+                            <lightning:input aura:id="hospital_input_text" 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">
                                     <aura:iteration var="hospital" items="{!v.hospitalList}">
@@ -391,36 +469,40 @@
                         <div
                             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}" />
+                            <!-- <ui:inputText aura:id="select_department" class="slds-select"
+                                change="{!c.select_department}"/> -->
+                            <lightning:input type="text" onchange="{!c.select_department}" aura:id="select_department"
+                                variant="label-hidden" />
                         </div>
                         <!-- 缁忛攢鍟嗕汉鍛�  change="{!c.select_DealerPersonnel}" -->
-                        <div
-                            class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6">
+                        <div 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}
                             <ui:inputSelect aura:id="select_DealerPersonnel" class="slds-select" />
                         </div>
-                        <p hidden="hidden">
-                        <div
-                            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 label="鏂板缓" class="slds-button" press="{!c.createCon}" disabled="true"
-                                aura:id="new_con" />
-                        </div>
-                        </p>
-                        <!-- 宸ヤ綔璁板綍   -->
+                        <!-- 娲诲姩鍖哄垎   -->
                         <div
                             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 aura:id="select_purpose_type" class="slds-select"
                                 change="{!c.select_purpose_type}" />
                         </div>
-                        <!-- 鍖婚櫌浜哄憳 {!v.fieldsmap.doctor2__c}-->
-                        <div
-                            class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6">
-                            鍖婚櫌浜哄憳
+                        <!-- 鎷滆浜� {!v.fieldsmap.doctor2__c}-->
+                        <div 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;">
+                            鎷滆浜�
                             <ui:inputSelect aura:id="select_doctor" class="slds-select" change="{!c.doctor_change}" />
                         </div>
+                        <!-- <p hidden="hidden"> -->
+
+                        <div
+                            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 label="鏂板缓" class="slds-button" press="{!c.createCon}" disabled="true"
+                                aura:id="new_con" />
+                        </div>
+
+                        <!-- </p> -->
                         <hr />
                         <!-- 浜у搧鍒嗙被(绗笁鍒嗙被) change="{!c.select_ProductClassification}" -->
                         <div
@@ -431,19 +513,23 @@
                         </div>
                         <!-- 浣跨敤浜у搧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-6"
+                            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">
-                            <lightning:input aura:id="UseProduct1_TEXT" label="浣跨敤浜у搧1(浜у搧鍨嬪彿)" class="field"
-                                value="{!v.UseProduct1}" updateOn="keyup" />
+                            <!-- label="浣跨敤浜у搧1(浜у搧鍨嬪彿)" -->
+                            浣跨敤浜у搧1(浜у搧鍨嬪彿)
+                            <lightning:input aura:id="UseProduct1_TEXT" class="field" value="{!v.UseProduct1}"
+                                updateOn="keyup" variant="label-hidden" />
                             <div class="slds-lookup__menu" id="lookup-11">
-                                <ul class="slds-lookup__list" role="listbox">
+                                <ul class="slds-lookup__list" role="listbox" style="max-height:230px;">
                                     <aura:iteration var="UseProduct1" items="{!v.UseProduct1List}">
                                         <li role="presentation" onclick="{!c.seletUseProduct1Change}"
-                                            data-accid="{!UseProduct1.Id}" data-accName="{!UseProduct1.Name}">
+                                            data-accid="{!UseProduct1.Id}"
+                                            data-accName="{!UseProduct1.Asset_Model_No__c}">
                                             <span class="slds-lookup__item-action slds-media" id="lookup-option-498"
                                                 role="option">
                                                 <div class="slds-media__body">
-                                                    <div class="slds-lookup__result-text">{!UseProduct1.Name}</div>
+                                                    <div class="slds-lookup__result-text">
+                                                        {!UseProduct1.Asset_Model_No__c}</div>
                                                 </div>
                                             </span>
                                         </li>
@@ -453,19 +539,23 @@
                         </div>
                         <!-- 浣跨敤浜у搧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-6"
+                            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">
-                            <lightning:input aura:id="UseProduct2_TEXT" label="浣跨敤浜у搧2" class="field"
-                                value="{!v.UseProduct2}" updateOn="keyup" />
+                            <!-- label="浣跨敤浜у搧2" -->
+                            浣跨敤浜у搧2
+                            <lightning:input aura:id="UseProduct2_TEXT" class="field" value="{!v.UseProduct2}"
+                                updateOn="keyup" variant="label-hidden" />
                             <div class="slds-lookup__menu" id="lookup-22">
-                                <ul class="slds-lookup__list" role="listbox">
+                                <ul class="slds-lookup__list" role="listbox" style="max-height:230px;">
                                     <aura:iteration var="UseProduct2" items="{!v.UseProduct2List}">
                                         <li role="presentation" onclick="{!c.seletUseProduct2Change}"
-                                            data-accid="{!UseProduct2.Id}" data-accName="{!UseProduct2.Name}">
+                                            data-accid="{!UseProduct2.Id}"
+                                            data-accName="{!UseProduct2.Asset_Model_No__c}">
                                             <span class="slds-lookup__item-action slds-media" id="lookup-option-498"
                                                 role="option">
                                                 <div class="slds-media__body">
-                                                    <div class="slds-lookup__result-text">{!UseProduct2.Name}</div>
+                                                    <div class="slds-lookup__result-text">
+                                                        {!UseProduct2.Asset_Model_No__c}</div>
                                                 </div>
                                             </span>
                                         </li>
@@ -475,19 +565,23 @@
                         </div>
                         <!-- 浣跨敤浜у搧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-6"
+                            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">
-                            <lightning:input aura:id="UseProduct3_TEXT" label="浣跨敤浜у搧3" class="field"
-                                value="{!v.UseProduct3}" updateOn="keyup" />
+                            <!-- label="浣跨敤浜у搧3" -->
+                            浣跨敤浜у搧3
+                            <lightning:input aura:id="UseProduct3_TEXT" class="field" value="{!v.UseProduct3}"
+                                updateOn="keyup" variant="label-hidden" />
                             <div class="slds-lookup__menu" id="lookup-33">
-                                <ul class="slds-lookup__list" role="listbox">
+                                <ul class="slds-lookup__list" role="listbox" style="max-height:230px;">
                                     <aura:iteration var="UseProduct3" items="{!v.UseProduct3List}">
                                         <li role="presentation" onclick="{!c.seletUseProduct3Change}"
-                                            data-accid="{!UseProduct3.Id}" data-accName="{!UseProduct3.Name}">
+                                            data-accid="{!UseProduct3.Id}"
+                                            data-accName="{!UseProduct3.Asset_Model_No__c}">
                                             <span class="slds-lookup__item-action slds-media" id="lookup-option-498"
                                                 role="option">
                                                 <div class="slds-media__body">
-                                                    <div class="slds-lookup__result-text">{!UseProduct3.Name}</div>
+                                                    <div class="slds-lookup__result-text">
+                                                        {!UseProduct3.Asset_Model_No__c}</div>
                                                 </div>
                                             </span>
                                         </li>
@@ -502,17 +596,19 @@
                             <ui:inputSelect aura:id="select_EffectProgress" class="slds-select" />
                         </div>
                         <hr />
-                        <!-- 绉戝鍚岀被鑰楁潗鏈堜娇鐢ㄩ噺  ConsumptionOfConsumables__c-->
+                        <!-- 浜у搧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-6">
                             {!v.fieldsmap.ConsumptionOfConsumables__c}
-                            <ui:inputText aura:id="select_ConsumptionOfConsumables" class="slds-select"
-                                change="{!c.select_ConsumptionOfConsumables}" />
+                            <!-- <ui:inputText aura:id="select_ConsumptionOfConsumables" class="slds-select"
+                                change="{!c.select_ConsumptionOfConsumables}" /> -->
+                            <lightning:input type="text" onchange="{!c.select_ConsumptionOfConsumables}"
+                                aura:id="select_ConsumptionOfConsumables" variant="label-hidden" />
                         </div>
-                        <!-- 鏈+鍒嗙被   OtherBrandConsumables__c   -->
+                        <!-- 鏈+鍒嗙被   WarlockClassification__c   -->
                         <div
                             class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6">
-                            {!v.fieldsmap.OtherBrandConsumables__c}
+                            {!v.fieldsmap.WarlockClassification__c}
                             <ui:inputSelect aura:id="select_OtherBrandConsumables" class="slds-select" />
                         </div>
                         <!-- 宸查噰鐢ㄥ叾浠栧搧鐗�   ProductCcategory__c -->
@@ -532,11 +628,13 @@
                         <div
                             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}" />
+                            <!-- <ui:inputText aura:id="select_warlocksNumber" class="slds-select"
+                                change="{!c.select_warlocksNumber}" /> -->
+                            <lightning:input type="text" onchange="{!c.select_warlocksNumber}"
+                                aura:id="select_warlocksNumber" variant="label-hidden" />
                         </div>
-                        <!-- 宸ヤ綔鏍囪      WorkMark__c-->
-                        <div style="padding-left: 20px;">
+                        <!-- 鏀彺闇�姹�      WorkMark__c-->
+                        <div style="padding-left: 12px;">
                             {!v.fieldsmap.WorkMark__c}
                             <lightning:input type="checkbox" aura:id="select_WorkMark" />
                         </div>
@@ -608,7 +706,7 @@
                                             <td role="gridcell" class="slds-cell-edit">
                                                 <span class="slds-grid slds-grid--align-spread">
                                                     <span class="slds-truncate"
-                                                        title="{!item.Department_Cateogy__c}">{!item.Name}</span>
+                                                        title="{!item.Department_Cateogy_text__c}">{!item.Name}</span>
                                                 </span>
                                             </td>
                                             <td role="gridcell" class="slds-cell-edit">
@@ -620,7 +718,7 @@
                                             <td role="gridcell" class="slds-cell-edit">
                                                 <span class="slds-grid slds-grid--align-spread">
                                                     <span class="slds-truncate"
-                                                        title="{!item.Department_Cateogy__c}">{!item.Department_Cateogy__c}</span>
+                                                        title="{!item.Department_Cateogy_text__c}">{!item.Department_Cateogy_text__c}</span>
                                                 </span>
                                             </td>
                                             <td role="gridcell" class="slds-cell-edit">
@@ -677,7 +775,7 @@
         class="disp_none slds-modal slds-fade-in-open">
         <div class="slds-modal__container">
             <div class="slds-modal__header">
-                <h2 id="headertest" class="slds-text-heading--medium">鏂板缓.瀹㈡埛浜哄憳</h2>
+                <h2 id="headertest" class="slds-text-heading--medium">鏂板缓.鎷滆浜�</h2>
             </div>
             <div class="slds-modal__content slds-p-around--medium">
                 <lightning:recordEditForm aura:id="recordEditForm" objectApiName="Agency_Contact__c"
@@ -697,7 +795,7 @@
                     <div class="save_button_area">
                         <lightning:button class="slds-m-top_small" type="button" label="鍙栨秷"
                             onclick="{!c.createCancel}" />
-                        <lightning:button class="slds-m-top_small" type="button" label="鏂板缓"
+                        <lightning:button class="slds-m-top_small" type="button" label="淇濆瓨"
                             onclick="{!c.handleSubmit}" />
                     </div>
                 </lightning:recordEditForm>

--
Gitblit v1.9.1