From df5aa8087c2c7328dc4188f05d762c8df1f0b07a Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期二, 18 七月 2023 09:19:12 +0800
Subject: [PATCH] changeorg

---
 force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp |  563 --------------------------------------------------------
 1 files changed, 1 insertions(+), 562 deletions(-)

diff --git a/force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp b/force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp
index 84dfad2..ace93e6 100644
--- a/force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp
+++ b/force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <aura:component
     controller="WeeklyReportCmp"
     implements="force:appHostable,flexipage:availableForAllPageTypes,flexipage:availableForRecordHome,force:hasRecordId,force:lightningQuickAction,forceCommunity:availableForAllPageTypes"
@@ -73,58 +72,6 @@
     <aura:attribute name="report_count" type="Integer" />
     <aura:attribute name="dialog_type" type="String" />
     <aura:attribute name="truthy" type="Boolean" default="false" />
-=======
-<aura:component controller="WeeklyReportCmp" implements="force:appHostable,flexipage:availableForAllPageTypes,flexipage:availableForRecordHome,force:hasRecordId,force:lightningQuickAction,forceCommunity:availableForAllPageTypes" access="global" >
-    <ltng:require styles="{!$Resource.multilineToastCSS}" />聽
-    <aura:handler name="init" value="{!this}" action="{!c.doInit}"/>
-    <aura:handler event="c:strike_evt" action="{!c.createAopp}" name="strike_evt_addNewRecord"/>
-    <aura:attribute name="data" type="Agency_Report__c" default="{sobjectType:'Agency_Report__c'}"/>
-    <aura:attribute name="oppdata" type="Agency_Opportunity__c" default="{sobjectType:'Agency_Opportunity__c'}"/>
-    <aura:attribute name="acondata" type="Agency_Contact__c" default="{sobjectType:'Agency_Contact__c'}"/>
-    <!-- <aura:attribute name="oppdata_old" type="Agency_Opportunity__c" default="{sobjectType:'Agency_Opportunity__c'}"/> -->
-    <aura:attribute name="Close_Forecasted_Date__c_o" type="Date"/>
-    <aura:attribute name="Amount__c_o" type="String"/>
-    <aura:attribute name="OCMSale_Price__c_o" type="String"/>
-    <aura:attribute name="StageName__c_o" type="String"/>
-    <aura:attribute name="fieldsmap" type="Map"/>
-    <aura:attribute name="alldata" type="List"/>
-    <aura:attribute name="allselectlist" type="Map"/>
-    <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="loadOpp" type="Boolean" default="false"/>
-    <aura:attribute name="reportPageData" type="Map"/>
-    <aura:attribute name="selectbody" type="String"/>
-    <aura:attribute name="report_date_list" type="Map"/>
-    <aura:attribute name="selected_date" type="String"/>
-    <aura:attribute name="selected_agency_person" type="String"/>
-    <aura:attribute name="agency_report_header" type="String"/>
-    <aura:attribute name="agency_report_header_id" type="String"/>
-    <aura:attribute name="result" type="String" default=""/>
-    <aura:attribute name="hospital" type="string" default=""/>
-    <aura:attribute name="hospitalId" 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" />
-    <aura:attribute name="doctor_list" type="Map"/>
-    <aura:attribute name="doctor_title" type="String"/>
-    <aura:attribute name="opportunity_list" type="Map"/>
-    <aura:handler name="change" value="{!v.data.Opportunity__c}" action="{!c.opportunityChange}"/>
-    <aura:attribute name="edit_copy_select_report_id" type="String"/>
-    <aura:attribute name="create_agency_report_id" type="String"/>
-    <aura:attribute name="reports" type="List"/>
-    <aura:attribute name="reports_now" type="List"/>
-    <aura:attribute name="reports_now_count" type="Integer"/>
-    <aura:attribute name="mode" type="String"/>
-    <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_opportunity_id" type="String"/>
-    <aura:attribute name="report_count" type="Integer"/>
-    <aura:attribute name="dialog_type" type="String"/>
-    <aura:attribute name="truthy" type="Boolean" default="false"/>
->>>>>>> LEXCommunityLiJun
     <aura:attribute name="list_message" type="String" default="鎼滅储" />
     <aura:attribute name="confirm_status" type="Integer" default="0" />
     <aura:attribute name="modal_confirm_title" type="String" />
