From 36d15f189de2e83ce2576715dac30c3c260388dd Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:47:50 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.cmp | 1328 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 1,321 insertions(+), 7 deletions(-)
diff --git a/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.cmp b/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.cmp
index 7f5d645..9df8447 100644
--- a/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.cmp
+++ b/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.cmp
@@ -1,3 +1,33 @@
+<<<<<<< HEAD
+<aura:component
+ controller="RetrospectiveWeeklyReportController"
+ 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}" />
+ <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:'Ag
+ ency_Contact__c'}"
+ />
+=======
<aura:component controller="RetrospectiveWeeklyReportController"
implements="force:appHostable,flexipage:availableForAllPageTypes,flexipage:availableForRecordHome,force:hasRecordId,force:lightningQuickAction,forceCommunity:availableForAllPageTypes,lightning:availableForFlowScreens"
access="global">
@@ -8,6 +38,7 @@
<aura:attribute name="oppdata" type="Agency_Opportunity__c" default="{sobjectType:'Agency_Opportunity__c'}" />
<aura:attribute name="acondata" type="Agency_Contact__c" default="{sobjectType:'Ag
ency_Contact__c'}" />
+>>>>>>> LEXCommunityLiJun
<aura:attribute name="successMessage" type="String" />
<aura:attribute name="etEng" type="String" />
<aura:attribute name="errorMessage" type="String" />
@@ -26,7 +57,15 @@
<aura:attribute name="docmap" type="Map" />
<aura:attribute name="login" type="Boolean" default="false" />
<aura:attribute name="loginEdit" type="Boolean" default="false" />
+<<<<<<< HEAD
+ <aura:attribute
+ name="modal_import_spinner"
+ type="Boolean"
+ default="false"
+ />
+=======
<aura:attribute name="modal_import_spinner" type="Boolean" default="false" />
+>>>>>>> LEXCommunityLiJun
<aura:attribute name="loadOpp" type="Boolean" default="false" />
<aura:attribute name="reportPageData" type="Map" />
<aura:attribute name="selectbody" type="String" />
@@ -46,19 +85,43 @@
<!-- 浣跨敤浜у搧1(浜у搧鍨嬪彿) -->
<aura:attribute name="UseProduct1" type="string" default="" />
<aura:attribute name="UseProduct1s" type="string" default="" />
+<<<<<<< HEAD
+ <aura:handler
+ name="change"
+ value="{!v.UseProduct1}"
+ action="{!c.UseProduct1Change}"
+ />
+=======
<aura:handler name="change" value="{!v.UseProduct1}" action="{!c.UseProduct1Change}" />
+>>>>>>> LEXCommunityLiJun
<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="" />
+<<<<<<< HEAD
+ <aura:handler
+ name="change"
+ value="{!v.UseProduct2}"
+ action="{!c.UseProduct2Change}"
+ />
+=======
<aura:handler name="change" value="{!v.UseProduct2}" action="{!c.UseProduct2Change}" />
+>>>>>>> LEXCommunityLiJun
<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="" />
+<<<<<<< HEAD
+ <aura:handler
+ name="change"
+ value="{!v.UseProduct3}"
+ action="{!c.UseProduct3Change}"
+ />
+=======
<aura:handler name="change" value="{!v.UseProduct3}" action="{!c.UseProduct3Change}" />
+>>>>>>> LEXCommunityLiJun
<aura:attribute name="UseProduct3List" type="Map" />
<aura:attribute name="UseProduct3Id" type="string" default="" />
<!--SWAG-CF58C3 fy start -->
@@ -72,6 +135,74 @@
<aura:attribute name="allselectlistAgencyPerson" type="Map" />
<!--SWAG-CF58C3 fy end -->
+<<<<<<< HEAD
+ <aura:attribute name="doctor_list" type="Map" />
+ <!-- <aura:attribute name="doctor_title" type="String" /> -->
+ <aura:attribute name="opportunity_list" type="Map" />
+ <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_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" />
+ <aura:attribute name="truthy" type="Boolean" default="false" />
+ <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" />
+ <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-->
+ <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"
+ />
+ <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" />
+ <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" />
+
+ <ltng:require scripts="{! $Resource.AWSService+'/AWSService.js' }" />
+ <ltng:require scripts="{! $Resource.jquery183minjs }" />
+
+=======
<aura:attribute name="doctor_list" type="Map" />
<!-- <aura:attribute name="doctor_title" type="String" /> -->
@@ -123,15 +254,116 @@
<ltng:require scripts="{! $Resource.AWSService+'/AWSService.js' }" />
<ltng:require scripts="{! $Resource.jquery183minjs }" />
+>>>>>>> LEXCommunityLiJun
<!-- 鎵归噺娣诲姞鏃ユ姤 end-->
<!--銉兗銉変腑...-->
<aura:renderIf isTrue="{!v.login}">
<aura:renderIf isTrue="{!!v.loginEdit}">
- <lightning:spinner alternativeText="Loading" size="medium" />
+ <!-- <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> -->
+<<<<<<< HEAD
+ <div
+ class="slds-spinner_container"
+ id="spinner"
+ style="position: fixed; top: 123px"
+ >
+=======
+ <div class="slds-spinner_container" id="spinner" style="position: fixed;top:123px;">
+>>>>>>> LEXCommunityLiJun
+ <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>
</aura:renderIf>
</aura:renderIf>
<div aura:id="report" id="report">
<div class="slds-grid slds-wrap slds-grid--pull-padded">
+<<<<<<< HEAD
+ <div style="width: 150px"></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"
+ >
+ 鍛�
+ </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"
+ >
+ <ui:inputSelect
+ aura:id="select_date"
+ class="slds-select"
+ change="{!c.select_date_change}"
+ />
+ </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"
+ style="display: none"
+ >
+ {!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"
+ style="display: none"
+ >
+ <ui:inputSelect
+ aura:id="select_agency_person"
+ class="slds-select agency_person_select"
+ change="{!c.select_agency_change}"
+ />
+ </div>
+ <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}"
+ class="buttonFontSize"
+ />
+ </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"
+ >
+ <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"
+ />
+=======
<div style="width: 150px;"></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">
@@ -165,11 +397,67 @@
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" />
+>>>>>>> LEXCommunityLiJun
<!-- <ui:button aura:id="returnbutton" label="杩斿洖" press="{!c.return_main_page}" /> -->
</div>
</div>
</div>
<div aura:id="report_list" class="report_list_area">
+<<<<<<< HEAD
+ <div
+ class="slds-table--edit_container slds-is-relative"
+ style="padding-left: 50px"
+ >
+ <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 fontSize"
+ style="width: 250px"
+ >
+ <span class="slds-truncate" title="Name"
+ >鏃ユ姤缂栧彿</span
+ >
+ </th>
+ <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 fontSize"
+ style="width: 250px"
+ >
+ <span class="slds-truncate" title="Name">鍖婚櫌</span>
+ </th>
+ <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 fontSize">
+ <span class="slds-truncate" title="Name"
+ >鎷滆浜�</span
+ >
+ <!-- {!v.fieldsmap.doctor2__c} 鎷滆浜� -->
+ </th>
+ <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
+ >
+=======
<div class="slds-table--edit_container slds-is-relative" style="padding-left: 50px;">
<table class="slds-table slds-table--edit slds-table--bordered slds-table--fixed-layout slds-no-cell-focus"
role="grid" style="width:66.75rem;">
@@ -199,11 +487,54 @@
</th>
<th class="table_header slds-text-title--caps fontSize">
<span class="slds-truncate" title="Name">{!v.fieldsmap.WorkMark__c}</span>
+>>>>>>> LEXCommunityLiJun
<!-- {!v.fieldsmap.visitor_title__c} 鑱屼綅-->
</th>
</tr>
</thead>
<tbody>
+<<<<<<< HEAD
+ <aura:iteration
+ items="{!v.reports}"
+ var="item"
+ indexVar="index"
+ >
+ <tr class="slds-hint-parent">
+ <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 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>
+ <td
+ scope="row"
+ tabindex="0"
+ class="slds-cell-edit fontSize"
+ >
+ <div
+ class="slds-grid slds-grid--align-spread"
+ style="word-wrap: break-word"
+ >
+=======
<aura:iteration items="{!v.reports}" var="item" indexVar="index">
<tr class="slds-hint-parent">
<td role="gridcell" class="slds-cell-edit fontSize">
@@ -221,34 +552,76 @@
</td>
<td scope="row" tabindex="0" class="slds-cell-edit fontSize">
<div class="slds-grid slds-grid--align-spread" style="word-wrap: break-word;">
+>>>>>>> LEXCommunityLiJun
{!item.Agency_Hospital__r.Name}
</div>
</td>
<td role="gridcell" class="slds-cell-edit fontSize">
<span class="slds-grid slds-grid--align-spread">
+<<<<<<< HEAD
+ <span
+ class="slds-truncate"
+ title="{!item.Department_Cateogy_text__c}"
+ >{!item.Department_Cateogy_text__c}</span
+ >
+=======
<span class="slds-truncate"
title="{!item.Department_Cateogy_text__c}">{!item.Department_Cateogy_text__c}</span>
+>>>>>>> LEXCommunityLiJun
</span>
</td>
<td role="gridcell" class="slds-cell-edit fontSize">
<span class="slds-grid slds-grid--align-spread">
+<<<<<<< HEAD
+ <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 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 fontSize">
<span class="slds-grid slds-grid--align-spread">
+<<<<<<< HEAD
+ <span
+ class="slds-truncate"
+ title="{!item.DealerPersonnel__r.Name}"
+ >{!item.DealerPersonnel__r.Name}</span
+ >
+=======
<span class="slds-truncate"
title="{!item.DealerPersonnel__r.Name}">{!item.DealerPersonnel__r.Name}</span>
+>>>>>>> LEXCommunityLiJun
</span>
</td>
<td role="gridcell" class="slds-cell-edit fontSize">
<span class="slds-grid slds-grid--align-spread">
+<<<<<<< HEAD
+ <span
+ class="slds-truncate"
+ title="{!item.WorkMark__c}"
+ >
+ <lightning:input
+ type="checkbox"
+ checked="{!item.WorkMark__c}"
+ disabled="true"
+ />
+=======
<span class="slds-truncate" title="{!item.WorkMark__c}">
<lightning:input type="checkbox" checked="{!item.WorkMark__c}"
disabled="true" />
+>>>>>>> LEXCommunityLiJun
</span>
</span>
</td>
@@ -259,13 +632,53 @@
</div>
<aura:renderIf isTrue="{!v.report_count > 0}">
<aura:set attribute="else">
+<<<<<<< HEAD
+ <div class="no_data_area">{!v.list_message}</div>
+=======
<div class="no_data_area">
{!v.list_message}
</div>
+>>>>>>> LEXCommunityLiJun
</aura:set>
</aura:renderIf>
</div>
<!-- 鎵归噺娣诲姞鏃ユ姤 start-->
+<<<<<<< HEAD
+ <div
+ aura:id="modal_import"
+ role="dialog"
+ tabindex="-1"
+ 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">
+ <div class="slds-notify_container slds-is-relative">
+ <div
+ class="slds-notify slds-notify_toast slds-theme_success"
+ role="alert"
+ >
+ <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="Success"
+ iconName="utility:success"
+ size="small"
+ class="buttonColor slds-m-right_small"
+ />
+ <h2 class="slds-text-heading_small">
+ {!v.successMessage}
+ </h2>
+=======
<div aura:id="modal_import" role="dialog" tabindex="-1"
class="disp_none slds-modal slds-fade-in-open slds-modal--large" aria-labelledby="headerTarget">
<aura:renderIf isTrue="{!v.modal_import_spinner}">
@@ -282,6 +695,7 @@
<lightning:icon alternativeText="Success" iconName="utility:success" size="small"
class="buttonColor slds-m-right_small" />
<h2 class="slds-text-heading_small ">{!v.successMessage}</h2>
+>>>>>>> LEXCommunityLiJun
</div>
</div>
</div>
@@ -306,6 +720,74 @@
</div>
</div>
</div> -->
+<<<<<<< HEAD
+ <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 buttonFontSize"
+ press="{!c.close_import}"
+ />
+ </div>
+ <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 fontSize"
+ value="{!v.TableContent}"
+ />
+ <div
+ class="slds-p-around--large slds-align--absolute-center"
+ >
+ <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; overflow-x: scroll">
+ <lightning:datatable
+ keyField="id"
+ data="{! v.errorData }"
+ columns="{! v.errorColumns }"
+ hideCheckboxColumn="true"
+ />
+=======
<div class="slds-modal__container ">
<div class="slds-modal__header ">
<h4 id="headerTarget" class="slds-float--left"></h4>
@@ -335,10 +817,107 @@
<div style="height: 300px;overflow-x:scroll">
<lightning:datatable keyField="id" data="{! v.errorData }"
columns="{! v.errorColumns }" hideCheckboxColumn="true" />
+>>>>>>> LEXCommunityLiJun
</div>
</div>
</aura:if>
</aura:set>
+<<<<<<< HEAD
+ </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}"
+ />
+ </div>
+ </div>
+ <aura:set attribute="else">
+ <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}"
+ />
+=======
</aura:if>
</div>
@@ -388,17 +967,57 @@
<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}" />
+>>>>>>> LEXCommunityLiJun
</div>
</aura:set>
</aura:if>
</div>
</div>
</div>
+<<<<<<< HEAD
+ <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">
+ <div
+ class="slds-modal slds-fade-in-open slds-hide"
+ aura:id="successDiv"
+ >
+ <!-- <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"
+ >
+ <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="Success"
+ iconName="utility:success"
+ size="small"
+ class="buttonColor slds-m-right_small"
+ />
+ <h2 class="slds-text-heading_small">
+ {!v.successMessage}
+ </h2>
+=======
<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" >
+ 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" /> -->
<div class="demo-only" style="height: 8rem;">
@@ -410,12 +1029,40 @@
<lightning:icon alternativeText="Success" iconName="utility:success" size="small"
class="buttonColor slds-m-right_small" />
<h2 class="slds-text-heading_small ">{!v.successMessage}</h2>
+>>>>>>> LEXCommunityLiJun
</div>
</div>
</div>
</div>
</div>
</div>
+<<<<<<< HEAD
+ <div
+ class="slds-modal slds-fade-in-open slds-hide"
+ aura:id="errorDiv"
+ 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 class="slds-modal slds-fade-in-open slds-hide" aura:id="errorDiv" style="z-index: 10001">
<!-- <ui:inputText aura:id="articleURL" /> -->
<div class="demo-only" style="height: 8rem;">
@@ -427,26 +1074,102 @@
<lightning:icon alternativeText="error" iconName="utility:error" size="small"
class="buttonColor slds-m-right_small" />
<h2 class="slds-text-heading_small ">{!v.errorMessage}</h2>
+>>>>>>> LEXCommunityLiJun
</div>
</div>
</div>
</div>
</div>
</div>
-
+
+<<<<<<< HEAD
+ <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} {!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 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%;"/>
+ <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} {!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}" />
+ class="close_button slds-button slds-button--neutral slds-order--1"
+ press="{!c.toggle_report}" />
+>>>>>>> LEXCommunityLiJun
</div>
<div class="slds-box slds-theme--shade">
<div class="slds-grid slds-wrap slds-grid--pull-padded">
<div
+<<<<<<< HEAD
+ class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-7 slds-large-size--1-of-7"
+ >
+ 娲诲姩鏃�
+ <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"
+ data-select="single"
+ >
+ <!-- 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}"
+ >
+ <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>
+=======
class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-7 slds-large-size--1-of-7">
娲诲姩鏃�
<lightning:input type="date" value="{!v.data.Report_Date__c}" aura:id="input-report-date"
@@ -471,6 +1194,7 @@
<div class="slds-media__body">
<div class="slds-lookup__result-text">
{!hospital.Hospital_Name_readonly__c}</div>
+>>>>>>> LEXCommunityLiJun
</div>
</span>
</li>
@@ -480,6 +1204,53 @@
</div>
<!-- 绉戝鍒嗙被 -->
<div
+<<<<<<< HEAD
+ class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-7 slds-large-size--1-of-7"
+ >
+ {!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}"
+ 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-7 slds-large-size--1-of-7"
+ style="width: 145px"
+ >
+ {!v.fieldsmap.DealerPersonnel__c}
+ <ui:inputSelect
+ aura:id="select_DealerPersonnel"
+ class="slds-select"
+ />
+ </div>
+ <!-- 娲诲姩鍖哄垎 -->
+ <div
+ class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-7 slds-large-size--1-of-7"
+ >
+ {!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-7 slds-large-size--1-of-7"
+ style="width: 145px"
+ >
+ 鎷滆浜�
+ <ui:inputSelect
+ aura:id="select_doctor"
+ class="slds-select"
+ change="{!c.doctor_change}"
+ />
+=======
class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-7 slds-large-size--1-of-7">
{!v.fieldsmap.Department_Cateogy__c}
<!-- <ui:inputText aura:id="select_department" class="slds-select"
@@ -505,20 +1276,87 @@
style="width: 145px;">
鎷滆浜�
<ui:inputSelect aura:id="select_doctor" class="slds-select" change="{!c.doctor_change}" />
+>>>>>>> LEXCommunityLiJun
</div>
<!-- <p hidden="hidden"> -->
<div
+<<<<<<< HEAD
+ class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-7 slds-large-size--1-of-7"
+ >
+ <br />
+ <ui:button
+ label="鏂板缓"
+ class="slds-button"
+ press="{!c.createCon}"
+ disabled="true"
+ aura:id="new_con"
+ />
+=======
class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-7 slds-large-size--1-of-7">
<br />
<ui:button label="鏂板缓" class="slds-button" press="{!c.createCon}" disabled="true"
aura:id="new_con" />
+>>>>>>> LEXCommunityLiJun
</div>
<!-- </p> -->
<hr />
<!-- 浜у搧鍒嗙被(绗笁鍒嗙被) change="{!c.select_ProductClassification}" -->
<div
+<<<<<<< HEAD
+ class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-5"
+ >
+ 浜у搧鍒嗙被(绗笁鍒嗙被)
+ <ui:inputSelect
+ aura:id="select_ProductClassification"
+ class="slds-select"
+ change="{!c.selectProductClassification}"
+ />
+ </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-5"
+ data-select="single"
+ >
+ <!-- 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"
+ style="max-height: 230px"
+ >
+ <aura:iteration
+ var="UseProduct1"
+ items="{!v.UseProduct1List}"
+ >
+ <li
+ role="presentation"
+ onclick="{!c.seletUseProduct1Change}"
+ 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.Asset_Model_No__c}
+ </div>
+=======
class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-5">
浜у搧鍒嗙被(绗笁鍒嗙被)
<ui:inputSelect aura:id="select_ProductClassification" class="slds-select"
@@ -543,6 +1381,7 @@
<div class="slds-media__body">
<div class="slds-lookup__result-text">
{!UseProduct1.Asset_Model_No__c}</div>
+>>>>>>> LEXCommunityLiJun
</div>
</span>
</li>
@@ -551,6 +1390,49 @@
</div>
</div>
<!-- 浣跨敤浜у搧2 UseProduct2__c -->
+<<<<<<< HEAD
+ <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"
+ data-select="single"
+ >
+ <!-- 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"
+ style="max-height: 230px"
+ >
+ <aura:iteration
+ var="UseProduct2"
+ items="{!v.UseProduct2List}"
+ >
+ <li
+ role="presentation"
+ onclick="{!c.seletUseProduct2Change}"
+ 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.Asset_Model_No__c}
+ </div>
+=======
<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"
data-select="single">
@@ -569,6 +1451,7 @@
<div class="slds-media__body">
<div class="slds-lookup__result-text">
{!UseProduct2.Asset_Model_No__c}</div>
+>>>>>>> LEXCommunityLiJun
</div>
</span>
</li>
@@ -577,6 +1460,49 @@
</div>
</div>
<!-- 浣跨敤浜у搧3 UseProduct3__c -->
+<<<<<<< HEAD
+ <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"
+ data-select="single"
+ >
+ <!-- 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"
+ style="max-height: 230px"
+ >
+ <aura:iteration
+ var="UseProduct3"
+ items="{!v.UseProduct3List}"
+ >
+ <li
+ role="presentation"
+ onclick="{!c.seletUseProduct3Change}"
+ 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.Asset_Model_No__c}
+ </div>
+=======
<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"
data-select="single">
@@ -595,6 +1521,7 @@
<div class="slds-media__body">
<div class="slds-lookup__result-text">
{!UseProduct3.Asset_Model_No__c}</div>
+>>>>>>> LEXCommunityLiJun
</div>
</span>
</li>
@@ -603,14 +1530,136 @@
</div>
</div>
<!-- 鏁堟灉/杩涘害 EffectProgress__c-->
+<<<<<<< HEAD
+ <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"
+ >
+ {!v.fieldsmap.EffectProgress__c}
+ <ui:inputSelect
+ aura:id="select_EffectProgress"
+ class="slds-select"
+ />
+=======
<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">
{!v.fieldsmap.EffectProgress__c}
<ui:inputSelect aura:id="select_EffectProgress" class="slds-select" />
+>>>>>>> LEXCommunityLiJun
</div>
<hr />
<!-- 浜у搧1鍚岀被鑰楁潗绉戝鏈堜娇鐢ㄩ噺 ConsumptionOfConsumables__c-->
<div
+<<<<<<< HEAD
+ class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-5"
+ >
+ {!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}"
+ aura:id="select_ConsumptionOfConsumables"
+ variant="label-hidden"
+ />
+ </div>
+ <!-- 鏈＋鍒嗙被 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.WarlockClassification__c}
+ <ui:inputSelect
+ aura:id="select_OtherBrandConsumables"
+ class="slds-select"
+ />
+ </div>
+ <!-- 宸查噰鐢ㄥ叾浠栧搧鐗� ProductCcategory__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.ProductCcategory__c}
+ <ui:inputSelect
+ aura:id="select_ProductCcategory"
+ class="slds-select"
+ change="{!c.selectpurposetype}"
+ />
+ </div>
+ <!-- 鍏朵粬鍝佺墝浜у搧绫诲埆 -->
+ <div
+ aura:id="result"
+ class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6"
+ >
+ {!v.fieldsmap.productCategories__c}
+ <ui:inputSelect
+ aura:id="select_productCategories"
+ class="slds-select"
+ />
+ </div>
+ <!-- 浜у搧鐢ㄩ噺 warlocksNumber__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.warlocksNumber__c}
+ <!-- <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: 12px">
+ {!v.fieldsmap.WorkMark__c}
+ <lightning:input
+ type="checkbox"
+ aura:id="select_WorkMark"
+ />
+ </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"
+ >
+ {!v.fieldsmap.StageName__c}
+ <ui:inputSelect
+ aura:id="select_stageName"
+ class="slds-select"
+ />
+ </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"
+ >
+ {!v.fieldsmap.Amount__c}
+ <!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> 鍖婚櫌閲囪喘棰勭畻(涓嶅惈绋�,鍏�)-->
+ <lightning: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"
+ >
+ {!v.fieldsmap.OCMSale_Price__c}
+ <!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> 璁㈣揣閲戦(涓嶅惈绋�,鍏�) -->
+ <lightning: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"
+ >
+ {!v.fieldsmap.Close_Forecasted_Date__c}
+ <!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> 棰勬祴涓嶰CSM绛剧害鏃� -->
+ <lightning:inputField
+ value="{!v.oppdata.Close_Forecasted_Date__c}"
+ class=""
+ />
+=======
class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-5">
{!v.fieldsmap.ConsumptionOfConsumables__c}
<!-- <ui:inputText aura:id="select_ConsumptionOfConsumables" class="slds-select"
@@ -674,11 +1723,85 @@
{!v.fieldsmap.Close_Forecasted_Date__c}
<!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> 棰勬祴涓嶰CSM绛剧害鏃� -->
<lightning:inputField value="{!v.oppdata.Close_Forecasted_Date__c}" class="" />
+>>>>>>> LEXCommunityLiJun
</div>
<hr />
</div>
</div>
<div class="save_button_area">
+<<<<<<< HEAD
+ <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.WorkRecord__c}</span
+ >
+=======
<ui:button aura:id="save_button" label="淇濆瓨骞舵柊寤�"
class="save_button slds-button slds-button--brand slds-order--3" press="{!c.save_report}" />
</div>
@@ -710,10 +1833,104 @@
</th>
<th class="table_header slds-text-title--caps">
<span class="slds-truncate" title="Name">{!v.fieldsmap.WorkRecord__c}</span>
+>>>>>>> LEXCommunityLiJun
</th>
</tr>
</thead>
<tbody>
+<<<<<<< HEAD
+ <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_text__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_text__c}"
+ >{!item.Department_Cateogy_text__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}"
+ >{!item.doctor2__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.visitor_title__c}"
+ >{!item.visitor_title__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.WorkRecord__c}"
+ >{!item.WorkRecord__c}</span
+ >
+=======
<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">
@@ -750,6 +1967,7 @@
<span class="slds-grid slds-grid--align-spread">
<span class="slds-truncate"
title="{!item.WorkRecord__c}">{!item.WorkRecord__c}</span>
+>>>>>>> LEXCommunityLiJun
</span>
</td>
</tr>
@@ -763,6 +1981,25 @@
</div>
</div>
+<<<<<<< HEAD
+ <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 aura:id="modal_bg" class="disp_none slds-backdrop slds-backdrop--open"></div>
@@ -772,11 +2009,68 @@
<div class="slds-modal__container">
<div class="slds-modal__header">
<h2 id="header43" class="slds-text-heading--medium">{!v.modal_confirm_title}</h2>
+>>>>>>> LEXCommunityLiJun
</div>
<div class="slds-modal__content slds-p-around--medium">
<p>{!v.modal_confirm_text}</p>
</div>
<div class="slds-modal__footer">
+<<<<<<< HEAD
+ <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">
+ <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"
+ />
+=======
<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>
@@ -799,6 +2093,7 @@
<lightning:inputField fieldName="Name" aura:id="newOpportunityField" />
<lightning:inputField fieldName="Type__c" aura:id="newOpportunityField" />
<lightning:inputField fieldName="Doctor_Division1__c" aura:id="newOpportunityField" />
+>>>>>>> LEXCommunityLiJun
</aura:renderIf>
<br />
<br />
@@ -806,15 +2101,34 @@
<br />
<br />
<div class="save_button_area">
+<<<<<<< HEAD
+ <lightning:button
+ class="slds-m-top_small"
+ type="button"
+ label="鍙栨秷"
+ onclick="{!c.createCancel}"
+ />
+ <lightning:button
+ class="slds-m-top_small"
+ type="button"
+ label="淇濆瓨"
+ onclick="{!c.handleSubmit}"
+ />
+=======
<lightning:button class="slds-m-top_small" type="button" label="鍙栨秷"
onclick="{!c.createCancel}" />
<lightning:button class="slds-m-top_small" type="button" label="淇濆瓨"
onclick="{!c.handleSubmit}" />
+>>>>>>> LEXCommunityLiJun
</div>
</lightning:recordEditForm>
</div>
</div>
</div>
+<<<<<<< HEAD
+</aura:component>
+=======
-</aura:component>
\ No newline at end of file
+</aura:component>
+>>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1