From f5a94e721ae5a26f817f0df75065b64f1f192eb3 Mon Sep 17 00:00:00 2001 From: Li Jun <buli@deloitte.com.cn> Date: 星期一, 28 三月 2022 21:43:51 +0800 Subject: [PATCH] PIPLFunctionDeploy0328 --- force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js | 65 +++++++++++++++++++++++++++++--- 1 files changed, 59 insertions(+), 6 deletions(-) diff --git a/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js b/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js index f49b1b0..5883a51 100644 --- a/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js +++ b/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js @@ -12,8 +12,8 @@ component.set('v.allselectlist',res.allselectlist); component.set('v.doclist',res.doclist); // PIPL update Yin Mingjie 21/02/2022 start - // component.find('select_agency_person').set('v.options', this.conv_selected(res.allselectlist.AgencyPerson__c)); - this.search_contact(component, event, helper,res.allselectlist.AgencyPerson__c); + component.find('select_agency_person').set('v.options', this.conv_selected(res.allselectlist.AgencyPerson__c)); + // this.search_contact(component, event, helper,res.allselectlist.AgencyPerson__c); // PIPL update Yin Mingjie 21/02/2022 end component.find('select_department').set('v.options', this.conv_selected(res.allselectlist.Department_Cateogy__c)); component.find('select_purpose_type').set('v.options', this.conv_selected(res.allselectlist.Purpose_Type__c)); @@ -1220,6 +1220,20 @@ }, insert_agencycontact : function(component,token,newUrl,payload,agencyHospitalid,helper) { + + AWSService.insert(newUrl,payload,function(result){ + if(result.status == '0'){ + $A.getCallback(function(){ + helper.to_agencycontact(component,result,agencyHospitalid); + })(); + + }else{ + console.log('AWS status error:' + result) + component.set('v.login',false); + component.find('OppMessage').setError('AWS insert error.'); + } + },token); + /* fetch(newUrl, { method: 'POST', body: payload, @@ -1244,7 +1258,7 @@ console.log('AWS insert error:' + error) component.set('v.login',false); component.find('OppMessage').setError('AWS insert error.'); - }); + });*/ }, @@ -1866,9 +1880,8 @@ saveRecords : function(component,event){ component.set('v.login',true); var action = component.get("c.processData"); - debugger; var selectDate = component.find('select_date').get('v.value'); - var fieldsList=['Name','Phone','AccountNumber']; //Please write your code dynamic fields + var fieldsList=['Name','Phone','AccountNumber']; //Please write your code dynamic var sss=component.get("v.fileContentData"); action.setParams({ fileData : component.get("v.fileContentData"), @@ -2043,7 +2056,47 @@ 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 awsurl = component.get('v.awsurl'); + + AWSService.search(awsurl.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; + res[ri].visitor_title__c = m[res[ri].doctor2__r.AWS_Data_Id__c].doctorDivision1; + + } + } + } + helper.showExportDate(component, res); + + component.set('v.login', false); + }, awsurl.token); + }else{ + helper.showExportDate(component, res); + } + } + + component.set('v.reports_date', res); }else{ -- Gitblit v1.9.1