@@ -134,21 +81,16 @@
     <aura:handler name="change" value="{!v.data.Product_Category2__c}" action="{!c.productcategoryChange2}"/>
     <aura:handler name="change" value="{!v.data.Product_Category3__c}" action="{!c.productcategoryChange3}"/> -->
     <!-- <aura:handler name="change" value="{!v.oppdata.StageName__c}" action="{!c.stageNameChange}"/> -->
-<<<<<<< HEAD
     <aura:attribute
         name="update_select_report_data_id"
         type="String"
         default=""
     />
-=======
-    <aura:attribute name="update_select_report_data_id" type="String" default=""/>
->>>>>>> LEXCommunityLiJun
 
     <!-- 鎵归噺娣诲姞鍛ㄦ姤 start-->
     <aura:attribute name="reports_date" type="List" />
     <!-- <aura:attribute name="reports_date1" type="Date" />
     <aura:attribute name="reports_date2" type="Date" /> -->
-<<<<<<< HEAD
     <aura:attribute
         name="TableContent"
         type="String"
@@ -179,26 +121,6 @@
     <aura:attribute name="awsurl" type="Map" />
     <aura:attribute name="contactawsurl" type="Map" />
     <aura:attribute name="allselectlistAgencyPerson" type="Map" />
-=======
-    <aura:attribute name="TableContent" type="String"  description=" Show the Result class"/>
-    <aura:attribute name="TableContent2" type="String"  description=" Show the Result class"/>
-    <aura:attribute name="TargetFileName" type="String"  description="Name of the file"/>
-    <aura:attribute name="tableheaders" type="Object[]" />
-    <aura:attribute name="fileContentData" type="String"/>
-    <aura:attribute name="filename" type="String"/>
-    <!-- It will display 100 records . Change for your requirement-->
-    <aura:attribute name="NumOfRecords" type="Integer" default="1000"/> 
-    <aura:attribute name="showMain" type="Boolean" default="true"/>
-    <!-- PIPL update Yin Mingjie 21/02/2022 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"/>
->>>>>>> LEXCommunityLiJun
     <!-- PIPL update Yin Mingjie 21/02/2022 end -->
 
     <!-- start DTT-zhj 澧炲姞閿欒淇℃伅table 2023-05-16-->
@@ -211,25 +133,17 @@
     <!-- 鎵归噺娣诲姞鍛ㄦ姤 end-->
     <ltng:require scripts="{! $Resource.AWSService+'/AWSService.js' }" />
     <ltng:require scripts="{! $Resource.jquery183minjs }" />
-<<<<<<< HEAD
 
-=======
-    
->>>>>>> LEXCommunityLiJun
     <!--銉兗銉変腑...-->
     <aura:renderIf isTrue="{!v.login}">
         <aura:renderIf isTrue="{!!v.loginEdit}">
             <!-- add by Deloitte-Link 2023-6-19 -->
             <div class="weeklyReportSpinner">
                 <div class="slds-spinner_container">
-<<<<<<< HEAD
                     <div
                         class="slds-spinner--brand slds-spinner slds-spinner--medium"
                         role="alert"
                     >
-=======
-                    <div class="slds-spinner--brand slds-spinner slds-spinner--medium" role="alert">
->>>>>>> LEXCommunityLiJun
                         <span id="aa" class="slds-assistive-text">Loading</span>
                         <div class="slds-spinner__dot-a"></div>
                         <div class="slds-spinner__dot-b"></div>
@@ -238,7 +152,6 @@
             </div>
         </aura:renderIf>
     </aura:renderIf>
-<<<<<<< HEAD
 
     <div aura:id="report" id="report" class="contents_wrapper">
         <div class="slds-grid slds-wrap slds-grid--pull-padded">
@@ -373,75 +286,10 @@
                             <span class="slds-truncate" title="Name"
                                 >{!v.fieldsmap.Purpose_Type__c}</span
                             >
