From 01f207d979d6be17c8cdec293feab48828c0ec3e Mon Sep 17 00:00:00 2001
From: 黄千龙 <huangqianlong@prec-tech.com>
Date: 星期五, 08 四月 2022 14:22:52 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG
---
force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js b/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js
index 5883a51..080fb50 100644
--- a/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js
+++ b/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js
@@ -20,7 +20,7 @@
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,
@@ -1944,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;
@@ -1974,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++;
@@ -1990,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++){
@@ -2023,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
--
Gitblit v1.9.1