Deploy0331

Li Jun

2022-03-31 3ba0123db48f8bab81ddf0913e1b95280ef545e8

 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 【委托】DAMS系统周报模块内容需求增加 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 【委托】DAMS系统周报模块内容需求增加 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 【委托】DAMS系统周报模块内容需求增加 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 【委托】DAMS系统周报模块内容需求增加 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 【委托】DAMS系统周报模块内容需求增加 start
                 "SupportNeedsc" : SupportNeeds__c,
                //  "SupportNeedsc" : SupportNeeds__c,
                 //SWAG-CBX68C fy 【委托】DAMS系统周报模块内容需求增加 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 【委托】DAMS系统周报模块内容需求增加 start
                "SupportNeedsc" : SupportNeeds__c,
                // "SupportNeedsc" : SupportNeeds__c,
                //SWAG-CBX68C fy 【委托】DAMS系统周报模块内容需求增加 end
                "Agency_Report_Header" : Agency_Report_Header__c,
                "Agency_Hospital" : Agency_Hospital__c,
@@ -1944,9 +1944,9 @@
         }
        columnDivider = ',';
        lineDivider =  '\n';
        //SWAG-CBX68C fy 【委托】DAMS系统周报模块内容需求增加 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 【委托】DAMS系统周报模块内容需求增加 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 【委托】DAMS系统周报模块内容需求增加 start
                    csvStringResult += '"'+ objectRecords[i].SupportNeeds__c+'"';
                }else{
                }
                // else if(skey == 'SupportNeeds__c'){//SWAG-CBX68C fy 【委托】DAMS系统周报模块内容需求增加 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 【委托】DAMS系统周报模块内容需求增加 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 【委托】DAMS系统周报模块内容需求增加 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 【委托】DAMS系统周报模块内容需求增加 start
                    content += '<td>'+ objectRecords[i].SupportNeeds__c+'</td>';
                }else{
                }
                // else if(skey == 'SupportNeeds__c'){//SWAG-CBX68C fy 【委托】DAMS系统周报模块内容需求增加 start
                //     content += '<td>'+ objectRecords[i].SupportNeeds__c+'</td>';
                // }
                else{
                    content += '<td>'+ objectRecords[i][skey]+'</td>';
                }
            } // inner for loop close