-=======
-    
-    <div aura:id="report" id="report" class="contents_wrapper">
-        <div class="slds-grid slds-wrap slds-grid--pull-padded">
-            <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">
-                鍛�
-            </div>
-            <div 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" class="slds-select" change="{!c.select_date_change}"/>
-            </div>
-            
-            <!-- 浠g悊搴楁媴褰撹�� -->
-            <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">
-                {!v.fieldsmap.Person_In_Charge2__c}
-            </div>
-            <div 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_agency_person" class="slds-select agency_person_select" change="{!c.select_agency_change}"/>
-            </div>
-            <div class="tr slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-12 slds-large-size--1-of-12">
-                <ui:button aura:id="new_button" label="鏂板缓" press="{!c.new_report}" disabled="true"/>
-            </div>
-            <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-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="import" label="瀵煎叆" press="{!c.import}" />
-                
-                <!-- <input type="file" class="file" aura:id="file" onchange="{!c.CreateRecord}"  style="position:absolute;filter:alpha(opacity=0);" size="1" hidden="true" />  -->
-                <!-- <ui:button aura:id="import" label="瀵煎嚭" press="{!c.export}"/> -->
-                <ui:button aura:id="export" label="瀵煎嚭" press="{!c.export_condition}"/>
-            </div>
-            
-        </div>
-    </div>
-    
-    <div aura:id="report_list" class="report_list_area" >
-        <div class="slds-table--edit_container slds-is-relative">
-            <table class="slds-table slds-table--edit slds-table--bordered slds-table--fixed-layout slds-no-cell-focus" role="grid" style="width:66.75rem;">
-                <thead>
-                    <tr class="slds-line-height--reset">
-                        <th class="table_header slds-text-title--caps" style="width: 250px;font-size: 13px;">
-                            <span class="slds-truncate" title="Name">鍛ㄦ姤缂栧彿</span>
-                        </th>
-                        <th class="table_header slds-text-title--caps" style="width: 100px;font-size: 13px;">
-                            <span class="slds-truncate" title="Name">{!v.fieldsmap.Person_In_Charge2__c}</span>
-                        </th>
-                        <th class="table_header slds-text-title--caps" style="width: 250px;font-size: 13px;">
-                            <span class="slds-truncate" title="Name">鍖婚櫌</span>
-                        </th>
-                        <th class="table_header slds-text-title--caps" style="width: 100px;font-size: 13px;">
-                            <span class="slds-truncate" title="Name">{!v.fieldsmap.Department_Cateogy__c}</span>
-                        </th>
-                        <th class="table_header slds-text-title--caps" style="width: 100px;font-size: 13px;">
-                            <!-- PIPL update Yin Mingjie 21/02/2022 start
-                            <span class="slds-truncate" title="Name">{!v.fieldsmap.doctor2__r}</span>
-                            PIPL update Yin Mingjie 21/02/2022 end-->
-                            <span class="slds-truncate" title="Name" style="width: 100px;font-size: 13px;">{!v.fieldsmap.Agency_Contact__c}</span>
-                            
-                        </th>
-                        <th class="table_header slds-text-title--caps" style="width: 100px;font-size: 13px;">
-                            <span class="slds-truncate" title="Name">{!v.fieldsmap.visitor_title__c}</span>
-                        </th>
-                        <th class="table_header slds-text-title--caps" style="width: 100px;font-size: 13px;">
-                            <span class="slds-truncate" title="Name">{!v.fieldsmap.Purpose_Type__c}</span>
->>>>>>> LEXCommunityLiJun
                         </th>
                     </tr>
                 </thead>
                 <tbody>
-<<<<<<< HEAD
                     <aura:iteration
                         items="{!v.reports}"
                         var="item"
@@ -470,17 +318,6 @@
                                         class="slds-truncate"
                                         title="{!item.Person_In_Charge2__r.Name}"
                                     >
-=======
-                    <aura:iteration items="{!v.reports}" var="item" indexVar="index">
-                        <tr class="slds-hint-parent">
-                            <td role="gridcell" class="slds-cell-edit">
-                                <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">
-                                <span class="slds-grid slds-grid--align-spread">
-                                    <span class="slds-truncate" title="{!item.Person_In_Charge2__r.Name}">
->>>>>>> LEXCommunityLiJun
                                         {!item.Person_In_Charge2__r.Name}
                                         <!-- <span class="decrypt">{!item.Person_In_Charge2__r.awsdata.lastName}</span> -->
                                     </span>
@@ -493,20 +330,15 @@
                             </th>
                             <td role="gridcell" class="slds-cell-edit">
                                 <span class="slds-grid slds-grid--align-spread">
