From 2aa8da8af66aa8ae00f25831aed6bb0364176e7b Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期四, 24 二月 2022 20:32:31 +0800
Subject: [PATCH] 1.15---2.24 变更代码
---
force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.cmp | 119 ++++++++++++++++++++++++++++-------------------------------
1 files changed, 57 insertions(+), 62 deletions(-)
diff --git a/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.cmp b/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.cmp
index 7c41712..b82bc29 100644
--- a/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.cmp
+++ b/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.cmp
@@ -18,7 +18,7 @@
<aura:attribute name="fieldsmap" type="Map" />
<aura:attribute name="AgencyReportMap" type="Boolean" default="false" />
<!-- 鍛ㄦ姤鍒嗙被 -->
-
+
<aura:attribute name="alldata" type="List" />
<aura:attribute name="allselectlist" type="Map" />
<aura:attribute name="doclist" type="List" />
@@ -39,7 +39,7 @@
<aura:attribute name="hospitalLinkId" type="string" default="" />
<aura:handler name="change" value="{!v.hospital}" action="{!c.hosChange}" />
<aura:attribute name="hospitalList" type="Map" />
- <!-- 浣跨敤浜у搧1 -->
+ <!-- 浣跨敤浜у搧1(浜у搧鍨嬪彿) -->
<aura:attribute name="UseProduct1" type="string" default="" />
<aura:handler name="change" value="{!v.UseProduct1}" action="{!c.UseProduct1Change}" />
<aura:attribute name="UseProduct1List" type="Map" />
@@ -91,11 +91,7 @@
<aura:attribute name="NumOfRecords" type="Integer" default="1000" />
<aura:attribute name="showMain" type="Boolean" default="true" />
<aura:attribute name="IsEventDefault" type="Boolean" default="true" />
-
-
<!-- 鎵归噺娣诲姞鍛ㄦ姤 end-->
-
-
<!--銉兗銉変腑...-->
<aura:renderIf isTrue="{!v.login}">
<div class="slds-spinner_container height100vh">
@@ -106,8 +102,6 @@
</div>
</div>
</aura:renderIf>
-
-
<div aura:id="report" id="report" class="contents_wrapper">
<div class="slds-grid slds-wrap slds-grid--pull-padded">
<div style="width: 230px;"></div>
@@ -129,9 +123,7 @@
change="{!c.select_agency_change}" />
</div>
<div style="width: 200px;">
-
</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}" />
@@ -141,17 +133,15 @@
<ui:button aura:id="import" label="瀵煎叆" press="{!c.import}" />
<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" style="padding-left: 150px;">
+ <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">
-
</th>
<th class="table_header slds-text-title--caps">
<span class="slds-truncate" title="Name">{!v.fieldsmap.Person_In_Charge2__c}</span>
@@ -165,14 +155,13 @@
<!-- {!v.fieldsmap.Department_Cateogy__c} 绉戝-->
</th>
<th class="table_header slds-text-title--caps">
- <span class="slds-truncate" title="Name">{!v.fieldsmap.doctor2__c}</span>
- <!-- {!v.fieldsmap.doctor2__c} 瀹㈡埛浜哄憳 -->
+ <span class="slds-truncate" title="Name">鍖婚櫌浜哄憳</span>
+ <!-- {!v.fieldsmap.doctor2__c} 鍖婚櫌浜哄憳 -->
</th>
<th class="table_header slds-text-title--caps">
- <span class="slds-truncate" title="Name">{!v.fieldsmap.visitor_title__c}</span>
+ <span class="slds-truncate" title="Name">{!v.fieldsmap.DealerPersonnel__c}</span>
<!-- {!v.fieldsmap.visitor_title__c} 鑱屼綅-->
</th>
-
</tr>
</thead>
<tbody>
@@ -207,7 +196,12 @@
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.DealerPersonnel__r.Name}">{!item.DealerPersonnel__r.Name}</span>
+ </span>
+ </td>
</tr>
</aura:iteration>
</tbody>
@@ -221,8 +215,6 @@
</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">
@@ -289,7 +281,6 @@
<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>
@@ -302,7 +293,6 @@
<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}" />
@@ -314,7 +304,6 @@
<lightning:button label="纭" variant="brand" onclick="{!c.exportDate}" />
<lightning:button label="鍙栨秷" variant="brand" onclick="{!c.close_export}" />
</div>
-
</aura:set>
</aura:if>
</div>
@@ -322,8 +311,6 @@
</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">
@@ -378,7 +365,7 @@
</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"
+ class="slds-form-element slds-lookup slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6"
data-select="single">
<lightning:input aura:id="hospital_input_text" label="鍖婚櫌" class="field"
value="{!v.hospital}" updateOn="keyup" />
@@ -402,55 +389,57 @@
</div>
<!-- 绉戝鍒嗙被 -->
<div
- class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-8">
+ class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6">
{!v.fieldsmap.Department_Cateogy__c}
<ui:inputText aura:id="select_department" class="slds-select"
change="{!c.select_department}" />
</div>
<!-- 缁忛攢鍟嗕汉鍛� change="{!c.select_DealerPersonnel}" -->
<div
- class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-8">
+ class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6">
{!v.fieldsmap.DealerPersonnel__c}
<ui:inputSelect aura:id="select_DealerPersonnel" class="slds-select" />
</div>
+ <p hidden="hidden">
<div
class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-12">
<br />
<ui:button label="鏂板缓" class="slds-button" press="{!c.createCon}" disabled="true"
aura:id="new_con" />
</div>
- <!-- 宸ヤ綔璁板綍 change="{!c.selectPurposeType}"-->
+ </p>
+ <!-- 宸ヤ綔璁板綍 -->
<div
class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6">
{!v.fieldsmap.WorkRecord__c}
- <ui:inputSelect aura:id="select_purpose_type" class="slds-select" change="{!c.select_purpose_type}" />
+ <ui:inputSelect aura:id="select_purpose_type" class="slds-select"
+ change="{!c.select_purpose_type}" />
</div>
- <!-- 瀹㈡埛浜哄憳 -->
+ <!-- 鍖婚櫌浜哄憳 {!v.fieldsmap.doctor2__c}-->
<div
- class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-8">
- {!v.fieldsmap.doctor2__c}
+ class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6">
+ 鍖婚櫌浜哄憳
<ui:inputSelect aura:id="select_doctor" class="slds-select" change="{!c.doctor_change}" />
</div>
<hr />
- <!-- 浜у搧鍒嗙被 change="{!c.select_ProductClassification}" -->
+ <!-- 浜у搧鍒嗙被(绗笁鍒嗙被) change="{!c.select_ProductClassification}" -->
<div
class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6">
- 浜у搧鍒嗙被
- <ui:inputSelect aura:id="select_ProductClassification" class="slds-select" change="{!c.selectProductClassification}" />
+ 浜у搧鍒嗙被(绗笁鍒嗙被)
+ <ui:inputSelect aura:id="select_ProductClassification" class="slds-select"
+ change="{!c.selectProductClassification}" />
</div>
- <!-- 浣跨敤浜у搧1 UseProduct1__c -->
+ <!-- 浣跨敤浜у搧1(浜у搧鍨嬪彿) UseProduct1__c -->
<div aura:id="UseProduct1_List"
- class="slds-form-element slds-lookup slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-5"
+ class="slds-form-element slds-lookup slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6"
data-select="single">
- <lightning:input aura:id="UseProduct1_TEXT" label="浣跨敤浜у搧1" class="field"
+ <lightning:input aura:id="UseProduct1_TEXT" label="浣跨敤浜у搧1(浜у搧鍨嬪彿)" class="field"
value="{!v.UseProduct1}" updateOn="keyup" />
<div class="slds-lookup__menu" id="lookup-11">
<ul class="slds-lookup__list" role="listbox">
<aura:iteration var="UseProduct1" items="{!v.UseProduct1List}">
<li role="presentation" onclick="{!c.seletUseProduct1Change}"
- data-accid="{!UseProduct1.Id}"
- data-accName="{!UseProduct1.Name}"
- >
+ data-accid="{!UseProduct1.Id}" data-accName="{!UseProduct1.Name}">
<span class="slds-lookup__item-action slds-media" id="lookup-option-498"
role="option">
<div class="slds-media__body">
@@ -464,7 +453,7 @@
</div>
<!-- 浣跨敤浜у搧2 UseProduct2__c -->
<div aura:id="UseProduct2_List"
- class="slds-form-element slds-lookup slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-5"
+ class="slds-form-element slds-lookup slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6"
data-select="single">
<lightning:input aura:id="UseProduct2_TEXT" label="浣跨敤浜у搧2" class="field"
value="{!v.UseProduct2}" updateOn="keyup" />
@@ -472,8 +461,7 @@
<ul class="slds-lookup__list" role="listbox">
<aura:iteration var="UseProduct2" items="{!v.UseProduct2List}">
<li role="presentation" onclick="{!c.seletUseProduct2Change}"
- data-accid="{!UseProduct2.Id}"
- data-accName="{!UseProduct2.Name}">
+ data-accid="{!UseProduct2.Id}" data-accName="{!UseProduct2.Name}">
<span class="slds-lookup__item-action slds-media" id="lookup-option-498"
role="option">
<div class="slds-media__body">
@@ -487,7 +475,7 @@
</div>
<!-- 浣跨敤浜у搧3 UseProduct3__c -->
<div aura:id="UseProduct3_List"
- class="slds-form-element slds-lookup slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-5"
+ class="slds-form-element slds-lookup slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6"
data-select="single">
<lightning:input aura:id="UseProduct3_TEXT" label="浣跨敤浜у搧3" class="field"
value="{!v.UseProduct3}" updateOn="keyup" />
@@ -495,8 +483,7 @@
<ul class="slds-lookup__list" role="listbox">
<aura:iteration var="UseProduct3" items="{!v.UseProduct3List}">
<li role="presentation" onclick="{!c.seletUseProduct3Change}"
- data-accid="{!UseProduct3.Id}"
- data-accName="{!UseProduct3.Name}">
+ data-accid="{!UseProduct3.Id}" data-accName="{!UseProduct3.Name}">
<span class="slds-lookup__item-action slds-media" id="lookup-option-498"
role="option">
<div class="slds-media__body">
@@ -508,18 +495,19 @@
</ul>
</div>
</div>
- <!-- 鏁堟灉/杩涘害 AgencyReportMap-->
- <div
+ <!-- 鏁堟灉/杩涘害 EffectProgress__c-->
+ <div aura:id="product_category_select1"
class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6">
{!v.fieldsmap.EffectProgress__c}
<ui:inputSelect aura:id="select_EffectProgress" class="slds-select" />
</div>
- <hr/>
- <!-- 绉戝鍚岀被鑰楁潗鏈堜娇鐢ㄩ噺 change="{!c.select_ConsumptionOfConsumables}" warlocksNumber__c WorkMark__c-->
+ <hr />
+ <!-- 绉戝鍚岀被鑰楁潗鏈堜娇鐢ㄩ噺 ConsumptionOfConsumables__c-->
<div
- class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-8">
+ class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6">
{!v.fieldsmap.ConsumptionOfConsumables__c}
- <ui:inputText aura:id="select_ConsumptionOfConsumables" class="slds-select" change="{!c.select_ConsumptionOfConsumables}" />
+ <ui:inputText aura:id="select_ConsumptionOfConsumables" class="slds-select"
+ change="{!c.select_ConsumptionOfConsumables}" />
</div>
<!-- 鏈＋鍒嗙被 OtherBrandConsumables__c -->
<div
@@ -527,24 +515,31 @@
{!v.fieldsmap.OtherBrandConsumables__c}
<ui:inputSelect aura:id="select_OtherBrandConsumables" class="slds-select" />
</div>
- <!-- 鍏朵粬鍝佺墝鑰楁潗浣跨敤 ProductCcategory__c -->
+ <!-- 宸查噰鐢ㄥ叾浠栧搧鐗� 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" />
+ <ui:inputSelect aura:id="select_ProductCcategory" class="slds-select"
+ change="{!c.selectpurposetype}" />
</div>
- <!-- 鏈＋浣跨敤浜у搧瀵瑰簲鏁伴噺 warlocksNumber__c -->
+ <!-- 鍏朵粬鍝佺墝浜у搧绫诲埆 -->
+ <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-8">
+ class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6">
{!v.fieldsmap.warlocksNumber__c}
- <ui:inputText aura:id="select_warlocksNumber" class="slds-select" change="{!c.select_warlocksNumber}" />
+ <ui:inputText aura:id="select_warlocksNumber" class="slds-select"
+ change="{!c.select_warlocksNumber}" />
</div>
<!-- 宸ヤ綔鏍囪 WorkMark__c-->
- <div>
+ <div style="padding-left: 20px;">
{!v.fieldsmap.WorkMark__c}
- <lightning:input type="checkbox" aura:id="select_WorkMark" />
+ <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}
--
Gitblit v1.9.1