From 697794f729f3c93b2c16aed8fc78d8547d7d33dd Mon Sep 17 00:00:00 2001
From: sunxia <sunxia@prec-tech.com>
Date: 星期一, 11 四月 2022 15:04:02 +0800
Subject: [PATCH] NFM606测试类修改
---
force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js | 99 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 78 insertions(+), 21 deletions(-)
diff --git a/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js b/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js
index f49b1b0..07de2a6 100644
--- a/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js
+++ b/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js
@@ -12,15 +12,15 @@
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));
component.find('select_result').set('v.options', this.conv_selected(res.allselectlist.Result__c));
component.find('select_stageName').set('v.options', this.conv_selected(res.allselectlist.StageName__c));
//SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
- component.find('SupportNeeds__c').set('v.options', this.conv_selected(res.allselectlist.SupportNeeds__c));
+ // component.find('SupportNeeds__c').set('v.options', this.conv_selected(res.allselectlist.SupportNeeds__c));
//SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� end
component.set('v.selected_agency_person', res.allselectlist.AgencyPerson__c[0].label);
component.set('v.dialog_type', '鏂板缓');
@@ -704,7 +704,7 @@
var Purpose_Type__c = component.find('select_purpose_type').get('v.value');
//SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
// 鏀彺闇�姹� SupportNeeds__c
- var SupportNeeds__c = component.find('SupportNeeds__c').get('v.value');
+ // var SupportNeeds__c = component.find('SupportNeeds__c').get('v.value');
//SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� end
// 璇环 Opportunity__c
var Opportunity__c = component.get('v.data.Opportunity__c');
@@ -781,7 +781,7 @@
"Department_Cateogy" : Department_Cateogy__c,
"Purpose_Type" : Purpose_Type__c,
//SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
- "SupportNeedsc" : SupportNeeds__c,
+ // "SupportNeedsc" : SupportNeeds__c,
//SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� end
"Agency_Report_Header" : Agency_Report_Header__c,
"Agency_Hospital" : Agency_Hospital__c,
@@ -849,7 +849,7 @@
"Department_Cateogy" : Department_Cateogy__c,
"Purpose_Type" : Purpose_Type__c,
//SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
- "SupportNeedsc" : SupportNeeds__c,
+ // "SupportNeedsc" : SupportNeeds__c,
//SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� end
"Agency_Report_Header" : Agency_Report_Header__c,
"Agency_Hospital" : Agency_Hospital__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,
@@ -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"),
@@ -1931,9 +1944,9 @@
}
columnDivider = ',';
lineDivider = '\n';
- //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
- keys = ['Submit_date__c','Person_In_Charge2__c','Report_Date__c','Agency_Hospital__c','Department_Cateogy__c','doctor2__c','visitor_title__c','Product_Category1__c','Product_Category2__c','Product_Category3__c','Purpose_Type__c','Result__c','SupportNeeds__c'];
- thkeys = ['鍛�','鎷呭綋','娲诲姩鏃�','鍖婚櫌','绉戝','鎷滆浜�','鑱屼綅','浜у搧鍖哄垎1','浜у搧鍖哄垎2','浜у搧鍖哄垎3','娲诲姩鍖哄垎','缁撴灉','鏀彺闇�姹�']
+ //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start ,'SupportNeeds__c' ,'鏀彺闇�姹�'
+ keys = ['Submit_date__c','Person_In_Charge2__c','Report_Date__c','Agency_Hospital__c','Department_Cateogy__c','doctor2__c','visitor_title__c','Product_Category1__c','Product_Category2__c','Product_Category3__c','Purpose_Type__c','Result__c'];
+ thkeys = ['鍛�','鎷呭綋','娲诲姩鏃�','鍖婚櫌','绉戝','鎷滆浜�','鑱屼綅','浜у搧鍖哄垎1','浜у搧鍖哄垎2','浜у搧鍖哄垎3','娲诲姩鍖哄垎','缁撴灉']
csvStringResult = '';
csvStringResult += thkeys.join(columnDivider);
csvStringResult += lineDivider;
@@ -1961,9 +1974,11 @@
csvStringResult += '"'+ objectRecords[i].Product_Category2__r.Name+'"';
}else if(skey == 'Product_Category3__c'){
csvStringResult += '"'+ objectRecords[i].Product_Category3__r.Name+'"';
- }else if(skey == 'SupportNeeds__c'){//SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
- csvStringResult += '"'+ objectRecords[i].SupportNeeds__c+'"';
- }else{
+ }
+ // else if(skey == 'SupportNeeds__c'){//SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
+ // csvStringResult += '"'+ objectRecords[i].SupportNeeds__c+'"';
+ // }
+ else{
csvStringResult += '"'+ objectRecords[i][skey]+'"';
}
counter++;
@@ -1977,9 +1992,9 @@
return csvStringResult;
},
showExportDate : function(component,objectRecords){
- console.log('杩涘叆showexceportdate'+objectRecords);//SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
- var keys = ['Submit_date__c','Person_In_Charge2__c','Report_Date__c','Agency_Hospital__c','Department_Cateogy__c','doctor2__c','visitor_title__c','Product_Category1__c','Product_Category2__c','Product_Category3__c','Purpose_Type__c','Result__c','SupportNeeds__c'];
- var headers = ['鍛�','鎷呭綋','娲诲姩鏃�','鍖婚櫌','绉戝','鎷滆浜�','鑱屼綅','浜у搧鍖哄垎1','浜у搧鍖哄垎2','浜у搧鍖哄垎3','娲诲姩鍖哄垎','缁撴灉','鏀彺闇�姹�']
+ console.log('杩涘叆showexceportdate'+objectRecords);//SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start ,'SupportNeeds__c' ,'鏀彺闇�姹�'
+ var keys = ['Submit_date__c','Person_In_Charge2__c','Report_Date__c','Agency_Hospital__c','Department_Cateogy__c','doctor2__c','visitor_title__c','Product_Category1__c','Product_Category2__c','Product_Category3__c','Purpose_Type__c','Result__c'];
+ var headers = ['鍛�','鎷呭綋','娲诲姩鏃�','鍖婚櫌','绉戝','鎷滆浜�','鑱屼綅','浜у搧鍖哄垎1','浜у搧鍖哄垎2','浜у搧鍖哄垎3','娲诲姩鍖哄垎','缁撴灉']
var content = "<table class=\"table slds-table slds-table--bordered slds-table--cell-buffer\">";
content += "<thead><tr class=\"slds-text-title--caps\">";
for(i=0;i<headers.length; i++){
@@ -2010,9 +2025,11 @@
content += '<td>'+ objectRecords[i].Product_Category2__r.Name+'</td>';
}else if(skey == 'Product_Category3__c'){
content += '<td>'+ objectRecords[i].Product_Category3__r.Name+'</td>';
- }else if(skey == 'SupportNeeds__c'){//SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
- content += '<td>'+ objectRecords[i].SupportNeeds__c+'</td>';
- }else{
+ }
+ // else if(skey == 'SupportNeeds__c'){//SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
+ // content += '<td>'+ objectRecords[i].SupportNeeds__c+'</td>';
+ // }
+ else{
content += '<td>'+ objectRecords[i][skey]+'</td>';
}
} // inner for loop close
@@ -2043,7 +2060,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