-<<<<<<< HEAD
                                     <span
                                         class="slds-truncate"
                                         title="{!item.Department_Cateogy__c}"
                                         >{!item.Department_Cateogy__c}</span
                                     >
-=======
-                                    <span class="slds-truncate" title="{!item.Department_Cateogy__c}">{!item.Department_Cateogy__c}</span>
->>>>>>> LEXCommunityLiJun
                                 </span>
                             </td>
                             <td role="gridcell" class="slds-cell-edit">
                                 <span class="slds-grid slds-grid--align-spread">
-<<<<<<< HEAD
                                     <span
                                         class="slds-truncate"
                                         title="{!item.doctor2__r.Name}"
@@ -517,17 +349,11 @@
                                         <span class="decrypt"
                                             >{!item.doctor2__r.awsdata.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>
->>>>>>> LEXCommunityLiJun
                                     </span>
                                 </span>
                             </td>
                             <td role="gridcell" class="slds-cell-edit">
                                 <span class="slds-grid slds-grid--align-spread">
-<<<<<<< HEAD
                                     <span
                                         class="slds-truncate"
                                         title="{!item.visitor_title__c}"
@@ -538,25 +364,16 @@
                                         <span class="decrypt"
                                             >{!item.doctor2__r.awsdata.doctorDivision1}</span
                                         >
-=======
-                                    <span class="slds-truncate" title="{!item.visitor_title__c}">
-                                        <span class="encrypt">{!item.visitor_title__c}</span>
-                                        <span class="decrypt">{!item.doctor2__r.awsdata.doctorDivision1}</span>
->>>>>>> LEXCommunityLiJun
                                     </span>
                                 </span>
                             </td>
                             <td role="gridcell" class="slds-cell-edit">
                                 <span class="slds-grid slds-grid--align-spread">
-<<<<<<< HEAD
                                     <span
                                         class="slds-truncate"
                                         title="{!item.Purpose_Type__c}"
                                         >{!item.Purpose_Type__c}</span
                                     >
-=======
-                                    <span class="slds-truncate" title="{!item.Purpose_Type__c}">{!item.Purpose_Type__c}</span>
->>>>>>> LEXCommunityLiJun
                                 </span>
                             </td>
                         </tr>
@@ -566,7 +383,6 @@
         </div>
         <aura:renderIf isTrue="{!v.report_count > 0}">
             <aura:set attribute="else">
-<<<<<<< HEAD
                 <div class="no_data_area">{!v.list_message}</div>
             </aura:set>
         </aura:renderIf>
@@ -737,94 +553,6 @@
                                 variant="brand"
                                 onclick="{!c.close_export}"
                             />
-=======
-                <div class="no_data_area">
-                    {!v.list_message}
-                </div>
-            </aura:set>
-        </aura:renderIf>
-    </div>
-
-    <!--    <ui:button aura:id="test_button" label="test" class="fade animation_on" press="{!c.test}"/>-->
-    <!-- 鎵归噺娣诲姞鍛ㄦ姤 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__container ">
-            <aura:renderIf isTrue="{!v.loginEdit}">
-                <lightning:spinner alternativeText="Loading" size="medium" style="width: 100%; height: 80%;top:50px;" />
-            </aura:renderIf>
-            <div class="slds-modal__header ">
-                <h4 id="headerTarget" class="slds-float--left"></h4>
-                <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}"/>
-            </div>
-            <div class="slds-modal__content slds-scrollable slds-grow slds-p-around--medium " >
-                <aura:if isTrue="{!v.showMain}">
-                    <div>
-                        <!-- <input type="file" class="file" aura:id="file" onchange="{!c.CreateRecord}" value="瀵煎叆" /> -->
-                        <lightning:input type="file" class="file" uara:id="file" onchange="{!c.CreateRecord}" />
-                        <!-- <ui:button label="Create Accounts" press="{!c.CreateRecord}"/> -->
-                    </div>
-                    <aura:set attribute="else">
-                        <!-- <ui:outputRichText class="uiOutputRichText slds-m-around-large" value="{!v.TargetFileName}"/>  -->
-                        <ui:outputRichText class="uiOutputRichText slds-m--around-large" 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}" /> 
-                        </div>
-                        <!-- start DTT-zhj 澧炲姞閿欒淇℃伅table 2023-05-16-->
-                        <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>
-                        <!-- start DTT-zhj 澧炲姞閿欒淇℃伅table 2023-05-16-->
-                    </aura:set>
-                </aura:if>
-            </div>
-        </div>
-    </div>
-    <div aura:id="modal_importbg" class="disp_none slds-backdrop slds-backdrop--open"></div>
-    <!-- 鎵归噺娣诲姞鍛ㄦ姤 end-->
-
-    <!-- 鎵归噺瀵煎嚭鍛ㄦ姤 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>
-                <ui:button aura:id="close_button" label="鍏抽棴" class="close_button slds-button slds-button--neutral slds-order--1" press="{!c.close_export}"/>
-            </div>
-            <div class="slds-modal__content slds-scrollable slds-grow slds-p-around--medium">
-                <aura:if isTrue="{!v.showMain}">
-                    <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-5 slds-large-size--1-of-4">
-                        </div>
-                        <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-4">
-                            娲诲姩鏃ュ紑濮嬫棩鏈�
-                            
-                            <lightning:input type="Date" class="slds-input slds-input_bare " aura:id="input-report-date1" />
-                        </div>
-                        <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-4">
-                            娲诲姩鏃ョ粨鏉熸棩鏈�
-                            <lightning:input type="Date" class="slds-input slds-input_bare " aura:id="input-report-date2" />
-                        </div>
-                        <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-4">
-                        </div>
-
-                        <div class="slds-p-around--large slds-align--absolute-center">
-                            <lightning:button label="纭" variant="brand" onclick="{!c.select_repores_date}"
-                                                  />
-                            <lightning:button label="鍙栨秷" variant="brand" 
-                                                  onclick="{!c.close_export}" /> 
->>>>>>> LEXCommunityLiJun
                         </div>
                     </div>
                     <!-- <div>
