From 0092ca1d84e5065ec0e00c900fcb093cd70baedf Mon Sep 17 00:00:00 2001
From: 付煜 <fuyu3103346691@163.com>
Date: 星期四, 07 四月 2022 18:22:06 +0800
Subject: [PATCH] 追溯周报
---
force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.cmp | 13 +++
force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReportHelper.js | 178 +++++++++++++++++++++++++++++++++++++-------
force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.css | 12 +++
force-app/main/default/classes/RetrospectiveWeeklyReportController.cls | 17 +++
4 files changed, 188 insertions(+), 32 deletions(-)
diff --git a/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.cmp b/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.cmp
index 6ae7294..e496831 100644
--- a/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.cmp
+++ b/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.cmp
@@ -77,6 +77,8 @@
<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" />
+ <!-- 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="" />
@@ -91,6 +93,12 @@
<aura:attribute name="NumOfRecords" type="Integer" default="1000" />
<aura:attribute name="showMain" type="Boolean" default="true" />
<aura:attribute name="IsEventDefault" type="Boolean" default="true" />
+
+ <aura:attribute name="PIConfig" type="Map"/>
+
+ <ltng:require scripts="{! $Resource.AWSService+'/AWSService.js' }" />
+ <ltng:require scripts="{! $Resource.jquery183minjs }" />
+
<!-- 鎵归噺娣诲姞鍛ㄦ姤 end-->
<!--銉兗銉変腑...-->
<aura:renderIf isTrue="{!v.login}">
@@ -193,7 +201,10 @@
<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>
+ title="{!item.doctor2__r.Name}">
+ <span class="encrypt">{!item.doctor2__r.Name}</span>
+ <span class="decrypt">{!item.doctor2__r.awsdata.name}</span>
+ </span>
</span>
</td>
<td role="gridcell" class="slds-cell-edit">
diff --git a/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.css b/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.css
index 2c09747..2cf535d 100644
--- a/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.css
+++ b/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.css
@@ -126,4 +126,16 @@
}
.THIS .none{
display:none;
+}
+
+.THIS tr .decrypt{
+ display: none;
+}
+
+.THIS tr:hover .decrypt{
+ display: unset;
+}
+
+.THIS tr:hover .encrypt{
+ display: none;
}
\ No newline at end of file
diff --git a/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReportHelper.js b/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReportHelper.js
index e177114..993f485 100644
--- a/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReportHelper.js
+++ b/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReportHelper.js
@@ -1,5 +1,6 @@
({
doinit: function (component, event, helper) {
+ debugger
this.report_date_list(component, event, helper, 5);
component.set('v.login', true);
var action = component.get('c.getalldata');
@@ -11,6 +12,12 @@
component.set('v.fieldsmap', res.fieldsMap);
component.set('v.allselectlist', res.allselectlist);
component.set('v.doclist', res.doclist);
+ //fy
+ debugger
+ var xx=res.UserProType;
+ component.set('v.UserProType', res.UserProType);
+ var gg=component.get('v.UserProType');
+ //fy
component.find('select_agency_person').set('v.options', this.conv_selected(res.allselectlist.AgencyPerson__c));
component.find('select_DealerPersonnel').set('v.options', this.conv_selected(res.allselectlist.DealerPersonnel__c));
component.find('select_purpose_type').set('v.options', this.conv_selected(res.allselectlist.WorkRecord__c));
@@ -19,6 +26,8 @@
component.set('v.selected_agency_person', res.allselectlist.AgencyPerson__c[0].label);
component.set('v.dialog_type', '鏂板缓');
this.get_reports(component, event, helper, component.find('select_date').get('v.value'), component.find('select_agency_person').get('v.value'));
+
+ component.set('v.PIConfig', res.PIConfig);// 20220222 PI鏀归�� by Bright
component.set('v.login', false);
}
else {
@@ -77,10 +86,46 @@
}
if (res.reports.length > 0) {
component.set('v.list_message', '');
+
+ // PI 鏀归�� By Bright 20220328
+ if(true){
+ let doctor_awsids = res.reports.map(function(d){return d.doctor2__r.AWS_Data_Id__c;});
+ let PIConfig = component.get('v.PIConfig');
+ let staticResourceAgencyContact = JSON.parse(PIConfig.staticResourceAgencyContact);
+ if(doctor_awsids.length > 0){
+ AWSService.search(staticResourceAgencyContact.searchUrl,{
+ dataIds:doctor_awsids
+ }, function(data){
+ if(data && data.object && data.object.length){
+ let m = {};
+ for(let di in data.object){
+ if(data.object[di] && data.object[di].dataId){
+ m[data.object[di].dataId] = data.object[di];
+ }
+ }
+
+ for(let ri in res.reports){
+ if(res.reports[ri] && res.reports[ri].doctor2__r && res.reports[ri].doctor2__r.AWS_Data_Id__c && m.hasOwnProperty(res.reports[ri].doctor2__r.AWS_Data_Id__c)){
+ res.reports[ri].doctor2__r.awsdata = m[res.reports[ri].doctor2__r.AWS_Data_Id__c];
+ }
+ }
+ component.set('v.reports', res.reports);
+ component.set('v.report_count', res.reports.length);
+ }
+
+ component.set('v.login', false);
+ }, staticResourceAgencyContact.token);
+ }else{
+ component.set('v.login', false);
+ }
+
+ }
+
} else {
component.set('v.list_message', 'no_data');
+ component.set('v.login', false);
}
- component.set('v.login', false);
+
}
else {
component.set('v.errorMessage', 'get_reports failed.');
@@ -165,7 +210,7 @@
//浣跨敤浜у搧2
var UseProduct2Text = '';
var UseProduct2Id = '';
- if (select_data['UseProduct2__c'] != '') {
+ if (select_data['UseProduct2__c'] != ''&&select_data['UseProduct2__c'] != undefined) {
for (var i = 0; i < reports.length; i++) {
if (reports[i]['UseProduct2__c'] == select_data['UseProduct2__c']) {
UseProduct2Text = reports[i]['UseProduct2__r']['Name'];
@@ -178,7 +223,7 @@
//浣跨敤浜у搧3
var UseProduct3Text = '';
var UseProduct3Id = '';
- if (select_data['UseProduct3__c'] != '') {
+ if (select_data['UseProduct3__c'] != ''&&select_data['UseProduct3__c'] != undefined) {
for (var i = 0; i < reports.length; i++) {
if (reports[i]['UseProduct3__c'] == select_data['UseProduct3__c']) {
UseProduct3Text = reports[i]['UseProduct3__r']['Name'];
@@ -453,6 +498,7 @@
//缂栬緫鎸夐挳
edit_button: function (component, event, helper) {
this.allclear(component);
+ debugger
component.set('v.loadOpp', true);
var index = event.getSource().get('v.value');
component.set('v.select_report_data', component.get('v.reports')[index]);
@@ -488,6 +534,7 @@
// 鎷呭綋 Person_In_Charge2__c
Person_In_Charge2__c = component.find('select_agency_person').get('v.value');
}
+ debugger
// Agency_Report_Header__c
var Agency_Report_Header__c = component.get('v.agency_report_header_id');
// 鍖婚櫌
@@ -510,6 +557,7 @@
var WorkRecord__c = component.find('select_purpose_type').get('v.value');
// 鏁堟灉/杩涘害 EffectProgress__c
var EffectProgress__c = component.find('select_EffectProgress').get('v.value');
+ // alert(EffectProgress__c);
// 绉戝鍚屾潵鑰楁潗鏈堜娇鐢ㄩ噺 ConsumptionOfConsumables__c
var ConsumptionOfConsumables__c = component.find('select_ConsumptionOfConsumables').get('v.value');
// 鏈＋鍒嗙被 WarlockClassification__c
@@ -554,18 +602,22 @@
if (!Agency_Report_Header__c) { this.error("Report Header Id 涓嶅瓨鍦�"); }
if (!Agency_Hospital__c) { error.push("鍖婚櫌 涓嶅瓨鍦�"); }
if (!UseProduct1__c) { error.push("浣跨敤浜у搧1(浜у搧鍨嬪彿) 涓嶅瓨鍦�"); }
- if (!UseProduct2__c) { error.push("浣跨敤浜у搧2 涓嶅瓨鍦�"); }
- if (!UseProduct3__c) { error.push("浣跨敤浜у搧3 涓嶅瓨鍦�"); }
+ // if (!UseProduct2__c) { error.push("浣跨敤浜у搧2 涓嶅瓨鍦�"); }
+ // if (!UseProduct3__c) { error.push("浣跨敤浜у搧3 涓嶅瓨鍦�"); }
if (!Department_Cateogy__c) { error.push("绉戝 涓嶅瓨鍦�"); }
if (!DealerPersonnel__c) { error.push("缁忛攢鍟嗕汉鍛� 涓嶅瓨鍦�"); }
if (!doctor2__c) { error.push("鍖婚櫌浜哄憳 涓嶅瓨鍦�"); }
if (!WorkRecord__c) { error.push("宸ヤ綔璁板綍 涓嶅瓨鍦�"); }
if (!EffectProgress__c) { error.push("鏁堟灉/杩涘害 涓嶅瓨鍦�"); }
// if (!OtherBrandConsumables__c) { error.push("鏈＋鍒嗙被 涓嶅瓨鍦�"); }
- if (!ProductCcategory__c) { error.push("宸查噰鐢ㄥ叾浠栧搧鐗� 涓嶅瓨鍦�"); }
+ if (ProductCcategory__c==''||ProductCcategory__c==""||ProductCcategory__c==undefined) { error.push("宸查噰鐢ㄥ叾浠栧搧鐗� 涓嶅瓨鍦�"); }
// if (!productCategories__c) { error.push("鍏朵粬鍝佺墝浜у搧绫诲埆 涓嶅瓨鍦�"); }
if (!ConsumptionOfConsumables__c) { error.push("绉戝鍚岀被鑰楁潗鏈堜娇鐢ㄩ噺 涓嶈兘涓虹┖"); }
- if (!warlocksNumber__c) { error.push("浜у搧鐢ㄩ噺 涓嶈兘涓虹┖"); }
+ //fy start
+ if(WorkRecord__c != 'SIS'){
+ if (!warlocksNumber__c) { error.push("浜у搧鐢ㄩ噺 涓嶈兘涓虹┖"); }
+ }
+ //fy end
for (var i = 0; i < error.length; i++) {
component.set('v.errorMessage', error[i]);
this.showErrorToast(component);
@@ -1126,6 +1178,7 @@
var default_doctor = component.get('v.default_select_doctor_id');
if (default_doctor != '' && res.length > 0) {
var doctor_title = '';
+ let awsids = [];
for (var i = 0; i < res.length; i++) {
if (res[i].value == default_doctor) {
res[i].selected = true;
@@ -1133,9 +1186,38 @@
} else {
res[i].selected = false;
}
+ if(res[i].AWS_Data_Id__c){
+ awsids.push(res[i].AWS_Data_Id__c);
+ }
}
component.find('select_doctor').set('v.options', res);
component.set('v.doctor_title', doctor_title);
+
+ if(awsids.length > 0){
+ let PIConfig = component.get('v.PIConfig');
+ let staticResourceAgencyContact = JSON.parse(PIConfig.staticResourceAgencyContact);
+ AWSService.search(staticResourceAgencyContact.searchUrl,{
+ dataIds:awsids
+ }, function(data){
+ if(data && data.object && data.object.length){
+ let m = {};
+ for(let di in data.object){
+ if(data.object[di] && data.object[di].dataId){
+ m[data.object[di].dataId] = data.object[di];
+ }
+ }
+
+ for(let ri in res){
+ if(res[ri] && res[ri].AWS_Data_Id__c && m.hasOwnProperty(res[ri].AWS_Data_Id__c)){
+ res[ri].label = m[res[ri].AWS_Data_Id__c].name;
+ }
+ }
+ component.find('select_doctor').set('v.options', res);
+ }
+
+ component.set('v.login', false);
+ }, staticResourceAgencyContact.token);
+ }
} else {
component.find('select_doctor').set('v.options', res);
if (res.length > 0) {
@@ -1224,6 +1306,7 @@
},
//寮瑰嚭 鎴愬姛鎻愮ず
showSuccessToast: function (component) {
+ debugger
$A.util.removeClass(component.find('successDiv'), 'slds-hide');
window.setTimeout($A.getCallback(function () {
$A.util.addClass(component.find('successDiv'), 'slds-hide');
@@ -1233,6 +1316,7 @@
},
//寮瑰嚭 鎴愬姛鎻愮ず
showSuccessToast01: function (component) {
+ debugger
$A.util.removeClass(component.find('successDiv01'), 'slds-hide');
window.setTimeout($A.getCallback(function () {
$A.util.addClass(component.find('successDiv01'), 'slds-hide');
@@ -1242,6 +1326,7 @@
},
//寮瑰嚭 閿欒鎻愮ず
showErrorToast: function (component) {
+ debugger
$A.util.removeClass(component.find('errorDiv'), 'slds-hide');
window.setTimeout($A.getCallback(function () {
$A.util.addClass(component.find('errorDiv'), 'slds-hide');
@@ -1472,14 +1557,6 @@
csvStringResult += objectRecords[i].UseProduct2__r.Name;
} else if (skey == 'UseProduct3__c') {
csvStringResult += objectRecords[i].UseProduct3__r.Name;
- } else if (skey == 'EffectProgress__c'){
- csvStringResult += objectRecords[i].EffectProgress__r.EffectProgress__c;
- }else if (skey == 'WarlockClassification__c'){
- csvStringResult += objectRecords[i].WarlockClassification__r.WarlockClassification__c;
- }else if(skey == 'ProductCcategory__c'){
- csvStringResult += objectRecords[i].ProductCcategory__r.ProductCcategory__c;
- }else if(skey == 'productCategories__c'){
- csvStringResult += objectRecords[i].productCategories__r.productCategories__c;
}else{
csvStringResult += objectRecords[i][skey] ;
}
@@ -1526,14 +1603,6 @@
content += '<td>' + objectRecords[i].UseProduct2__r.Name + '</td>';
} else if (skey == 'UseProduct3__c') {
content += '<td>' + objectRecords[i].UseProduct3__r.Name + '</td>';
- } else if (skey == 'EffectProgress__c'){
- content += '<td>' + objectRecords[i].EffectProgress__r.EffectProgress__c + '</td>';
- }else if (skey == 'WarlockClassification__c'){
- content += '<td>' + objectRecords[i].WarlockClassification__r.WarlockClassification__c + '</td>';
- }else if (skey == 'ProductCcategory__c'){
- content += '<td>' + objectRecords[i].ProductCcategory__r.ProductCcategory__c + '</td>';
- }else if (skey == 'productCategories__c'){
- content += '<td>' + objectRecords[i].productCategories__r.productCategories__c + '</td>';
}else{
content += '<td>' + objectRecords[i][skey] + '</td>';
}
@@ -1564,7 +1633,45 @@
var res = response.getReturnValue();
console.log('杈撳叆鐨勫紑濮嬫棩鏈�3' + res);
component.set('v.login', false);
- this.showExportDate(component, res);
+
+ // PI 鏀归�� By Bright 20220328
+ if(true){
+ let awsids = [];
+ for (let ri in res) {
+ if(res[ri] && res[ri].doctor2__r && res[ri].doctor2__r.AWS_Data_Id__c){
+ awsids.push(res[ri].doctor2__r.AWS_Data_Id__c);
+ }
+ }
+ if(awsids.length > 0){
+ let PIConfig = component.get('v.PIConfig');
+ let staticResourceAgencyContact = JSON.parse(PIConfig.staticResourceAgencyContact);
+ AWSService.search(staticResourceAgencyContact.searchUrl,{
+ dataIds:awsids
+ }, function(data){
+ if(data && data.object && data.object.length){
+ let m = {};
+ for(let di in data.object){
+ if(data.object[di] && data.object[di].dataId){
+ m[data.object[di].dataId] = data.object[di];
+ }
+ }
+
+ for(let ri in res){
+ if(res[ri] && res[ri].doctor2__r && res[ri].doctor2__r.AWS_Data_Id__c && m.hasOwnProperty(res[ri].doctor2__r.AWS_Data_Id__c)){
+ res[ri].doctor2__r.Name = m[res[ri].doctor2__r.AWS_Data_Id__c].name;
+ }
+ }
+ }
+ helper.showExportDate(component, res);
+
+ component.set('v.login', false);
+ }, staticResourceAgencyContact.token);
+ }else{
+ helper.showExportDate(component, res);
+ }
+ }
+
+
component.set('v.reports_date', res);
} else {
alert('瀵煎嚭澶辫触,璇锋鏌ユ椿鍔ㄦ棩');
@@ -1703,7 +1810,7 @@
//宸ヤ綔浼氳褰�
selectPurposeType: function (component,event,helper) {
var doctor_value = component.find('select_purpose_type').get('v.value');
- alert(doctor_value);
+ // alert(doctor_value);
if(doctor_value != ''){
var action = component.get('c.selectPurposeTypes');
action.setParams({
@@ -1746,7 +1853,14 @@
var select_ProductCcategory = component.find('select_ProductCcategory').get('v.value');
if(select_ProductCcategory != ''){
var result = component.find('result');
+ var UserProType = component.get('v.UserProType');
+ //fy
$A.util.removeClass(result, 'disp_none');
+ if(UserProType=='ENG'){
+ $A.util.removeClass(result, 'disp_none');
+ }else{
+ $A.util.addClass(result, 'disp_none');
+ }
var action = component.get('c.selectProductCcategory01');
action.setParams({
"select_ProductCcategory": select_ProductCcategory
@@ -1767,14 +1881,20 @@
},
selectpurposetype : function(component,event,helper){
var select_ProductCcategory = component.find('select_ProductCcategory').get('v.value');
- if (select_ProductCcategory == null && select_ProductCcategory == undefined) {
+ if (select_ProductCcategory == null && select_ProductCcategory == undefined && select_ProductCcategory == '') {
var result = component.find('result');
- $A.util.removeClass(result, 'disp_none');
+ // $A.util.removeClass(result, 'disp_none');
+ if(UserProType=='ENG'){
+ $A.util.removeClass(result, 'disp_none');
+ }else{
+ $A.util.addClass(result, 'disp_none');
+ }
} else {
+ debugger
component.find('select_productCategories').set('v.value', '');
var result = component.find('result');
- $A.util.addClass(result, 'disp_none');
- this.select_ProductCcategory(component);
+ $A.util.addClass(result, 'disp_none');
+ this.select_ProductCcategory(component);
}
},
})
\ No newline at end of file
diff --git a/force-app/main/default/classes/RetrospectiveWeeklyReportController.cls b/force-app/main/default/classes/RetrospectiveWeeklyReportController.cls
index 4eb57ee..afbc386 100644
--- a/force-app/main/default/classes/RetrospectiveWeeklyReportController.cls
+++ b/force-app/main/default/classes/RetrospectiveWeeklyReportController.cls
@@ -6,7 +6,7 @@
@AuraEnabled public List<Map<String,String>> doctorList{get;set;}
@AuraEnabled public String UserProType{get;set;}
@AuraEnabled public Map<String,Agency_Report__c> AgencyReportMap{get;set;}
-
+ @AuraEnabled public Map<String,string> PIConfig{get;set;}
public RetrospectiveWeeklyReportController() {
}
@@ -101,6 +101,9 @@
// 瑕嬪嚭銇楄ō瀹�
this.fieldsMap = new Map<String,String>();
this.fieldsMap = this.getfiledsmap();
+
+ this.PIConfig = new Map<String,string>();
+ this.PIConfig.put('staticResourceAgencyContact', JSON.serialize(PIHelper.getPIIntegrationInfo('Agency_Contact__c')));
}
@@ -274,7 +277,9 @@
ret.add(space);
Agency_Hospital_Link__c ahl = [select Hospital__c from Agency_Hospital_Link__c where id = :hospital_id];
- List<Agency_Contact__c> doctor_list = [select id,Name,Doctor_Division1__c,Type__c,Agency_Hospital__c
+ List<Agency_Contact__c> doctor_list = [select id,Name,Doctor_Division1__c,
+ AWS_Data_Id__c,// PI鏀归�� By Bright 20220328
+ Type__c,Agency_Hospital__c
FROM Agency_Contact__c WHERE Hospital_ID18__c=:ahl.Hospital__c order by Name];
for (Agency_Contact__c row : doctor_list)
{
@@ -283,6 +288,7 @@
tmp.put('value', row.Id);
tmp.put('selected', 'false');
tmp.put('Doctor_Division1__c', row.Doctor_Division1__c);
+ tmp.put('AWS_Data_Id__c', row.AWS_Data_Id__c);// PI鏀归�� By Bright 20220328
ret.add(tmp);
}
return ret;
@@ -297,6 +303,8 @@
String UseProduct1, String UseProduct2, String UseProduct3,
String StageName, String oppAmount, String oppOCMPrice, String Close_Forecasted_Date, String Report_Date)
{
+ Department_Cateogy = GetDepartment_Cateogy(Department_Cateogy);
+ system.debug('Department_Cateogy+++'+Department_Cateogy);
Agency_Report__c agency_report = makeAgencyReport(Department_Cateogy,ConsumptionOfConsumables,
WorkMark,warlocksNumber,DealerPersonnel,ProductCcategory,productCategories,WarlockClassification,ProductClassification, WorkRecord,
EffectProgress,Agency_Report_Header,
@@ -370,12 +378,17 @@
//鏂板缓鏂规硶
public static Agency_Report__c insertAgencyReport(Agency_Report__c data) {
if (String.isBlank(data.Hospital__c)) {
+ system.debug('data.Agency_Hospital__c+++'+data.Agency_Hospital__c);
List<Agency_Hospital_Link__c> agency_hospital_link = [select Id, Hospital__c from Agency_Hospital_Link__c where Id=:data.Agency_Hospital__c];
+ system.debug('agency_hospital_link+++'+agency_hospital_link);
data.Hospital__c = agency_hospital_link[0].Hospital__c;
}
if (String.isBlank(data.Department_Class__c)) {
+ system.debug('data.Department_Cateogy__c+++'+data.Department_Cateogy__c);
String record_type_id = LightningUtil.getRecordTypeId(data.Department_Cateogy__c);
+ system.debug('RecordTypeId+++'+record_type_id);
List<Account> account = [select Id, RecordTypeId from account where Hospital_Department_Class__c=:data.Hospital__c and RecordTypeId=:record_type_id];
+ system.debug('account+++'+account);
data.Department_Class__c = account[0].Id;
}
User userPro = LightningUtil.loginUserId();
--
Gitblit v1.9.1