@@ -837,7 +565,6 @@
                                               onclick="{!c.close_export}" /> 
                     </div> -->
                     <aura:set attribute="else">
-<<<<<<< HEAD
                         <ui:outputRichText
                             class="uiOutputRichText slds-m--around-large"
                             value="{!v.TableContent2}"
@@ -856,22 +583,11 @@
                                 onclick="{!c.close_export}"
                             />
                         </div>
-=======
-                        <ui:outputRichText class="uiOutputRichText slds-m--around-large" value="{!v.TableContent2}"/>
-                        <div class="slds-p-around--large slds-align--absolute-center">
-                            <lightning:button label="纭" variant="brand" onclick="{!c.exportDate}"
-                                              />
-                            <lightning:button label="鍙栨秷" variant="brand" 
-                                              onclick="{!c.close_export}" /> 
-                        </div>
-                        
->>>>>>> LEXCommunityLiJun
                     </aura:set>
                 </aura:if>
             </div>
         </div>
     </div>
-<<<<<<< HEAD
     <div
         aura:id="modal_exportbg"
         class="disp_none slds-backdrop slds-backdrop--open"
@@ -959,43 +675,6 @@
                                                     >
                                                         {!hospital.Hospital_Name_readonly__c}
                                                     </div>
-=======
-    <div aura:id="modal_exportbg" class="disp_none slds-backdrop slds-backdrop--open"></div>
-    <!-- 鎵归噺瀵煎嚭鍛ㄦ姤 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" >
-            <aura:renderIf isTrue="{!v.loginEdit}">
-                <lightning:spinner alternativeText="Loading" size="medium" style="width: 100%; height: 80%;top:50px;" />
-            </aura:renderIf>
-            <div class="slds-modal__header">
-                <h4 id="headerTarget" class="slds-float--left"></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-5 slds-large-size--1-of-6 marginTop" >
-                            娲诲姩鏃�
-                            <!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> -->
-                            <!-- <force:inputField 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-5 marginTop" data-select="single">
-                            <!-- <ui:inputText aura:id="hospital_input_text" label="鍖婚櫌" class="field" value="{!v.hospital}" updateOn="keyup"/> -->
-                            鍖婚櫌
-                            <lightning:input aura:id="hospital_input_text" class="field" value="{!v.hospital}" variant="label-hidden" updateOn="keyup"/>
-                            <div class="slds-lookup__menu" id="lookup-66">
-                                <ul class="slds-lookup__list" role="listbox">
-                                    <aura:iteration var="hospital" items="{!v.hospitalList}">
-                                        <li role="presentation" onclick="{!c.selectHos}" data-accName="{!hospital.Hospital_Name_readonly__c}" data-accId="{!hospital.Hospital__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">{!hospital.Hospital_Name_readonly__c}</div>
->>>>>>> LEXCommunityLiJun
                                                 </div>
                                             </span>
                                         </li>
@@ -1003,7 +682,6 @@
                                 </ul>
                             </div>
                         </div>
-<<<<<<< HEAD
 
                         <!-- 绉戝鍒嗙被 -->
                         <div
@@ -1490,7 +1168,7 @@
                         <lightning:button
                             class="slds-m-top_small"
                             type="submit"
-                            label="鏂板缓"
+                            label="淇濆瓨"
                         />
                     </div>
                 </lightning:recordEditForm>
@@ -1498,242 +1176,3 @@
         </div>
     </div>
 </aura:component>
-=======
-                        
-                        <!-- 绉戝鍒嗙被 -->
-                        <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-8 marginTop">
-                            {!v.fieldsmap.Department_Cateogy__c}
-                            <ui:inputSelect aura:id="select_department" class="slds-select" change="{!c.select_department}"/>
-                        </div>
-                        
-                        <!-- 鍏堢敓 -->
-                        <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-8 marginTop">
-                            {!v.fieldsmap.doctor2__c}
-                            <ui:inputSelect aura:id="select_doctor" class="slds-select" change="{!c.doctor_change}"/>
-                        </div>
-                        
-                        <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-12 marginTop">
-                            <br/>
-                            <ui:button label="鏂板缓" class="slds-button" press="{!c.createCon}" disabled="true" aura:id="new_con"/>
-                        </div>
-                        
-                        <!-- 鑱屼綅 -->
-                        <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-8 marginTop">
-                            {!v.fieldsmap.visitor_title__c}
-                            <div>{!v.doctor_title}</div>
-                        </div>       
-                        <!-- 娲诲姩鍖哄垎 -->
-                        <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6 marginTop">
-                            {!v.fieldsmap.Purpose_Type__c}
-                            <ui:inputSelect aura:id="select_purpose_type" class="slds-select" change="{!c.select_purpose_type}"/>
-                        </div>
-                        <!-- 璇环 -->
-                        <div aura:id="input-opportunity-opp" class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--4-of-12 slds-large-size--4-of-12 marginTop">
-                            {!v.fieldsmap.Opportunity__c}
-                            <!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> -->
-                            <!-- <force:inputField value="{!v.data.Opportunity__c}" aura:id="input-opportunity"/> -->
-                            <c:strike_lookup label=""
-                                    object="Agency_Opportunity__c"
-                                    searchField="Name"
-                                    placeholder="鎼滅储缁忛攢鍟嗚浠�..."
-                                    iconName="standard:opportunity"
-                                    subtitleField="Department_Cateogy__c,Agency_Opportunity_No__c,Change_To_Opportunity__r.Name"
-                                    order="StageName__c"
-                                    limit="5"
-                                    loadingMessage="Loading..."
-                                    errorMessage="Invalid input"
-                                    allowNewRecords = "true"
-                                    overrideNewEvent = "true"
-                                    showRecentRecords ="true"
-                                    value="{!v.data.Opportunity__c}"
-                                    filter="{!v.opportunity_cfilter}"
-                                    subTitleFormat="{0}+{1}+{2}"/>
-                        </div>
-                        <div aura:id="input-opportunity-blank" class="lds-p-horizontal--small slds-size--1-of-1 slds-medium-size--8-of-12 slds-large-size--8-of-12 marginTop">
-                        </div>
-                        <div aura:id="input-opportunity-stage" class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12 marginTop">
-                            {!v.fieldsmap.StageName__c}
-                            <!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> -->
-                            <ui:inputSelect aura:id="select_stageName" class="slds-select"/>
-                            <!-- <force:inputField value="{!v.oppdata.StageName__c}" aura:id="input-oppstage" /> -->
-                        </div>
-                        <div aura:id="input-opportunity-amount1" class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12 marginTop">
-                            {!v.fieldsmap.Amount__c}
-                            <!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> -->
-                            <force:inputField value="{!v.oppdata.Amount__c}" class=""/>
-                        </div>
-                        <div aura:id="input-opportunity-amount2" class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12 marginTop">
-                            {!v.fieldsmap.OCMSale_Price__c}
-                            <!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> -->
-                            <force:inputField value="{!v.oppdata.OCMSale_Price__c}" class=""/>
-                        </div>
-                        <div aura:id="input-opportunity-date" class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12 marginTop">
-                            {!v.fieldsmap.Close_Forecasted_Date__c}
-                            <!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> -->
-                            <force:inputField value="{!v.oppdata.Close_Forecasted_Date__c}" class=""/>
-                        </div>
-                        <!-- 瑁藉搧鍒嗛 -->
-                        <div aura:id="product_category_select1" class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12 marginTop">
-                            {!v.fieldsmap.Product_Category1__c}
-                            <!-- <force:inputField value="{!v.data.Product_Category1__c}" aura:id="input-product-category1"/> -->
-                            <ui:inputSelect aura:id="select_Product1" class="slds-select" change="{!c.productcategoryChange1}"/>
-                        </div>
-                        <div aura:id="product_category_select2" class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12 marginTop">
-                            {!v.fieldsmap.Product_Category2__c}
-                            <!-- <force:inputField value="{!v.data.Product_Category2__c}" aura:id="input-product-category2"/> -->
-                            <ui:inputSelect aura:id="select_Product2" class="slds-select" change="{!c.productcategoryChange2}"/>
-                        </div>
-                        <div aura:id="product_category_select3" class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12 marginTop">
-                            {!v.fieldsmap.Product_Category3__c}
-                            <!-- <force:inputField value="{!v.data.Product_Category3__c}" aura:id="input-product-category3"/> -->
-                            <ui:inputSelect aura:id="select_Product3" class="slds-select" change="{!c.productcategoryChange3}"/>
-                        </div>
-                        <!--SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start-->
-                        <!-- 鏀彺闇�姹� change="{!c.SupportNeeds__c}"-->
-                        <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6 marginTop">
-                            {!v.fieldsmap.SupportNeeds__c}
-                            <ui:inputSelect aura:id="SupportNeeds__c" class="slds-select" />
-                        </div>
-                        <!--SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� end-->
-                        <div aura:id="result" class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12 marginTop">
-                            {!v.fieldsmap.Result__c}
-                            <ui:inputSelect aura:id="select_result" class="slds-select"/>
-                            <!-- <ui:inputText label="缁撴灉" class="bcolor" value="{!v.result}"/> -->
-                        </div>
-                    </div>
-                </div>
-                <div class="save_button_area">
-                	<ui:button aura:id="save_button" label="淇濆瓨骞舵柊寤�" class="save_button slds-button slds-button--brand slds-order--3" press="{!c.save_report}"/>
-                </div>
-                
-                <aura:renderIf isTrue="{!v.reports_now_count > 0}">
-                    <div class="mt40 slds-box slds-theme--shade">
-                        <div class="slds-table--edit_container slds-is-relative">
-                            <table class="slds-table slds-table--edit slds-table--bordered slds-table--fixed-layout slds-no-cell-focus" role="grid">
-                                <thead>
-                                    <tr class="slds-line-height--reset">
-                                        <th class="table_header slds-text-title--caps">
-                                            <span class="slds-truncate" title="Name"></span>
-                                        </th>
-                                        <th class="table_header slds-text-title--caps">
-                                            <span class="slds-truncate" title="Name">鍖婚櫌</span>
-                                        </th>
-                                        <th class="table_header slds-text-title--caps">
-                                            <span class="slds-truncate" title="Name">{!v.fieldsmap.Department_Cateogy__c}</span>
-                                        </th>
-                                        <th class="table_header slds-text-title--caps">
-                                            <span class="slds-truncate" title="Name">{!v.fieldsmap.doctor2__c}</span>
-                                        </th>
-                                        <th class="table_header slds-text-title--caps">
-                                            <span class="slds-truncate" title="Name">{!v.fieldsmap.visitor_title__c}</span>
-                                        </th>
-                                        <th class="table_header slds-text-title--caps">
-                                            <span class="slds-truncate" title="Name">{!v.fieldsmap.Purpose_Type__c}</span>
-                                        </th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    <aura:iteration items="{!v.reports_now}" var="item" indexVar="index">
-                                        <tr aura:id="modal_data_list_tr" class="slds-hint-parent">
-                                            <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>
-                                                </span>
-                                            </td>
-                                            <td role="gridcell" class="slds-cell-edit">
-                                                <span class="slds-grid slds-grid--align-spread">
-                                                    <span class="slds-truncate" title="{!item.Agency_Hospital__r.Name}">{!item.Agency_Hospital__r.Name}</span>
-                                                </span>
-                                            </td>
-                                            <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>
-                                                </span>
-                                            </td>
-                                            <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>
-                                                        <span class="decrypt">{!item.doctor2NameOrigin}</span>
-                                                    </span>
-                                                </span>
-                                            </td>
-                                            <td role="gridcell" class="slds-cell-edit">
-                                                <span class="slds-grid slds-grid--align-spread">
-                                                    <span class="slds-truncate" title="{!item.visitor_title__c}">
-                                                        <span class="encrypt">{!item.visitor_title__c}</span>
-                                                        <span class="decrypt">{!item.visitorTitleOrigin}</span>
-                                                    </span>
-                                                </span>
-                                            </td>
-                                            <td role="gridcell" class="slds-cell-edit">
-                                                <span class="slds-grid slds-grid--align-spread">
-                                                    <span class="slds-truncate" title="{!item.Purpose_Type__c}">{!item.Purpose_Type__c}</span>
-                                                </span>
-                                            </td>
-                                        </tr>
-                                    </aura:iteration>
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
-                </aura:renderIf>
-            </div>
-        </div>
-    </div>
-    <div aura:id="modal_bg" class="disp_none slds-backdrop slds-backdrop--open"></div>
-    
-    <div aura:id="modal_confirm" role="dialog" tabindex="-2" aria-labelledby="header43" class="disp_none slds-modal slds-fade-in-open">
-        <div class="slds-modal__container">
-            <div class="slds-modal__header">
-                <h2 id="header43" class="slds-text-heading--medium">{!v.modal_confirm_title}</h2>
-            </div>
-            <div class="slds-modal__content slds-p-around--medium">
-                <p>{!v.modal_confirm_text}</p>
-            </div>
-            <div class="slds-modal__footer">
-                <ui:button label="鏄�" class="slds-button slds-button--brand" press="{!c.yes_button}"/>
-                <ui:button label="鍚�" class="slds-button slds-button--neutral" press="{!c.no_button}" />
-            </div>
-        </div>
-    </div>
-    <div aura:id="modal_confirm_bg" class="disp_none slds-backdrop slds-backdrop--open"></div>
-
-    <div aura:id="modal_newAC" role="dialog" tabindex="-3" aria-labelledby="headertest" class="disp_none slds-modal slds-fade-in-open">
-        <div class="slds-modal__container">
-            <aura:renderIf isTrue="{!v.loginEdit}">
-                <lightning:spinner alternativeText="Loading" size="medium" style="width: 100%; height: 80%;top:50px;" />
-            </aura:renderIf>
-            <div class="slds-modal__header">
-                <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" onsuccess="{!c.handleSuccess}" onload="{!c.showRequiredFields}" onsubmit="{!c.handleSubmit}">
-        			<lightning:messages aura:id="OppMessage" />
-                    <!-- onload="{!c.showRequiredFields}" -->
-                    <aura:renderIf isTrue="{!v.truthy}">
-                        <lightning:inputField fieldName="Name" aura:id="newOpportunityField" />
-                        <lightning:inputField fieldName="Type__c" aura:id="newOpportunityField" />
-                        <lightning:inputField fieldName="Doctor_Division1__c" aura:id="newOpportunityField" />
-                        <!-- <lightning:inputField class="customRequired none" aura:id="Input_type__c" fieldName="Type__c"/>
-                        <lightning:inputField class="customRequired none" aura:id="Input_Doctor_Division1__c" fieldName="Doctor_Division1__c"/> -->
-                    </aura:renderIf>
-                    <br/>
-                    <br/>
-                    <br/>
-                    <br/>
-                    <br/>
-                    <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="submit" label="淇濆瓨" />
-                    </div>
-
-                    
-    			</lightning:recordEditForm>
-            </div>
-        </div>
-    </div>
-    
-
-</aura:component>
->>>>>>> LEXCommunityLiJun

--
Gitblit v1.9.1