From 5b5c1e16deaa3a9d6d0ed1ffca390655ed103df7 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:56:14 +0800
Subject: [PATCH] lex community

---
 force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js | 3258 ++++++++++++++++++++++-------------------------------------
 1 files changed, 1,212 insertions(+), 2,046 deletions(-)

diff --git a/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js b/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js
index 4129232..5dbdbe7 100644
--- a/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js
+++ b/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js
@@ -1,126 +1,77 @@
 ({
-    doinit: function (component, event, helper) {
+    doinit : function(component, event, helper) {
         this.report_date_list(component, event, helper, 5);
-        component.set('v.login', true);
+        component.set('v.login',true);
         var action = component.get('c.getalldata');
-        action.setCallback(this, function (response) {
+        action.setCallback(this,function(response){
             var state = response.getState();
-            if (state == 'SUCCESS') {
+            if(state == 'SUCCESS'){
                 var res = response.getReturnValue();
-                component.set('v.alldata', res.reports);
-                component.set('v.fieldsmap', res.fieldsMap);
-                component.set('v.allselectlist', res.allselectlist);
-                component.set('v.doclist', res.doclist);
+                component.set('v.alldata',res.reports);
+                component.set('v.fieldsmap',res.fieldsMap);
+                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)
-                    );
+                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)
-                    );
-                //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� end
-                component.set(
-                    'v.selected_agency_person',
-                    res.allselectlist.AgencyPerson__c[0].label
-                );
+                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));
+                 //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� end
+                component.set('v.selected_agency_person', res.allselectlist.AgencyPerson__c[0].label);
                 component.set('v.dialog_type', '鏂板缓');
-                component.set('v.awsurl', res.awsurl); // 20220222 PI鏀归�� by Bright
-                component.set('v.contactawsurl', res.contactawsurl); // 20220222 PI鏀归�� by Bright
-
-                this.get_reports(
-                    component,
-                    event,
-                    helper,
-                    component.find('select_date').get('v.value'),
-                    component.find('select_agency_person').get('v.value')
-                );
-
-                component.set('v.login', false);
-            } else {
+                component.set('v.awsurl', res.awsurl);// 20220222 PI鏀归�� by Bright
+                component.set('v.contactawsurl', res.contactawsurl);// 20220222 PI鏀归�� by Bright
+                
+                this.get_reports(component, event, helper, component.find('select_date').get('v.value'), component.find('select_agency_person').get('v.value'));
+				
+                component.set('v.login',false);
+            }
+            else{
                 this.error('doinit failed.');
-                component.set('v.login', false);
+                component.set('v.login',false);
             }
         });
         $A.enqueueAction(action);
     },
-
+    
     // PIPL update Yin Mingjie 21/02/2022 start
-    search_contact: function (component, event, helper, resobj) {
+    search_contact : function(component, event, helper, resobj) {
         let contactData = Object.create(null);
         var dataArr = new Array();
         for (let i = 0; i < resobj.length; i++) {
-            if (resobj[i].awsid != null && resobj[i].awsid != '') {
+            if (resobj[i].awsid != null && resobj[i].awsid != ''){
                 contactData[resobj[i].awsid] = resobj[i];
                 dataArr.push(resobj[i].awsid);
             }
         }
-        let obj = Object.create(null);
+        let obj= Object.create(null);
         obj['dataIds'] = dataArr;
         var payload = JSON.stringify(obj);
-        this.search_contact_url(component, 'Contact', (result) => {
+        this.search_contact_url(component, 'Contact', (result)=>{
             var token = result.token;
             var searchUrl = result.searchUrl;
-            this.search_core(
-                token,
-                searchUrl,
-                payload,
-                (result) => {
-                    if (result.status == '0') {
-                        if (result.object != null) {
-                            this.to_contact_list(
-                                result,
-                                contactData,
-                                component
-                            );
-                        } else {
-                            component.set('v.loginEdit', false);
-                        }
-                    } else {
-                        this.error('AWS search status1 : ' + result.status);
-                        component.set('v.loginEdit', false);
+            this.search_core(token,searchUrl,payload,(result)=>{
+                if(result.status == '0'){
+                    if(result.object != null){
+                        this.to_contact_list(result,contactData,component);
+                    }else{
+                        component.set('v.loginEdit',false);
                     }
-                },
-                component
-            );
+                }else{
+                    this.error('AWS search status1 : ' + result.status);
+                    component.set('v.loginEdit',false);
+                }
+            },component);
+            
         });
     },
 
-    to_contact_list: function (result, retMap, component) {
+    to_contact_list : function(result,retMap,component) {
         var resls = result.object;
         var res = [];
         var space = {};
@@ -137,34 +88,35 @@
             t['value'] = retMap[resls[i].dataId].value;
             res.push(t);
         }
-        component.find('select_agency_person').set('v.options', res);
-        component.set('v.allselectlistAgencyPerson', res);
-        component.set('v.loginEdit', false);
+        component.find('select_agency_person').set('v.options',res);
+        component.set('v.allselectlistAgencyPerson',res);
+        component.set('v.loginEdit',false);
     },
 
-    search_contact_url: function (component, sobject, callback) {
+    search_contact_url : function(component, sobject, callback) {
         var action = component.get('c.getAwsurl');
         action.setParams({
-            sobj: sobject
+            "sobj" : sobject,
         });
-        action.setCallback(this, function (response) {
+        action.setCallback(this,function(response){
             var state = response.getState();
-            if (state == 'SUCCESS') {
+            if(state == 'SUCCESS'){
                 var result = response.getReturnValue();
-                if (callback) callback(result);
-            } else {
+                if(callback)callback(result);
+            }
+            else{
                 this.error('AWS url/token error.');
-                component.set('v.loginEdit', false);
+                component.set('v.loginEdit',false);
             }
         });
         $A.enqueueAction(action);
     },
     // PIPL update Yin Mingjie 21/02/2022 end
 
-    select_department: function (component, event, helper) {
-        var dc = component.find('select_department').get('v.value');
-        dc = dc ? '%' + dc + '%' : '';
-        var purpose_type = component.find('select_purpose_type').get('v.value');
+    select_department : function(component, event, helper) {
+        var dc = component.find("select_department").get("v.value");
+        dc = dc ? '%'+dc+'%' : '';
+        var purpose_type = component.find("select_purpose_type").get("v.value");
         if (purpose_type) {
             if (purpose_type.substr(-3) == 'OPD') {
                 purpose_type = 'OPD';
@@ -175,25 +127,22 @@
             }
         }
         if (dc != '' || purpose_type != '') {
+
             var action = component.get('c.getProductList');
             action.setParams({
-                dc: dc,
-                opdsis: purpose_type
+                "dc" : dc,
+                "opdsis" : purpose_type,
             });
-            action.setCallback(this, function (response) {
+            action.setCallback(this,function(response){
                 var state = response.getState();
-                if (state == 'SUCCESS') {
+                if(state == 'SUCCESS'){
+
                     var res = response.getReturnValue();
-                    component
-                        .find('select_Product1')
-                        .set('v.options', JSON.parse(JSON.stringify(res)));
-                    component
-                        .find('select_Product2')
-                        .set('v.options', JSON.parse(JSON.stringify(res)));
-                    component
-                        .find('select_Product3')
-                        .set('v.options', JSON.parse(JSON.stringify(res)));
-                } else {
+                    component.find('select_Product1').set("v.options", JSON.parse(JSON.stringify(res)));
+                    component.find('select_Product2').set("v.options", JSON.parse(JSON.stringify(res)));
+                    component.find('select_Product3').set("v.options", JSON.parse(JSON.stringify(res)));
+                }
+                else{
                     this.error('getProductList failed.');
                 }
             });
@@ -205,26 +154,26 @@
         }
     },
 
-    get_reports: function (component, event, helper, date_str, person_str) {
+    get_reports : function(component, event, helper, date_str, person_str) {
         if (!date_str) {
             return false;
         }
-
+        
         date_str = this.get_date_string(date_str);
-
+        
         var action = component.get('c.getReports');
         action.setParams({
-            date_str: date_str,
-            person_str: person_str
+            "date_str" : date_str,
+            "person_str" : person_str,
         });
 
-        component.set('v.login', true);
-        action.setCallback(this, function (response) {
+        component.set('v.login',true);
+        action.setCallback(this,function(response){
             var state = response.getState();
-            if (state == 'SUCCESS') {
+            if(state == 'SUCCESS'){
                 var res = response.getReturnValue();
-                component.set('v.reports', res.reports);
-
+				component.set('v.reports', res.reports);
+                
                 // 20220222 PI鏀归�� by Bright--start
                 let dataIds = [];
                 let dataIds1 = [];
@@ -236,96 +185,69 @@
                         dataIds.push(rep.doctor2__r.AWS_Data_Id__c);
                     }
 
-                    if (
-                        rep.Person_In_Charge2__r &&
-                        rep.Person_In_Charge2__r.AWS_Data_Id__c
-                    ) {
+                    if (rep.Person_In_Charge2__r && rep.Person_In_Charge2__r.AWS_Data_Id__c) {
                         dataIds1.push(rep.Person_In_Charge2__r.AWS_Data_Id__c);
                     }
                 }
                 let Foo = null;
-                Foo = function () {
-                    if (b && b1) {
+                Foo = function(){
+                    if(b && b1){
                         for (const rep of res.reports) {
-                            if (
-                                rep.doctor2__r &&
-                                rep.doctor2__r.AWS_Data_Id__c &&
-                                mm.hasOwnProperty(rep.doctor2__r.AWS_Data_Id__c)
-                            ) {
-                                rep.doctor2__r.awsdata =
-                                    mm[rep.doctor2__r.AWS_Data_Id__c];
+                            if (rep.doctor2__r && rep.doctor2__r.AWS_Data_Id__c && mm.hasOwnProperty(rep.doctor2__r.AWS_Data_Id__c)) {
+                                rep.doctor2__r.awsdata = mm[rep.doctor2__r.AWS_Data_Id__c];
                             }
-                            if (
-                                rep.Person_In_Charge2__r &&
-                                rep.Person_In_Charge2__r.AWS_Data_Id__c &&
-                                mm.hasOwnProperty(
-                                    rep.Person_In_Charge2__r.AWS_Data_Id__c
-                                )
-                            ) {
-                                rep.Person_In_Charge2__r.awsdata =
-                                    mm[rep.Person_In_Charge2__r.AWS_Data_Id__c];
+                            if (rep.Person_In_Charge2__r && rep.Person_In_Charge2__r.AWS_Data_Id__c && mm.hasOwnProperty(rep.Person_In_Charge2__r.AWS_Data_Id__c)) {
+                                rep.Person_In_Charge2__r.awsdata = mm[rep.Person_In_Charge2__r.AWS_Data_Id__c];
                             }
                         }
 
-                        $A.getCallback(() =>
-                            component.set('v.reports', res.reports)
-                        )();
-                    } else {
-                        console.log('b=' + b + ',b1=' + b1 + ',continue');
-                        setTimeout(Foo, 100);
+                        $A.getCallback(()=>component.set('v.reports', res.reports))();
+                    }else{
+                        console.log('b='+b + ',b1='+b1+',continue');
+                        setTimeout(Foo,100);
                     }
-                };
-
-                if (dataIds.length > 0) {
+                }
+                
+                if(dataIds.length > 0){
                     let awsurl = component.get('v.awsurl');
-                    helper.search_core(
-                        awsurl.token,
-                        awsurl.searchUrl,
-                        JSON.stringify({
-                            dataIds: dataIds
-                        }),
-                        (result) => {
-                            if (result.status == '0') {
-                                for (const m of result.object) {
-                                    mm[m.dataId] = m;
-                                }
-                                b = true;
-                                Foo();
-                            } else {
-                                //this.error('AWS search status2 : ' + result.status);
-                                this.success('璇烽噸鏂板埛鏂伴〉闈㈣繘琛岃В瀵�');
+                    helper.search_core(awsurl.token,awsurl.searchUrl,JSON.stringify({
+                        "dataIds":dataIds
+                    }),(result)=>{
+                        if(result.status == '0'){
+                            
+                            for (const m of result.object) {
+                                mm[m.dataId] = m;
                             }
-                        },
-                        component
-                    );
-                } else {
+                            b = true;
+                            Foo();
+                        }else{
+                            //this.error('AWS search status2 : ' + result.status);
+                            this.success('璇烽噸鏂板埛鏂伴〉闈㈣繘琛岃В瀵�');
+                        }
+                    },component);
+                }else{
                     b = true;
                 }
 
-                if (dataIds1.length > 0) {
+                
+                
+                if(dataIds1.length > 0){
                     let contactawsurl = component.get('v.contactawsurl');
-                    helper.search_core(
-                        contactawsurl.token,
-                        contactawsurl.searchUrl,
-                        JSON.stringify({
-                            dataIds: dataIds1
-                        }),
-                        (result) => {
-                            if (result.status == '0') {
-                                for (const m of result.object) {
-                                    mm[m.dataId] = m;
-                                }
-                                b1 = true;
-                                Foo();
-                            } else {
-                                this.error(
-                                    'AWS search status3 : ' + result.status
-                                );
+                    helper.search_core(contactawsurl.token,contactawsurl.searchUrl,JSON.stringify({
+                        "dataIds":dataIds1
+                    }),(result)=>{
+                        if(result.status == '0'){
+                            
+                            for (const m of result.object) {
+                                mm[m.dataId] = m;
                             }
-                        },
-                        component
-                    );
-                } else {
+                            b1 = true;
+                            Foo();
+                        }else{
+                            this.error('AWS search status3 : ' + result.status);
+                        }
+                    },component);
+                }else{
                     b1 = true;
                 }
                 // 20220222 PI鏀归�� by Bright--end
@@ -334,59 +256,51 @@
 
                 // 鏇存柊淇濆瓨寰屻伄select_data鐢�
                 var report_id = component.get('v.update_select_report_data_id');
-
-                if (report_id != '') {
+                
+                if (report_id != "") {
                     for (i = 0; i < res.reports.length; i++) {
                         if (res.reports[i]['Id'] == report_id) {
-                            component.set(
-                                'v.select_report_data',
-                                res.reports[i]
-                            );
+                            component.set('v.select_report_data', res.reports[i]);
                             break;
                         }
                     }
                     component.set('v.update_select_report_data_id', '');
                 }
-
+                
                 if (res.reports.length > 0) {
                     component.set('v.list_message', '');
                 } else {
                     component.set('v.list_message', 'no_data');
                 }
-                component.set('v.login', false);
-            } else {
+                component.set('v.login',false);
+            }
+            else{
                 this.error('get_reports failed.');
-                component.set('v.login', false);
+                component.set('v.login',false);
             }
         });
         $A.enqueueAction(action);
     },
-    get_reports_edit: function (
-        component,
-        event,
-        helper,
-        date_str,
-        person_str
-    ) {
+    get_reports_edit : function(component, event, helper, date_str, person_str) {
         if (!date_str) {
             return false;
         }
-
+        
         date_str = this.get_date_string(date_str);
-
+        
         var action = component.get('c.getReports');
         action.setParams({
-            date_str: date_str,
-            person_str: person_str
+            "date_str" : date_str,
+            "person_str" : person_str,
         });
 
-        component.set('v.loginEdit', true);
-        action.setCallback(this, function (response) {
+        component.set('v.loginEdit',true);
+        action.setCallback(this,function(response){
             var state = response.getState();
-            if (state == 'SUCCESS') {
+            if(state == 'SUCCESS'){
                 var res = response.getReturnValue();
-                component.set('v.reports', res.reports);
-
+				component.set('v.reports', res.reports);
+                
                 // 20220222 PI鏀归�� by Bright--start
                 let dataIds = [];
                 let dataIds1 = [];
@@ -398,96 +312,69 @@
                         dataIds.push(rep.doctor2__r.AWS_Data_Id__c);
                     }
 
-                    if (
-                        rep.Person_In_Charge2__r &&
-                        rep.Person_In_Charge2__r.AWS_Data_Id__c
-                    ) {
+                    if (rep.Person_In_Charge2__r && rep.Person_In_Charge2__r.AWS_Data_Id__c) {
                         dataIds1.push(rep.Person_In_Charge2__r.AWS_Data_Id__c);
                     }
                 }
                 let Foo = null;
-                Foo = function () {
-                    if (b && b1) {
+                Foo = function(){
+                    if(b && b1){
                         for (const rep of res.reports) {
-                            if (
-                                rep.doctor2__r &&
-                                rep.doctor2__r.AWS_Data_Id__c &&
-                                mm.hasOwnProperty(rep.doctor2__r.AWS_Data_Id__c)
-                            ) {
-                                rep.doctor2__r.awsdata =
-                                    mm[rep.doctor2__r.AWS_Data_Id__c];
+                            if (rep.doctor2__r && rep.doctor2__r.AWS_Data_Id__c && mm.hasOwnProperty(rep.doctor2__r.AWS_Data_Id__c)) {
+                                rep.doctor2__r.awsdata = mm[rep.doctor2__r.AWS_Data_Id__c];
                             }
-                            if (
-                                rep.Person_In_Charge2__r &&
-                                rep.Person_In_Charge2__r.AWS_Data_Id__c &&
-                                mm.hasOwnProperty(
-                                    rep.Person_In_Charge2__r.AWS_Data_Id__c
-                                )
-                            ) {
-                                rep.Person_In_Charge2__r.awsdata =
-                                    mm[rep.Person_In_Charge2__r.AWS_Data_Id__c];
+                            if (rep.Person_In_Charge2__r && rep.Person_In_Charge2__r.AWS_Data_Id__c && mm.hasOwnProperty(rep.Person_In_Charge2__r.AWS_Data_Id__c)) {
+                                rep.Person_In_Charge2__r.awsdata = mm[rep.Person_In_Charge2__r.AWS_Data_Id__c];
                             }
                         }
 
-                        $A.getCallback(() =>
-                            component.set('v.reports', res.reports)
-                        )();
-                    } else {
-                        console.log('b=' + b + ',b1=' + b1 + ',continue');
-                        setTimeout(Foo, 100);
+                        $A.getCallback(()=>component.set('v.reports', res.reports))();
+                    }else{
+                        console.log('b='+b + ',b1='+b1+',continue');
+                        setTimeout(Foo,100);
                     }
-                };
-
-                if (dataIds.length > 0) {
+                }
+                
+                if(dataIds.length > 0){
                     let awsurl = component.get('v.awsurl');
-                    helper.search_core(
-                        awsurl.token,
-                        awsurl.searchUrl,
-                        JSON.stringify({
-                            dataIds: dataIds
-                        }),
-                        (result) => {
-                            if (result.status == '0') {
-                                for (const m of result.object) {
-                                    mm[m.dataId] = m;
-                                }
-                                b = true;
-                                Foo();
-                            } else {
-                                //this.error('AWS search status2 : ' + result.status);
-                                this.success('璇烽噸鏂板埛鏂伴〉闈㈣繘琛岃В瀵�');
+                    helper.search_core(awsurl.token,awsurl.searchUrl,JSON.stringify({
+                        "dataIds":dataIds
+                    }),(result)=>{
+                        if(result.status == '0'){
+                            
+                            for (const m of result.object) {
+                                mm[m.dataId] = m;
                             }
-                        },
-                        component
-                    );
-                } else {
+                            b = true;
+                            Foo();
+                        }else{
+                            //this.error('AWS search status2 : ' + result.status);
+                            this.success('璇烽噸鏂板埛鏂伴〉闈㈣繘琛岃В瀵�');
+                        }
+                    },component);
+                }else{
                     b = true;
                 }
 
-                if (dataIds1.length > 0) {
+                
+                
+                if(dataIds1.length > 0){
                     let contactawsurl = component.get('v.contactawsurl');
-                    helper.search_core(
-                        contactawsurl.token,
-                        contactawsurl.searchUrl,
-                        JSON.stringify({
-                            dataIds: dataIds1
-                        }),
-                        (result) => {
-                            if (result.status == '0') {
-                                for (const m of result.object) {
-                                    mm[m.dataId] = m;
-                                }
-                                b1 = true;
-                                Foo();
-                            } else {
-                                this.error(
-                                    'AWS search status3 : ' + result.status
-                                );
+                    helper.search_core(contactawsurl.token,contactawsurl.searchUrl,JSON.stringify({
+                        "dataIds":dataIds1
+                    }),(result)=>{
+                        if(result.status == '0'){
+                            
+                            for (const m of result.object) {
+                                mm[m.dataId] = m;
                             }
-                        },
-                        component
-                    );
-                } else {
+                            b1 = true;
+                            Foo();
+                        }else{
+                            this.error('AWS search status3 : ' + result.status);
+                        }
+                    },component);
+                }else{
                     b1 = true;
                 }
                 // 20220222 PI鏀归�� by Bright--end
@@ -496,69 +383,53 @@
 
                 // 鏇存柊淇濆瓨寰屻伄select_data鐢�
                 var report_id = component.get('v.update_select_report_data_id');
-
-                if (report_id != '') {
+                
+                if (report_id != "") {
                     for (i = 0; i < res.reports.length; i++) {
                         if (res.reports[i]['Id'] == report_id) {
-                            component.set(
-                                'v.select_report_data',
-                                res.reports[i]
-                            );
+                            component.set('v.select_report_data', res.reports[i]);
                             break;
                         }
                     }
                     component.set('v.update_select_report_data_id', '');
                 }
-
+                
                 if (res.reports.length > 0) {
                     component.set('v.list_message', '');
                 } else {
                     component.set('v.list_message', 'no_data');
                 }
-                component.set('v.loginEdit', false);
-            } else {
+                component.set('v.loginEdit',false);
+            }
+            else{
                 this.error('get_reports failed.');
-                component.set('v.loginEdit', false);
+                component.set('v.loginEdit',false);
             }
         });
         $A.enqueueAction(action);
     },
-
-    select_date_change: function (component, event, helper) {
-        this.get_reports(
-            component,
-            event,
-            helper,
-            component.find('select_date').get('v.value'),
-            component.find('select_agency_person').get('v.value')
-        );
+    
+	select_date_change : function(component, event, helper) {
+        this.get_reports(component, event, helper, component.find('select_date').get('v.value'), component.find('select_agency_person').get('v.value'));
         this.new_button_disabled(component, event, helper);
-
+        
         component.set('v.select_report_data_radio', '');
         component.find('copy_button').set('v.disabled', true);
     },
-
-    select_agency_change: function (component, event, helper) {
-        var select_value = component
-            .find('select_agency_person')
-            .get('v.value');
+    
+    select_agency_change : function(component, event, helper) {
+        var select_value = component.find('select_agency_person').get('v.value');
         var new_label = this.get_agency_person_name(component, select_value);
         component.set('v.selected_agency_person', new_label);
-
-        this.get_reports(
-            component,
-            event,
-            helper,
-            component.find('select_date').get('v.value'),
-            select_value
-        );
+        
+        this.get_reports(component, event, helper, component.find('select_date').get('v.value'), select_value);
         this.new_button_disabled(component, event, helper);
 
         component.set('v.select_report_data_radio', '');
         component.find('copy_button').set('v.disabled', true);
     },
-
-    get_agency_person_name: function (component, agency_person_value) {
+    
+    get_agency_person_name : function(component, agency_person_value) {
         // PIPL update Yin Mingjie 21/02/2022 start
         var allselectlist = component.get('v.allselectlist.AgencyPerson__c');
         // var allselectlist = component.get('v.allselectlistAgencyPerson');
@@ -572,111 +443,78 @@
         }
         return new_label;
     },
-
-    new_button_disabled: function (component, event, helper) {
+    
+    new_button_disabled : function(component, event, helper) {
         var select_date = component.find('select_date').get('v.value');
-        var select_agency = component
-            .find('select_agency_person')
-            .get('v.value');
+        var select_agency = component.find('select_agency_person').get('v.value');
         if (select_date && select_agency) {
             component.find('new_button').set('v.disabled', false);
         } else {
             component.find('new_button').set('v.disabled', true);
         }
     },
-
-    toggle_report: function (component) {
+    
+    toggle_report : function(component) {
         var modal_window = component.find('modal_window');
         var modal_bg = component.find('modal_bg');
         if ($A.util.hasClass(modal_window, 'disp_none')) {
             // OPEN
             $A.util.removeClass(modal_window, 'disp_none');
-            $A.util.removeClass(modal_bg, 'disp_none');
-            component.set('v.loginEdit', true);
-            if (
-                component.get('v.mode') == 'edit' ||
-                component.get('v.mode') == 'copy'
-            ) {
+        	$A.util.removeClass(modal_bg, 'disp_none');
+            component.set('v.loginEdit',true);
+            if (component.get('v.mode') == 'edit' || component.get('v.mode') == 'copy') {
                 var select_data = '';
                 if (component.get('v.mode') == 'edit') {
                     select_data = component.get('v.select_report_data');
                 } else if (component.get('v.mode') == 'copy') {
                     select_data = component.get('v.select_report_data_radio');
                 }
-
+                
                 var reports = component.get('v.reports');
                 var Agency_Hospital_text = '';
                 var Agency_Hospital_parent_id = '';
-                debugger;
-                // 鍖婚櫌鍚�
+                debugger
+				// 鍖婚櫌鍚�
                 if (select_data['Agency_Hospital__c'] != '') {
                     for (var i = 0; i < reports.length; i++) {
-                        if (
-                            reports[i]['Agency_Hospital__c'] ==
-                            select_data['Agency_Hospital__c']
-                        ) {
-                            Agency_Hospital_text =
-                                reports[i]['Agency_Hospital__r']['Name'];
-                            Agency_Hospital_parent_id =
-                                reports[i]['Agency_Hospital__r']['Hospital__c'];
+                        if (reports[i]['Agency_Hospital__c'] == select_data['Agency_Hospital__c']) {
+                            Agency_Hospital_text = reports[i]['Agency_Hospital__r']['Name'];
+                            Agency_Hospital_parent_id = reports[i]['Agency_Hospital__r']['Hospital__c'];
                         }
                     }
                     component.set('v.hospital', Agency_Hospital_text);
                     component.set('v.hospitalId', Agency_Hospital_parent_id);
-                    component.set(
-                        'v.hospitalLinkId',
-                        select_data['Agency_Hospital__c']
-                    );
+                    component.set('v.hospitalLinkId', select_data['Agency_Hospital__c']);
                     component.find('new_con').set('v.disabled', false);
                 }
-
+                
                 // 绉戝
                 if (select_data['Department_Cateogy__c'] != '') {
-                    this.set_selected(
-                        component,
-                        'select_department',
-                        select_data['Department_Cateogy__c']
-                    );
+                    this.set_selected(component, 'select_department', select_data['Department_Cateogy__c']);
                 }
                 // 鎷滆浜�
-                component.set(
-                    'v.default_select_doctor_id',
-                    select_data['doctor2__c']
-                );
-                this.set_doctor_list(component);
-
+                component.set('v.default_select_doctor_id', select_data['doctor2__c']);
+				this.set_doctor_list(component);
+                
                 // 娲诲姩鍖哄垎
                 if (select_data['Purpose_Type__c'] != '') {
-                    this.set_selected(
-                        component,
-                        'select_purpose_type',
-                        select_data['Purpose_Type__c']
-                    );
+                    this.set_selected(component, 'select_purpose_type', select_data['Purpose_Type__c']);
                     this.select_purpose_type(component);
                 }
                 //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
                 // 鏀彺闇�姹�
                 if (select_data['SupportNeeds__c'] != '') {
-                    this.set_selected(
-                        component,
-                        'SupportNeeds__c',
-                        select_data['SupportNeeds__c']
-                    );
-                }
-                //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� end
+                    this.set_selected(component, 'SupportNeeds__c', select_data['SupportNeeds__c']);
+                }  
+                //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� end             
                 // 绲愭灉
-                if (
-                    select_data['Result__c'] != '' &&
-                    typeof select_data['Result__c'] !== 'undefined'
-                ) {
-                    component
-                        .find('select_result')
-                        .set('v.value', select_data['Result__c']);
+                if (select_data['Result__c'] != '' && typeof select_data['Result__c'] !== "undefined") {
+                    component.find('select_result').set('v.value', select_data['Result__c']);
                 }
-
+                
                 // 璇环
                 var report_id = component.get('v.edit_copy_select_report_id');
-                if (report_id != '') {
+                if (report_id != "") {
                     var select_opp = '';
                     var select_product_category1 = '';
                     var select_product_category2 = '';
@@ -684,83 +522,59 @@
                     var reportDate;
                     var i = 0;
                     for (i = 0; i < reports.length; i++) {
-                        if (report_id == reports[i]['Id']) {
-                            select_opp = reports[i]['Opportunity__c'];
-                            select_product_category1 =
-                                reports[i]['Product_Category1__c'];
-                            select_product_category2 =
-                                reports[i]['Product_Category2__c'];
-                            select_product_category3 =
-                                reports[i]['Product_Category3__c'];
-                            reportDate = reports[i]['Report_Date__c'];
+                        if (report_id == reports[i]["Id"]) {
+                            select_opp = reports[i]["Opportunity__c"];
+                            select_product_category1 = reports[i]["Product_Category1__c"];
+                            select_product_category2 = reports[i]["Product_Category2__c"];
+                            select_product_category3 = reports[i]["Product_Category3__c"];
+                            reportDate = reports[i]["Report_Date__c"];
                             break;
                         }
                     }
-
+                    
                     // 璇环
                     if (select_opp != null && select_opp != '') {
-                        var select_opp_name =
-                            component.get('v.reports')[i].OppName__c;
+                        var select_opp_name = component.get('v.reports')[i].OppName__c;
                         component.set('v.data.Opportunity__c', select_opp);
-                        if ($A.get('$Browser.formFactor') == 'DESKTOP') {
-                            var values = [
-                                {
-                                    type: 'Agency_Opportunity__c',
-                                    id: select_opp,
-                                    label: select_opp_name,
-                                    icon: {
-                                        url: '/img/icon/t4v35/custom/custom12_120.png',
-                                        backgroundColor: 'dc71d1',
-                                        alt: 'Agency_Opportunity__c'
-                                    }
+                        if ($A.get("$Browser.formFactor") == 'DESKTOP') {
+                            var values = [{
+                                type: 'Agency_Opportunity__c',
+                                id: select_opp,
+                                label: select_opp_name, 
+                                icon : {
+                                    url:'/img/icon/t4v35/custom/custom12_120.png',
+                                    backgroundColor:'dc71d1',
+                                    alt:'Agency_Opportunity__c'
                                 }
-                            ];
+                            }];
                             component.set('v.data.Opportunity__c', select_opp);
                             // component.find('input-opportunity').get("v.body")[0].set('v.values', values);
                         } else {
-                            component
-                                .find('input-opportunity')
-                                .get('v.body')[0]
-                                .set('v.selectedLabel', select_opp_name);
+                            component.find('input-opportunity').get("v.body")[0].set('v.selectedLabel', select_opp_name);
                         }
                     }
-
+                    
                     // 浜у搧鍖哄垎
-                    if (
-                        select_product_category1 != null &&
-                        select_product_category1 != ''
-                    ) {
-                        component
-                            .find('select_Product1')
-                            .set('v.value', select_product_category1);
+                    if (select_product_category1 != null && select_product_category1 != '') {
+                        component.find('select_Product1').set('v.value', select_product_category1);
                     }
-                    if (
-                        select_product_category2 != null &&
-                        select_product_category2 != ''
-                    ) {
-                        component
-                            .find('select_Product2')
-                            .set('v.value', select_product_category2);
+                    if (select_product_category2 != null && select_product_category2 != '') {
+                        component.find('select_Product2').set('v.value', select_product_category2);
                     }
-                    if (
-                        select_product_category3 != null &&
-                        select_product_category3 != ''
-                    ) {
-                        component
-                            .find('select_Product3')
-                            .set('v.value', select_product_category3);
+                    if (select_product_category3 != null && select_product_category3 != '') {
+                        component.find('select_Product3').set('v.value', select_product_category3);
                     }
 
                     if (reportDate != null) {
                         console.log('reportDate = ' + reportDate);
                         component.set('v.data.Report_Date__c', reportDate);
                     }
-
-                    component.set('v.edit_copy_select_report_id', '');
-                }
+                    
+                    component.set('v.edit_copy_select_report_id', "");
+                }                
             }
-            setTimeout(function () {
-                component.set('v.loginEdit', false);
+            setTimeout(function() {
+                component.set('v.loginEdit',false);
             }, 1000);
         } else {
             // CLOSE
@@ -768,148 +582,113 @@
             var select_report_data = component.get('v.select_report_data');
             var Report_Date__c = component.get('v.data.Report_Date__c');
             var Agency_Hospital__c = component.get('v.hospitalLinkId');
-            var Department_Cateogy__c = component
-                .find('select_department')
-                .get('v.value');
+            var Department_Cateogy__c = component.find('select_department').get('v.value');
             var doctor2__c = component.find('select_doctor').get('v.value');
-            var Purpose_Type__c = component
-                .find('select_purpose_type')
-                .get('v.value');
-            var SupportNeeds__c = component
-                .find('SupportNeeds__c')
-                .get('v.value');
+            var Purpose_Type__c = component.find('select_purpose_type').get('v.value');
+            var SupportNeeds__c = component.find('SupportNeeds__c').get('v.value');
             var Opportunity__c = component.get('v.data.Opportunity__c');
-            var Product_Category1__c = component
-                .find('select_Product1')
-                .get('v.value');
-            var Product_Category2__c = component
-                .find('select_Product2')
-                .get('v.value');
-            var Product_Category3__c = component
-                .find('select_Product3')
-                .get('v.value');
+            var Product_Category1__c = component.find('select_Product1').get('v.value');
+            var Product_Category2__c = component.find('select_Product2').get('v.value');
+            var Product_Category3__c = component.find('select_Product3').get('v.value');
             var Result__c = component.find('select_result').get('v.value');
-
+            
             if (select_report_data !== null) {
-                if (
-                    typeof select_report_data['Opportunity__c'] === 'undefined'
-                ) {
-                    select_report_data['Opportunity__c'] = '';
+                if (typeof select_report_data['Opportunity__c'] === "undefined") {
+                    select_report_data['Opportunity__c'] = "";
                 }
-                if (
-                    typeof select_report_data['Product_Category1__c'] ===
-                    'undefined'
-                ) {
-                    select_report_data['Product_Category1__c'] = '';
+                if (typeof select_report_data['Product_Category1__c'] === "undefined") {
+                    select_report_data['Product_Category1__c'] = "";
                 }
-                if (
-                    typeof select_report_data['Product_Category2__c'] ===
-                    'undefined'
-                ) {
-                    select_report_data['Product_Category2__c'] = '';
+                if (typeof select_report_data['Product_Category2__c'] === "undefined") {
+                    select_report_data['Product_Category2__c'] = "";
                 }
-                if (
-                    typeof select_report_data['Product_Category3__c'] ===
-                    'undefined'
-                ) {
-                    select_report_data['Product_Category3__c'] = '';
+                if (typeof select_report_data['Product_Category3__c'] === "undefined") {
+                    select_report_data['Product_Category3__c'] = "";
                 }
-                if (typeof select_report_data['Result__c'] === 'undefined') {
-                    select_report_data['Result__c'] = '';
+                if (typeof select_report_data['Result__c'] === "undefined") {
+                    select_report_data['Result__c'] = "";
                 }
             }
-
+            
             if (component.get('v.mode') == 'new') {
-                var confirm_title = '璀﹀憡!';
+                var confirm_title = '璀﹀憡!'
                 var confirm_text = '鏀惧純鏂板缓鍛ㄦ姤锛�';
-
-                if (
-                    !Report_Date__c &&
+                
+                if (!Report_Date__c &&
                     !Agency_Hospital__c &&
                     !Department_Cateogy__c &&
                     !doctor2__c &&
                     !Purpose_Type__c &&
-                    !SupportNeeds__c && //WAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔�
+                    !SupportNeeds__c&&//WAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔�
                     !Opportunity__c &&
                     !Product_Category1__c &&
                     !Product_Category2__c &&
                     !Product_Category3__c &&
-                    !Result__c
-                ) {
+                    !Result__c)
+                {
                     this.allclear(component);
                     $A.util.addClass(modal_window, 'disp_none');
-                    $A.util.addClass(modal_bg, 'disp_none');
+		            $A.util.addClass(modal_bg, 'disp_none');
                 } else {
                     this.close_confirm(component, confirm_title, confirm_text);
-                }
+                }        
             } else if (component.get('v.mode') == 'copy') {
-                var confirm_title = '璀﹀憡!';
+                var confirm_title = '璀﹀憡!'
                 var confirm_text = '鏀惧純鏂板缓鍛ㄦ姤锛�';
-
-                if (
-                    select_report_data['Report_Date__c'] == Report_Date__c &&
-                    select_report_data['Agency_Hospital__c'] ==
-                        Agency_Hospital__c &&
-                    select_report_data['Department_Cateogy__c'] ==
-                        Department_Cateogy__c &&
+                
+                if (select_report_data['Report_Date__c'] == Report_Date__c &&
+                    select_report_data['Agency_Hospital__c'] == Agency_Hospital__c &&
+                    select_report_data['Department_Cateogy__c'] == Department_Cateogy__c &&
                     select_report_data['doctor2__c'] == doctor2__c &&
                     select_report_data['Purpose_Type__c'] == Purpose_Type__c &&
-                    select_report_data['SupportNeeds__c'] == SupportNeeds__c && //WAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔�
+                    select_report_data['SupportNeeds__c'] == SupportNeeds__c &&//WAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔�
                     select_report_data['Opportunity__c'] == Opportunity__c &&
-                    select_report_data['Product_Category1__c'] ==
-                        Product_Category1__c &&
-                    select_report_data['Product_Category2__c'] ==
-                        Product_Category2__c &&
-                    select_report_data['Product_Category3__c'] ==
-                        Product_Category3__c &&
-                    select_report_data['Result__c'] == Result__c
-                ) {
+                    select_report_data['Product_Category1__c'] == Product_Category1__c &&
+                    select_report_data['Product_Category2__c'] == Product_Category2__c &&
+                    select_report_data['Product_Category3__c'] == Product_Category3__c &&
+                    select_report_data['Result__c'] == Result__c)
+                {
                     this.allclear(component);
                     $A.util.addClass(modal_window, 'disp_none');
-                    $A.util.addClass(modal_bg, 'disp_none');
+		            $A.util.addClass(modal_bg, 'disp_none');
                 } else {
                     this.close_confirm(component, confirm_title, confirm_text);
-                }
-            } else if (component.get('v.mode') == 'edit') {
-                var confirm_title = '璀﹀憡!';
+                }                
+	        } else if (component.get('v.mode') == 'edit') {
+                var confirm_title = '璀﹀憡!'
                 var confirm_text = '鏀惧純缂栬緫鍛ㄦ姤锛�';
 
-                if (
-                    select_report_data['Report_Date__c'] == Report_Date__c &&
-                    select_report_data['Agency_Hospital__c'] ==
-                        Agency_Hospital__c &&
-                    select_report_data['Department_Cateogy__c'] ==
-                        Department_Cateogy__c &&
+                if (select_report_data['Report_Date__c'] == Report_Date__c &&
+                    select_report_data['Agency_Hospital__c'] == Agency_Hospital__c &&
+                    select_report_data['Department_Cateogy__c'] == Department_Cateogy__c &&
                     select_report_data['doctor2__c'] == doctor2__c &&
                     select_report_data['Purpose_Type__c'] == Purpose_Type__c &&
-                    select_report_data['SupportNeeds__c'] == SupportNeeds__c && //WAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔�
+                    select_report_data['SupportNeeds__c'] == SupportNeeds__c &&//WAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔�
                     select_report_data['Opportunity__c'] == Opportunity__c &&
-                    select_report_data['Product_Category1__c'] ==
-                        Product_Category1__c &&
-                    select_report_data['Product_Category2__c'] ==
-                        Product_Category2__c &&
-                    select_report_data['Product_Category3__c'] ==
-                        Product_Category3__c &&
-                    select_report_data['Result__c'] == Result__c
-                ) {
+                    select_report_data['Product_Category1__c'] == Product_Category1__c &&
+                    select_report_data['Product_Category2__c'] == Product_Category2__c &&
+                    select_report_data['Product_Category3__c'] == Product_Category3__c &&
+                    select_report_data['Result__c'] == Result__c)
+                {
                     this.allclear(component);
                     $A.util.addClass(modal_window, 'disp_none');
-                    $A.util.addClass(modal_bg, 'disp_none');
+		            $A.util.addClass(modal_bg, 'disp_none');
                 } else {
                     this.close_confirm(component, confirm_title, confirm_text);
                 }
-            }
+	        }
+
         }
     },
-
-    close_confirm: function (component, title, text) {
+    
+    close_confirm : function(component, title, text) {
         var confirm_status = component.get('v.confirm_status');
         component.set('v.modal_confirm_title', title);
         component.set('v.modal_confirm_text', text);
         var modal_window = component.find('modal_window');
         var modal_bg = component.find('modal_bg');
-        var modal_confirm = component.find('modal_confirm');
-        var modal_confirm_bg = component.find('modal_confirm_bg');
+        var modal_confirm = component.find('modal_confirm'); 
+        var modal_confirm_bg = component.find('modal_confirm_bg'); 
 
         if (confirm_status == 0) {
             $A.util.addClass(modal_window, 'disp_none');
@@ -922,83 +701,62 @@
             $A.util.addClass(modal_confirm_bg, 'disp_none');
             component.set('v.mode', '');
             this.allclear(component);
-            component.set('v.reports_now', '');
+            component.set('v.reports_now', "");
             component.set('v.reports_now_count', 0);
             component.set('v.confirm_status', 0);
         } else if (confirm_status == 2) {
             // 鍚�
             $A.util.removeClass(modal_window, 'disp_none');
-            $A.util.removeClass(modal_bg, 'disp_none');
+	        $A.util.removeClass(modal_bg, 'disp_none');
             $A.util.addClass(modal_confirm, 'disp_none');
-            $A.util.addClass(modal_confirm_bg, 'disp_none');
+	        $A.util.addClass(modal_confirm_bg, 'disp_none');
             component.set('v.confirm_status', 0);
         }
     },
 
-    new_report: function (component, event, helper) {
+    new_report : function(component, event, helper) {
         component.set('v.mode', 'new');
         component.set('v.dialog_type', '鏂板缓');
         var select_date = component.find('select_date').get('v.value');
-        var select_agency = component
-            .find('select_agency_person')
-            .get('v.value');
+        var select_agency = component.find('select_agency_person').get('v.value');
         component.set('v.selected_date', select_date);
         var name = component.get('v.selected_agency_person');
-        var ret = this.create_report_header(
-            component,
-            name,
-            select_agency,
-            select_date
-        );
+        var ret = this.create_report_header(component, name, select_agency, select_date);
         // PIPL update Yin Mingjie 21/02/2022 start
-        this.set_aws_url(component, 'Agency_Contact__c');
+        this.set_aws_url(component,'Agency_Contact__c')
         // PIPL update Yin Mingjie 21/02/2022 end
     },
-
-    copy_button: function (component, event, helper) {
+    
+    copy_button : function(component, event, helper) {
         this.allclear(component);
         component.set('v.mode', 'copy');
         component.set('v.dialog_type', '鏂板缓');
         var select_report_data = component.get('v.select_report_data_radio');
         component.set('v.loadOpp', true);
         // 閫�
-        var now = new Date();
-        var start_day = new Date(
-            now.getFullYear(),
-            now.getMonth(),
-            now.getDate() - now.getDay() + 1
-        );
-        var select_date =
-            start_day.getFullYear() +
-            '/' +
-            (start_day.getMonth() + 1) +
-            '/' +
-            start_day.getDate();
+		var now = new Date();
+        var start_day = new Date(now.getFullYear(), now.getMonth(), (now.getDate() - now.getDay() + 1));
+        var select_date = start_day.getFullYear() + '/' + (start_day.getMonth() + 1) + '/' + start_day.getDate();
         this.set_selected(component, 'select_date', select_date);
         component.set('v.selected_date', select_date);
-
+        
         // 鎷呭綋
         var select_agency = select_report_data['Person_In_Charge2__c'];
         var new_label = this.get_agency_person_name(component, select_agency);
         component.set('v.selected_agency_person', new_label);
         this.set_selected(component, 'select_agency_person', select_agency);
-
+        
         this.new_button_disabled(component, event, helper);
 
         var name = component.get('v.selected_agency_person');
-
+        
         component.set('v.edit_copy_select_report_id', select_report_data['Id']);
         component.set('v.select_report_data', select_report_data);
 
-        var ret = this.create_report_header(
-            component,
-            name,
-            select_agency,
-            select_date
-        );
+        var ret = this.create_report_header(component, name, select_agency, select_date);
     },
-
-    change_report_radio: function (component, event, helper) {
+    
+    change_report_radio : function(component, event, helper) {
         var reports = component.get('v.reports');
         for (var i = 0; i < reports.length; i++) {
             if (reports[i].Name == event.getSource().get('v.label')) {
@@ -1008,52 +766,40 @@
             }
         }
     },
-
-    edit_button: function (component, event, helper) {
+    
+    edit_button : function(component, event, helper) {
         component.set('v.login', true);
         this.allclear(component);
         component.set('v.loadOpp', true);
         var index = event.getSource().get('v.value');
-        component.set(
-            'v.select_report_data',
-            component.get('v.reports')[index]
-        );
+        component.set('v.select_report_data', component.get('v.reports')[index]);
         component.set('v.mode', 'edit');
         component.set('v.dialog_type', '缂栬緫');
 
         var select_date = component.get('v.reports')[index].Submit_date__c;
-        var select_agency =
-            component.get('v.reports')[index].Person_In_Charge2__c;
+        var select_agency = component.get('v.reports')[index].Person_In_Charge2__c;
         var text_tmp = select_date.split('-');
-        var select_date_text =
-            text_tmp[0] + '/' + Number(text_tmp[1]) + '/' + Number(text_tmp[2]);
+        var select_date_text = text_tmp[0] + '/' + Number(text_tmp[1]) + '/' + Number(text_tmp[2]);
         component.set('v.selected_date', select_date_text);
         var name = component.get('v.reports')[index].Person_In_Charge2__r.Name;
-
+        
         this.set_selected(component, 'select_agency_person', select_agency);
         this.new_button_disabled(component, event, helper);
-
+        
         var new_label = this.get_agency_person_name(component, select_agency);
         component.set('v.selected_agency_person', new_label);
 
-        component.set(
-            'v.edit_copy_select_report_id',
-            component.get('v.reports')[index].Id
-        );
-
-        var ret = this.create_report_header(
-            component,
-            name,
-            select_agency,
-            select_date
-        );
+        component.set('v.edit_copy_select_report_id', component.get('v.reports')[index].Id);
+        
+        var ret = this.create_report_header(component, name, select_agency, select_date);
     },
+    
+    save_report : function(component, event, helper) {
 
-    save_report: function (component, event, helper) {
         // 20220222 PI鏀归��  by Bright--start
         let doctor2Name = '';
         let visitortitle = '';
-        for (let op of component.find('select_doctor').get('v.options')) {
+        for(let op of component.find('select_doctor').get('v.options')){
             if (op.selected) {
                 doctor2Name = op.label;
                 visitortitle = op.Doctor_Division1__c;
@@ -1061,56 +807,44 @@
         }
         // 20220222 PI鏀归��  by Bright--end
 
+
         component.find('save_button').set('v.disabled', true);
 
         var Report_Date__c = component.get('v.data.Report_Date__c');
-        // alert('Report_Date__c'+Report_Date__c);
-        var Person_In_Charge2__c = '';
-        var Submit_date__c = '';
+            // alert('Report_Date__c'+Report_Date__c);
+        var Person_In_Charge2__c = "";
+        var Submit_date__c = "";
         if (component.get('v.mode') == 'edit') {
             // 鍛� Submit_date__c
-            Submit_date__c = component.get(
-                'v.select_report_data'
-            ).Submit_date__c;
+            Submit_date__c = component.get('v.select_report_data').Submit_date__c;
             // alert('Submit_date__c'+Submit_date__c);
 
+
             // 鎷呭綋 Person_In_Charge2__c
-            Person_In_Charge2__c = component.get(
-                'v.select_report_data'
-            ).Person_In_Charge2__c;
+            Person_In_Charge2__c = component.get('v.select_report_data').Person_In_Charge2__c;            
         } else {
             // 鍛� Submit_date__c
-            Submit_date__c = this.get_date_string(
-                component.find('select_date').get('v.value')
-            );
+            Submit_date__c = this.get_date_string(component.find('select_date').get('v.value'));
             // alert('Submit_date__c'+Submit_date__c);
 
             // 鎷呭綋 Person_In_Charge2__c
-            Person_In_Charge2__c = component
-                .find('select_agency_person')
-                .get('v.value');
+            Person_In_Charge2__c = component.find('select_agency_person').get('v.value');
         }
         // Agency_Report_Header__c
-        var Agency_Report_Header__c = component.get(
-            'v.agency_report_header_id'
-        );
-
+        var Agency_Report_Header__c = component.get('v.agency_report_header_id');
+        
         // 鍖婚櫌 Agency_Hospital__c (Agency_Hospital_Link__c)
         var Agency_Hospital__c = component.get('v.hospitalLinkId');
-
+        
         // 绉戝 Department_Cateogy__c
-        var Department_Cateogy__c = component
-            .find('select_department')
-            .get('v.value');
-
+        var Department_Cateogy__c = component.find('select_department').get('v.value');
+        
         // 鎷滆浜� doctor2__c
         var doctor2__c = component.find('select_doctor').get('v.value');
-
+        
         // 娲诲姩鍖哄垎 Purpose_Type__c
-        var Purpose_Type__c = component
-            .find('select_purpose_type')
-            .get('v.value');
-        //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
+        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');
         //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� end
@@ -1118,35 +852,19 @@
         var Opportunity__c = component.get('v.data.Opportunity__c');
 
         var StageName__c = component.find('select_stageName').get('v.value');
-        var Amount__c =
-            component.get('v.oppdata.Amount__c') != null
-                ? component.get('v.oppdata.Amount__c').toString()
-                : '';
-        var OCMSale_Price__c =
-            component.get('v.oppdata.OCMSale_Price__c') != null
-                ? component.get('v.oppdata.OCMSale_Price__c').toString()
-                : '';
-        var Close_Forecasted_Date__c = component.get(
-            'v.oppdata.Close_Forecasted_Date__c'
-        );
+        var Amount__c = component.get('v.oppdata.Amount__c') != null ? component.get('v.oppdata.Amount__c').toString() : '';
+        var OCMSale_Price__c = component.get('v.oppdata.OCMSale_Price__c') != null ? component.get('v.oppdata.OCMSale_Price__c').toString() : '';
+        var Close_Forecasted_Date__c = component.get('v.oppdata.Close_Forecasted_Date__c');
 
         var StageName__c_o = component.get('v.StageName__c_o');
         var Amount__c_o = component.get('v.Amount__c_o');
         var OCMSale_Price__c_o = component.get('v.OCMSale_Price__c_o');
-        var Close_Forecasted_Date__c_o = component.get(
-            'v.Close_Forecasted_Date__c_o'
-        );
+        var Close_Forecasted_Date__c_o = component.get('v.Close_Forecasted_Date__c_o');
         if (StageName__c_o == undefined) StageName__c_o = '';
         if (Amount__c_o == undefined) Amount__c_o = '';
         if (OCMSale_Price__c_o == undefined) OCMSale_Price__c_o = '';
-        if (Close_Forecasted_Date__c_o == undefined)
-            Close_Forecasted_Date__c_o = '';
-        if (
-            StageName__c == StageName__c_o &&
-            OCMSale_Price__c_o == OCMSale_Price__c &&
-            Amount__c == Amount__c_o &&
-            Close_Forecasted_Date__c == Close_Forecasted_Date__c_o
-        ) {
+        if (Close_Forecasted_Date__c_o == undefined) Close_Forecasted_Date__c_o = '';
+        if (StageName__c == StageName__c_o && OCMSale_Price__c_o == OCMSale_Price__c && Amount__c == Amount__c_o && Close_Forecasted_Date__c == Close_Forecasted_Date__c_o) {
             StageName__c = '';
             Amount__c = '';
             OCMSale_Price__c = '';
@@ -1154,71 +872,35 @@
         }
 
         // 浜у搧鍖哄垎 Product_Category__c (ProductTypes__c)
-        var Product_Category1__c = component
-            .find('select_Product1')
-            .get('v.value');
-        var Product_Category2__c = component
-            .find('select_Product2')
-            .get('v.value');
-        var Product_Category3__c = component
-            .find('select_Product3')
-            .get('v.value');
-
+        var Product_Category1__c = component.find('select_Product1').get('v.value');
+        var Product_Category2__c = component.find('select_Product2').get('v.value');
+        var Product_Category3__c = component.find('select_Product3').get('v.value');
+        
         // 绲愭灉 Result__c
         var Result__c = component.find('select_result').get('v.value');
-
+        
         // 銉愩儶銉囥兗銈枫儳銉�
         var error = [];
-        if (!Report_Date__c) {
-            error.push('娲诲姩鏃� 涓嶅瓨鍦�');
-        }
-        if (!Submit_date__c) {
-            error.push('鍛� 涓嶅瓨鍦�');
-        }
+        if (!Report_Date__c) { error.push("娲诲姩鏃� 涓嶅瓨鍦�"); }
+        if (!Submit_date__c) { error.push("鍛� 涓嶅瓨鍦�"); }
         var rDate = new Date(Report_Date__c);
         var sDate = new Date(Submit_date__c);
         sDate.setDate(sDate.getDate() - 1);
-        if (rDate < sDate) {
-            error.push('娲诲姩鏃ュ繀椤绘槸鏈懆锛�');
-        }
+        if (rDate < sDate) {error.push('娲诲姩鏃ュ繀椤绘槸鏈懆锛�'); }
         sDate.setDate(sDate.getDate() + 7);
-        if (rDate >= sDate) {
-            error.push('娲诲姩鏃ュ繀椤绘槸鏈懆锛�');
-        }
-
-        if (!Person_In_Charge2__c) {
-            error.push('鎷呭綋 涓嶅瓨鍦�');
-        }
-        if (!Agency_Report_Header__c) {
-            this.error('Report Header Id 涓嶅瓨鍦�');
-        }
-        if (!Agency_Hospital__c) {
-            error.push('鍖婚櫌 涓嶅瓨鍦�');
-        }
-        if (!Department_Cateogy__c) {
-            error.push('绉戝 涓嶅瓨鍦�');
-        }
-        if (!doctor2__c) {
-            error.push('鎷滆浜� 涓嶅瓨鍦�');
-        }
-        if (!Purpose_Type__c) {
-            error.push('娲诲姩鍖哄垎 涓嶅瓨鍦�');
-        }
+        if (rDate >= sDate) {error.push('娲诲姩鏃ュ繀椤绘槸鏈懆锛�'); }
+        
+        if (!Person_In_Charge2__c) { error.push("鎷呭綋 涓嶅瓨鍦�"); }
+        if (!Agency_Report_Header__c) { this.error("Report Header Id 涓嶅瓨鍦�"); }
+        if (!Agency_Hospital__c) { error.push("鍖婚櫌 涓嶅瓨鍦�"); }
+        if (!Department_Cateogy__c) { error.push("绉戝 涓嶅瓨鍦�"); }
+        if (!doctor2__c) { error.push("鎷滆浜� 涓嶅瓨鍦�"); }
+        if (!Purpose_Type__c) { error.push("娲诲姩鍖哄垎 涓嶅瓨鍦�"); }
         // if (!SupportNeeds__c) { error.push("鏀彺闇�姹� 涓嶅瓨鍦�"); }
-        if (!Opportunity__c) {
-            Opportunity__c = '';
-        }
-        if (!Product_Category1__c) {
-            error.push('浜у搧鍖哄垎1 涓嶅瓨鍦�');
-        }
-        if (
-            Purpose_Type__c &&
-            (Purpose_Type__c.substr(-3) == 'SIS' ||
-                Purpose_Type__c.substr(-3) == 'OPD')
-        ) {
-            if (!Result__c) {
-                error.push('缁撴灉 涓嶅瓨鍦�');
-            }
+        if (!Opportunity__c) { Opportunity__c = ""; }
+        if (!Product_Category1__c) { error.push("浜у搧鍖哄垎1 涓嶅瓨鍦�"); }
+        if (Purpose_Type__c && (Purpose_Type__c.substr(-3) == 'SIS' || Purpose_Type__c.substr(-3) == 'OPD')) {
+            if (!Result__c) { error.push("缁撴灉 涓嶅瓨鍦�"); }
         }
         for (var i = 0; i < error.length; i++) {
             this.warning(error[i]);
@@ -1228,74 +910,62 @@
             return false;
         }
 
+        
         // 淇濆瓨鍑︾悊
-        component.set('v.loginEdit', true);
-        if (component.get('v.mode') == 'edit') {
+        component.set('v.loginEdit',true);
+		if (component.get('v.mode') == 'edit') {
             var Agency_Report__c = component.get('v.select_report_data').Id;
             var action = component.get('c.editAgencyReport');
-            debugger;
+            debugger
             // alert("Purpose_Type:"+Purpose_Type__c+","+"SupportNeedsc:"+SupportNeeds__c);
             action.setParams({
-                Agency_Report_Id: Agency_Report__c,
-                Department_Cateogy: Department_Cateogy__c,
-                Purpose_Type: Purpose_Type__c,
-                //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
-                SupportNeedsc: SupportNeeds__c,
-                //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� end
-                Agency_Report_Header: Agency_Report_Header__c,
-                Agency_Hospital: Agency_Hospital__c,
-                Person_In_Charge2: Person_In_Charge2__c,
-                doctor: doctor2__c,
-                Submit_date: Submit_date__c,
-                Product_Category1: Product_Category1__c,
-                Product_Category2: Product_Category2__c,
-                Product_Category3: Product_Category3__c,
-                Result: Result__c,
-                Opportunity: Opportunity__c,
-                StageName: StageName__c,
-                oppAmount: Amount__c,
-                oppOCMPrice: OCMSale_Price__c,
-                Close_Forecasted_Date: Close_Forecasted_Date__c,
-                Report_Date: Report_Date__c
+                "Agency_Report_Id" : Agency_Report__c,
+                "Department_Cateogy" : Department_Cateogy__c,
+                "Purpose_Type" : Purpose_Type__c,
+                 //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
+                 "SupportNeedsc" : SupportNeeds__c,
+                 //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� end
+                "Agency_Report_Header" : Agency_Report_Header__c,
+                "Agency_Hospital" : Agency_Hospital__c,
+                "Person_In_Charge2" : Person_In_Charge2__c,
+                "doctor" : doctor2__c,
+                "Submit_date" : Submit_date__c,
+                "Product_Category1" : Product_Category1__c,
+                "Product_Category2" : Product_Category2__c,
+                "Product_Category3" : Product_Category3__c,
+                "Result" : Result__c,
+                "Opportunity" : Opportunity__c,
+                "StageName" : StageName__c,
+                "oppAmount" : Amount__c,
+                "oppOCMPrice" : OCMSale_Price__c,
+                "Close_Forecasted_Date" : Close_Forecasted_Date__c,
+                "Report_Date" : Report_Date__c,
             });
-
-            action.setCallback(this, function (response) {
+            
+            action.setCallback(this,function(response){
                 var state = response.getState();
-                if (state == 'SUCCESS') {
+                if(state == 'SUCCESS'){
                     this.success('缂栬緫淇濆瓨鎴愬姛');
                     var report_id = response.getReturnValue();
                     component.set('v.create_agency_report_id', report_id);
-
-                    var select_agency_list =
-                        component.get('v.allselectlist').AgencyPerson__c;
+                    
+                    var select_agency_list = component.get('v.allselectlist').AgencyPerson__c;
                     for (var i = 0; i < select_agency_list.length; i++) {
-                        if (
-                            select_agency_list[i].value ==
-                            component.get('v.select_report_data')
-                                .Person_In_Charge2__c
-                        ) {
+                        if (select_agency_list[i].value == component.get('v.select_report_data').Person_In_Charge2__c) {
                             select_agency_list[i].selected = true;
                         } else {
                             select_agency_list[i].selected = false;
                         }
                     }
-                    component
-                        .find('select_agency_person')
-                        .set('v.options', select_agency_list);
-
+                    component.find('select_agency_person').set('v.options', select_agency_list);
+                    
                     component.set('v.update_select_report_data_id', report_id);
-                    this.get_reports_edit(
-                        component,
-                        event,
-                        helper,
-                        component.get('v.select_report_data').Submit_date__c,
-                        component.get('v.select_report_data')
-                            .Person_In_Charge2__c
-                    );
+                    this.get_reports_edit(component, event, helper, component.get('v.select_report_data').Submit_date__c, component.get('v.select_report_data').Person_In_Charge2__c);
 
                     component.find('save_button').set('v.disabled', false);
-                    component.set('v.loginEdit', false);
-                } else {
+                    component.set('v.loginEdit',false);
+                }
+                else{
                     // var error = response.getError();
                     // alert(JSON.stringify(error));
                     // alert(JSON.stringify(error[0].fieldErrors));
@@ -1307,66 +977,60 @@
                     // }
                     this.error('save_report failed.');
                     component.find('save_button').set('v.disabled', false);
-                    component.set('v.loginEdit', false);
+                    component.set('v.loginEdit',false);
                 }
             });
             $A.enqueueAction(action);
         } else {
             /* Save (New & Copy) */
-
+            
             var action = component.get('c.saveAgencyReport');
             debugger;
             // alert(SupportNeeds__c);
             action.setParams({
-                Department_Cateogy: Department_Cateogy__c,
-                Purpose_Type: Purpose_Type__c,
+                "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,
-                Person_In_Charge2: Person_In_Charge2__c,
-                doctor: doctor2__c,
-                Submit_date: Submit_date__c,
-                Product_Category1: Product_Category1__c,
-                Product_Category2: Product_Category2__c,
-                Product_Category3: Product_Category3__c,
-                Result: Result__c,
-                Opportunity: Opportunity__c,
-                StageName: StageName__c,
-                oppAmount: Amount__c,
-                oppOCMPrice: OCMSale_Price__c,
-                Close_Forecasted_Date: Close_Forecasted_Date__c,
-                Report_Date: Report_Date__c
+                "Agency_Report_Header" : Agency_Report_Header__c,
+                "Agency_Hospital" : Agency_Hospital__c,
+                "Person_In_Charge2" : Person_In_Charge2__c,
+                "doctor" : doctor2__c,
+                "Submit_date" : Submit_date__c,
+                "Product_Category1" : Product_Category1__c,
+                "Product_Category2" : Product_Category2__c,
+                "Product_Category3" : Product_Category3__c,
+                "Result" : Result__c,
+                "Opportunity" : Opportunity__c,
+                "StageName" : StageName__c,
+                "oppAmount" : Amount__c,
+                "oppOCMPrice" : OCMSale_Price__c,
+                "Close_Forecasted_Date" : Close_Forecasted_Date__c,
+                "Report_Date" : Report_Date__c,
             });
 
-            action.setCallback(this, function (response) {
+            action.setCallback(this,function(response){
                 var state = response.getState();
-                if (state == 'SUCCESS') {
+                if(state == 'SUCCESS'){
                     this.success('淇濆瓨鎴愬姛');
                     var report_id = response.getReturnValue();
                     component.set('v.create_agency_report_id', report_id);
+                    
+                    this.get_reports_edit(component, event, helper, component.find('select_date').get('v.value'), component.find('select_agency_person').get('v.value'));
 
-                    this.get_reports_edit(
-                        component,
-                        event,
-                        helper,
-                        component.find('select_date').get('v.value'),
-                        component.find('select_agency_person').get('v.value')
-                    );
-
-                    // 銉€兗銉�銉偊銈c兂銉夈偊鍐呫伄涓�瑕х敤
+					// 銉€兗銉�銉偊銈c兂銉夈偊鍐呫伄涓�瑕х敤
                     var action2 = component.get('c.getReportsById');
                     action2.setParams({
-                        report_id: report_id
+                        "report_id" : report_id,
                     });
-                    action2.setCallback(this, function (response) {
+                    action2.setCallback(this,function(response){
                         var state = response.getState();
-                        if (state == 'SUCCESS') {
+                        if(state == 'SUCCESS'){
                             var res = response.getReturnValue();
                             var reports_now = component.get('v.reports_now');
                             var reports_now_count = 0;
-                            if (reports_now.length > 0 && reports_now != '') {
+                            if (reports_now.length > 0 && reports_now != "") {
                                 reports_now_count = reports_now.length;
                             }
 
@@ -1376,86 +1040,61 @@
                                 res[0].doctor2NameOrigin = doctor2Name;
                                 res[0].visitorTitleOrigin = visitortitle;
                                 // 20220222 PI鏀归��  by Bright--end
-                                reports_now[reports_now_count] = res[0];
-
-                                reports_now.sort(function (a, b) {
-                                    if (a.Name > b.Name) return -1;
-                                    if (a.Name < b.Name) return 1;
+	                            reports_now[reports_now_count] = res[0];
+                                
+                                reports_now.sort(function(a,b) {
+                                    if(a.Name>b.Name) return -1;
+                                    if(a.Name < b.Name) return 1;
                                     return 0;
                                 });
-
+                                
                                 component.set('v.reports_now', reports_now);
-                                component.set(
-                                    'v.reports_now_count',
-                                    reports_now.length
-                                );
-                                var data_list =
-                                    component.find('modal_data_list_tr');
+                                component.set('v.reports_now_count', reports_now.length);
+                                var data_list = component.find('modal_data_list_tr');
                             }
-                        } else {
+                        }
+                        else{
                             this.error('get_reports_now failed.');
-                            component
-                                .find('save_button')
-                                .set('v.disabled', false);
-                            component.set('v.loginEdit', false);
+                            component.find('save_button').set('v.disabled', false);
+                            component.set('v.loginEdit',false);
                         }
                     });
                     $A.enqueueAction(action2);
-
+                    
                     this.allclear(component);
                     component.find('save_button').set('v.disabled', false);
-                    component.set('v.loginEdit', false);
-                } else {
+                    component.set('v.loginEdit',false);
+                }
+                else{
                     var error = response.getError();
                     // alert(JSON.stringify(error));
                     this.error('saveAgencyReport failed.');
                     component.find('save_button').set('v.disabled', false);
-                    component.set('v.loginEdit', false);
+                    component.set('v.loginEdit',false);
                 }
             });
             $A.enqueueAction(action);
         }
     },
-
-    allclear: function (component) {
-        var clear = [{ label: '', value: '', selected: true }];
+    
+    allclear : function(component) {
+        var clear = [{label:'', value:'', selected:true}];
         component.set('v.hospital', '');
-        component.set('v.hospitalId', '');
+    	component.set('v.hospitalId', '');
         component.set('v.hospitalLinkId', '');
         component.find('new_con').set('v.disabled', true);
         component.find('select_doctor').set('v.options', clear);
         component.set('v.doctor_title', '');
-        component
-            .find('select_department')
-            .set(
-                'v.options',
-                this.conv_selected(
-                    component.get('v.allselectlist.Department_Cateogy__c')
-                )
-            );
-        component
-            .find('select_purpose_type')
-            .set(
-                'v.options',
-                this.conv_selected(
-                    component.get('v.allselectlist.Purpose_Type__c')
-                )
-            );
+        component.find('select_department').set('v.options', this.conv_selected(component.get('v.allselectlist.Department_Cateogy__c')));
+        component.find('select_purpose_type').set('v.options', this.conv_selected(component.get('v.allselectlist.Purpose_Type__c')));
         //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
-        component
-            .find('SupportNeeds__c')
-            .set(
-                'v.options',
-                this.conv_selected(
-                    component.get('v.allselectlist.SupportNeeds__c')
-                )
-            );
+        component.find('SupportNeeds__c').set('v.options', this.conv_selected(component.get('v.allselectlist.SupportNeeds__c')));
         //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� end
         // ToDo闇�瑕佹祴璇曟墜鏈轰笂鑳借繍琛屼笉
         component.set('v.data.Opportunity__c', '');
-        component.find('select_Product1').set('v.value', '');
-        component.find('select_Product2').set('v.value', '');
-        component.find('select_Product3').set('v.value', '');
+        component.find('select_Product1').set('v.value','');
+        component.find('select_Product2').set('v.value','');
+        component.find('select_Product3').set('v.value','');
         console.log('reportDate = 绌�');
         component.set('v.data.Report_Date__c', '');
         component.set('v.oppdata.Close_Forecasted_Date__c', '');
@@ -1467,28 +1106,16 @@
         component.set('v.Amount__c_o', '');
         component.set('v.OCMSale_Price__c_o', '');
         component.set('v.StageName__c_o', '');
-        $A.util.addClass(
-            component.find('input-opportunity-stage'),
-            'disp_none'
-        );
-        $A.util.addClass(
-            component.find('input-opportunity-amount1'),
-            'disp_none'
-        );
-        $A.util.addClass(
-            component.find('input-opportunity-amount2'),
-            'disp_none'
-        );
+        $A.util.addClass(component.find('input-opportunity-stage'), 'disp_none');
+        $A.util.addClass(component.find('input-opportunity-amount1'), 'disp_none');
+        $A.util.addClass(component.find('input-opportunity-amount2'), 'disp_none');
         $A.util.addClass(component.find('input-opportunity-date'), 'disp_none');
-        $A.util.removeClass(
-            component.find('input-opportunity-blank'),
-            'disp_none'
-        );
+        $A.util.removeClass(component.find('input-opportunity-blank'), 'disp_none');
         // if ($A.get("$Browser.formFactor") == 'DESKTOP') {
-        // var values = [];
-        // component.find('input-opportunity').get("v.body")[0].set('v.values', values);
+            // var values = [];
+            // component.find('input-opportunity').get("v.body")[0].set('v.values', values);
         // } else {
-        // component.find('input-opportunity').get("v.body")[0].set('v.selectedLabel', '');
+            // component.find('input-opportunity').get("v.body")[0].set('v.selectedLabel', '');            
         // }
         // component.find('input-opportunity').set("v.body",[]);
         // if (component.find('input-product-category1'))
@@ -1500,96 +1127,38 @@
         component.find('select_result').set('v.value', '');
         this.select_purpose_type(component);
     },
-
-    report_date_list: function (component, event, helper, count) {
+    
+    report_date_list : function(component, event, helper, count) {
         var ret_obj = [];
-        var now = new Date();
+		var now = new Date();
         for (var i = 0; i < count; i++) {
-            var start_day = new Date(
-                now.getFullYear(),
-                now.getMonth(),
-                now.getDate() - now.getDay() + 1 - i * 7
-            );
-            var end_day = new Date(
-                now.getFullYear(),
-                now.getMonth(),
-                now.getDate() + (7 - now.getDay()) - i * 7
-            );
 
-            var start_day_show = new Date(
-                now.getFullYear(),
-                now.getMonth(),
-                now.getDate() - now.getDay() - i * 7
-            );
-            var end_day_show = new Date(
-                now.getFullYear(),
-                now.getMonth(),
-                now.getDate() + (6 - now.getDay()) - i * 7
-            );
-            var date_text =
-                start_day.getFullYear() +
-                '/' +
-                (start_day.getMonth() + 1) +
-                '/' +
-                start_day.getDate() +
-                '~' +
-                end_day.getFullYear() +
-                '/' +
-                (end_day.getMonth() + 1) +
-                '/' +
-                end_day.getDate();
+            var start_day = new Date(now.getFullYear(), now.getMonth(), (now.getDate() - now.getDay() + 1 - (i * 7)));
+            var end_day = new Date(now.getFullYear(), now.getMonth(), now.getDate() + (7 - now.getDay()) - (i * 7));
+
+            var start_day_show = new Date(now.getFullYear(), now.getMonth(), (now.getDate() - now.getDay() - (i * 7)));
+            var end_day_show = new Date(now.getFullYear(), now.getMonth(), now.getDate() + (6 - now.getDay()) - (i * 7));
+            var date_text = start_day.getFullYear() + '/' + (start_day.getMonth() + 1) + '/' + start_day.getDate() + '~' + end_day.getFullYear() + '/' + (end_day.getMonth() + 1) + '/' + end_day.getDate();
             if (i == 0) {
                 ret_obj.push({
-                    selected: true,
-                    value:
-                        start_day.getFullYear() +
-                        '/' +
-                        (start_day.getMonth() + 1) +
-                        '/' +
-                        start_day.getDate(),
-                    label:
-                        start_day_show.getFullYear() +
-                        '/' +
-                        (start_day_show.getMonth() + 1) +
-                        '/' +
-                        start_day_show.getDate() +
-                        '~' +
-                        end_day_show.getFullYear() +
-                        '/' +
-                        (end_day_show.getMonth() + 1) +
-                        '/' +
-                        end_day_show.getDate()
+                    selected : true,
+                    value : start_day.getFullYear() + '/' + (start_day.getMonth() + 1) + '/' + start_day.getDate(),
+                    label : start_day_show.getFullYear() + '/' + (start_day_show.getMonth() + 1) + '/' + start_day_show.getDate() + '~' + end_day_show.getFullYear() + '/' + (end_day_show.getMonth() + 1) + '/' + end_day_show.getDate(),
                 });
             } else {
                 ret_obj.push({
-                    selected: false,
-                    value:
-                        start_day.getFullYear() +
-                        '/' +
-                        (start_day.getMonth() + 1) +
-                        '/' +
-                        start_day.getDate(),
-                    label:
-                        start_day_show.getFullYear() +
-                        '/' +
-                        (start_day_show.getMonth() + 1) +
-                        '/' +
-                        start_day_show.getDate() +
-                        '~' +
-                        end_day_show.getFullYear() +
-                        '/' +
-                        (end_day_show.getMonth() + 1) +
-                        '/' +
-                        end_day_show.getDate()
+                    selected : false,
+                    value : start_day.getFullYear() + '/' + (start_day.getMonth() + 1) + '/' + start_day.getDate(),
+                    label : start_day_show.getFullYear() + '/' + (start_day_show.getMonth() + 1) + '/' + start_day_show.getDate() + '~' + end_day_show.getFullYear() + '/' + (end_day_show.getMonth() + 1) + '/' + end_day_show.getDate(),
                 });
             }
         }
 
-        component.find('select_date').set('v.options', ret_obj);
+		component.find('select_date').set('v.options', ret_obj);
         component.set('v.report_date_list', ret_obj);
     },
-
-    create_report_header: function (component, name, s_agency, s_date) {
+    
+    create_report_header : function(component, name, s_agency, s_date) {
         s_date = this.get_date_string(s_date);
         if (s_date == false) {
             this.error('get_date_string failed.');
@@ -1602,38 +1171,39 @@
             this.error('create_header_input_key failed.');
             return false;
         }
-
+        
         var key2 = s_date.replace(/-/g, '');
         var action = component.get('c.createReportHeader');
 
         action.setParams({
-            name: name,
-            s_date: s_date,
-            s_agency: s_agency,
-            head_key: head_key
+            "name" : name,
+            "s_date" : s_date,
+            "s_agency" : s_agency,
+            "head_key" : head_key,
         });
-
-        component.set('v.login', true);
-        action.setCallback(this, function (response) {
+        
+        component.set('v.login',true);
+        action.setCallback(this,function(response){
             var state = response.getState();
-            if (state == 'SUCCESS') {
+            if(state == 'SUCCESS'){
                 var res = response.getReturnValue();
                 component.set('v.agency_report_header_id', res);
-                component.set('v.login', false);
+                component.set('v.login',false);
                 this.toggle_report(component);
-            } else {
+            }
+            else{
                 this.error('createReportHeader callback failed.');
-                component.set('v.login', false);
+                component.set('v.login',false);
             }
         });
         $A.enqueueAction(action);
     },
 
-    create_header_input_key: function (agency_id, s_date) {
-        if (typeof s_date != 'string') {
+    create_header_input_key : function(agency_id, s_date) {
+        if (typeof(s_date) != 'string') {
             s_date = this.get_date_string(s_date);
             if (s_date == false) {
-                this.error('get_date_string in create_header_input_key.');
+                this.error('get_date_string in create_header_input_key.')
                 return false;
             }
         }
@@ -1642,7 +1212,7 @@
         }
 
         s_date = s_date.replace(/-/g, '');
-        var headkey = agency_id + ':' + s_date;
+        var headkey = agency_id + ":" + s_date;
 
         return headkey;
     },
@@ -1650,14 +1220,14 @@
     /* typeof is not cool
      * @ret : String, Boolean, Date, Error, Array, Function, Null, Undefined, etc
      */
-    object_type: function (obj) {
+    object_type : function(obj) {
         var obj_type = Object.prototype.toString.call(obj).slice(8, -1);
         return obj_type;
     },
 
     // create yyyy-mm-dd string
-    get_date_string: function (val) {
-        if (typeof val == 'string') {
+    get_date_string : function(val) {
+        if (typeof(val) == 'string') {
             if (val.match(/^\d{4}\/\d{1,2}\/\d{1,2}$/)) {
                 val = val.replace(/[\/]/g, '-');
                 var tmp = val.split('-');
@@ -1678,39 +1248,39 @@
             if (String(mm).length == 1) {
                 mm = '0' + mm;
             }
-
+            
             var dd = '';
             if (String(val.getDate()).length == 1) {
                 dd = '0' + val.getDate();
             } else {
                 dd = val.getDate();
             }
-
+            
             val = val.getFullYear() + '-' + mm + '-' + dd;
         } else {
             return false;
         }
-
+        
         return val;
     },
-
-    searchHos: function (component, event, helper) {
-        var hospital_name = event.getParam('value');
-        var action = component.get('c.getHospitalList');
+    
+    searchHos : function(component, event, helper) {
+    	var hospital_name = event.getParam("value");
+    	var action = component.get("c.getHospitalList");
         debugger;
-        action.setParams({ hospital_name: hospital_name });
+    	action.setParams({"hospital_name": hospital_name});
 
-        action.setCallback(this, function (response) {
+    	action.setCallback(this, function(response) {
             var state = response.getState();
-            if (state === 'SUCCESS') {
-                var hospital_list = component.find('hospital_list');
-                var hosList = response.getReturnValue();
-                if (hosList.length > 0) {
-                    $A.util.addClass(hospital_list, 'slds-is-open');
-                } else {
-                    $A.util.removeClass(hospital_list, 'slds-is-open');
-                }
-                component.set('v.hospitalList', response.getReturnValue());
+            if(state === "SUCCESS") {
+            	var hospital_list = component.find('hospital_list');
+            	var hosList = response.getReturnValue();
+            	if (hosList.length > 0) {
+            		$A.util.addClass(hospital_list, 'slds-is-open');
+            	} else {
+            		$A.util.removeClass(hospital_list, 'slds-is-open');
+            	}
+                component.set("v.hospitalList", response.getReturnValue());
             } else {
                 $A.util.removeClass(hospital_list, 'slds-is-open');
             }
@@ -1718,17 +1288,17 @@
         $A.enqueueAction(action);
     },
 
-    hideSearch: function (component, event, helper) {
-        var hospital_list = component.find('hospital_list');
-        $A.util.removeClass(hospital_list, 'slds-is-open');
+    hideSearch : function(component, event, helper) {
+    	var hospital_list = component.find('hospital_list');
+    	$A.util.removeClass(hospital_list, 'slds-is-open');
     },
 
-    selectHos: function (component, event, helper) {
-        debugger;
-        var hospital_list = component.find('hospital_list');
-        $A.util.removeClass(hospital_list, 'slds-is-open');
-        var accname = event.currentTarget.dataset.accname;
-        var accid = event.currentTarget.dataset.accid;
+    selectHos : function(component, event, helper) {
+        debugger
+    	var hospital_list = component.find('hospital_list');
+    	$A.util.removeClass(hospital_list, 'slds-is-open');
+    	var accname = event.currentTarget.dataset.accname;
+    	var accid = event.currentTarget.dataset.accid;
         var hospital_data = component.get('v.hospitalList');
         for (var i = 0; i < hospital_data.length; i++) {
             if (hospital_data[i].Hospital__c == accid) {
@@ -1737,40 +1307,32 @@
                 component.find('new_con').set('v.disabled', false);
             }
         }
-        component.set('v.hospital', accname);
-        component.set('v.hospitalId', accid);
+        component.set("v.hospital", accname);
+    	component.set("v.hospitalId", accid);
         this.set_doctor_list(component);
         this.opportunityChange(component, event, helper);
     },
-
-    select_purpose_type: function (component) {
+    
+    select_purpose_type : function(component) {
         var purpose_type = component.find('select_purpose_type').get('v.value');
-        if (
-            (purpose_type != null &&
-                purpose_type != undefined &&
-                purpose_type.substr(-3) == 'OPD') ||
-            purpose_type.substr(-3) == 'SIS'
-        ) {
+        if (purpose_type != null && purpose_type != undefined && purpose_type.substr(-3) == 'OPD' || purpose_type.substr(-3) == 'SIS') {
             var result = component.find('result');
-            $A.util.removeClass(result, 'disp_none');
+        	$A.util.removeClass(result, 'disp_none');
         } else {
             component.find('select_result').set('v.value', '');
             var result = component.find('result');
-            $A.util.addClass(result, 'disp_none');
+        	$A.util.addClass(result, 'disp_none');
         }
         this.select_department(component, null, null);
     },
-
-    doctor_change: function (component, event, helper) {
+    
+    doctor_change : function(component, event, helper) {
         var doctor_value = component.find('select_doctor').get('v.value');
         var doctor_list = component.get('v.doctor_list');
         var flg = false;
         for (var i = 0; i < doctor_list.length; i++) {
             if (doctor_list[i].value == doctor_value) {
-                component.set(
-                    'v.doctor_title',
-                    doctor_list[i].Doctor_Division1__c
-                );
+                component.set('v.doctor_title', doctor_list[i].Doctor_Division1__c);
                 flg = true;
                 break;
             }
@@ -1780,36 +1342,30 @@
         }
     },
     // PIPL update Yin Mingjie 21/02/2022 start
-    set_aws_url: function (component, sobject) {
+    set_aws_url : function(component,sobject) {
         var action = component.get('c.getAwsurl');
         action.setParams({
-            sobj: sobject
+            "sobj" : sobject,
         });
-        action.setCallback(this, function (response) {
+        action.setCallback(this,function(response){
             var state = response.getState();
-            if (state == 'SUCCESS') {
+            if(state == 'SUCCESS'){
                 var awsmap = this.conv_selected(response.getReturnValue());
-                component.set('v.AWStoken', awsmap.token);
-                component.set('v.AWSinsert', awsmap.newUrl);
-                component.set('v.AWSsearch', awsmap.searchUrl);
-                component.set('v.AWStransactionURL', awsmap.transactionURL);
-            } else {
+                component.set('v.AWStoken',awsmap.token);
+                component.set('v.AWSinsert',awsmap.newUrl);
+                component.set('v.AWSsearch',awsmap.searchUrl);
+                component.set('v.AWStransactionURL',awsmap.transactionURL);
+            }
+            else{
                 this.error('AWS url/token error.');
-                component.set('v.loginEdit', false);
+                component.set('v.loginEdit',false);
             }
         });
         $A.enqueueAction(action);
     },
 
-    insert_agencycontact: function (
-        component,
-        token,
-        newUrl,
-        payload,
-        agencyHospitalid,
-        helper,
-        hospitalName
-    ) {
+    insert_agencycontact : function(component,token,newUrl,payload,agencyHospitalid,helper,hospitalName) {
+
         // AWSService.insert(newUrl,payload,function(result){
         //     if(result.status == '0'){
         //         $A.getCallback(function(){
@@ -1822,7 +1378,7 @@
         //         component.find('OppMessage').setError('AWS insert error.');
         //     }
         // },token);
-
+        
         fetch(newUrl, {
             method: 'POST',
             body: payload,
@@ -1830,63 +1386,49 @@
                 'Content-Type': 'application/json',
                 'pi-token': token
             }
-        })
-            .then((data) => {
-                return data.json();
-            })
-            .then((result) => {
-                if (result.status == '0') {
-                    $A.getCallback(function () {
-                        helper.to_agencycontact(
-                            component,
-                            result,
-                            agencyHospitalid
-                        );
-                    })();
-                } else {
-                    console.log('AWS status error:' + result);
-                    component.set('v.loginEdit', false);
-                    if (result.status == '129') {
-                        component
-                            .find('OppMessage')
-                            .setError(
-                                '璇ュ鎴蜂汉鍛樺悕瀛楀凡瀛樺湪锛屽湪' +
-                                    hospitalName +
-                                    '鍖婚櫌锛岃淇敼'
-                            );
-                    } else {
-                        component
-                            .find('OppMessage')
-                            .setError('AWS insert error.');
-                    }
+        }).then((data) => {
+            return data.json();
+        }).then((result) => {
+            if(result.status == '0'){
+                $A.getCallback(function(){
+                    helper.to_agencycontact(component,result,agencyHospitalid);
+                })();
+            }else{
+                console.log('AWS status error:' + result)
+                component.set('v.loginEdit',false);
+                if(result.status == '129'){
+                    component.find('OppMessage').setError('璇ュ鎴蜂汉鍛樺悕瀛楀凡瀛樺湪锛屽湪'+hospitalName+'鍖婚櫌锛岃淇敼');
+                }else{
+                    component.find('OppMessage').setError('AWS insert error.');
                 }
-            })
-            .catch((error) => {
-                console.log('AWS insert error:' + error);
-                component.set('v.loginEdit', false);
-                component.find('OppMessage').setError('AWS insert error.');
-            });
+            }
+        }).catch(error => {
+            console.log('AWS insert error:' + error)
+            component.set('v.loginEdit',false);
+            component.find('OppMessage').setError('AWS insert error.');
+        });
+        
     },
 
-    to_agencycontact: function (component, result, agencyHospitalid) {
+    to_agencycontact : function(component,result,agencyHospitalid) {
         var action = component.get('c.saveAgencyContact');
         action.setParams({
-            name: result.object[0].name,
+            "name" : result.object[0].name,
             //"nameEncrypt" : result.object[0].nameEncrypt,
-            type: result.object[0].type,
+            "type" : result.object[0].type,
             //"typeEncrypt" : result.object[0].typeEncrypt,
-            doctorDivision1: result.object[0].doctorDivision1,
+            "doctorDivision1" : result.object[0].doctorDivision1,
             //"doctorDivision1Encrypt" : result.object[0].doctorDivision1Encrypt,
-            agencyHospitalid: agencyHospitalid,
-            awsid: result.object[0].dataId
+            "agencyHospitalid" : agencyHospitalid,
+            "awsid" : result.object[0].dataId,
         });
-        action.setCallback(this, function (response) {
+        action.setCallback(this,function(response){
             var state = response.getState();
-            if (state == 'SUCCESS') {
+            if(state == 'SUCCESS'){
                 var acMap = this.conv_selected(response.getReturnValue());
                 console.log(acMap);
-                if (acMap.AgencyContactId != '') {
-                    //纭浜嬪姟
+                if(acMap.AgencyContactId != ''){
+                    //纭浜嬪姟 
                     var token = component.get('v.AWStoken');
                     var confirmUrl = component.get('v.AWStransactionURL');
 
@@ -1895,28 +1437,24 @@
                     data['sfRecordId'] = '';
                     data['txId'] = result.txId;
 
-                    this.to_confirm(
-                        component,
-                        token,
-                        confirmUrl,
-                        JSON.stringify(data)
-                    );
-                } else if (acMap.errormsg != '') {
+                    this.to_confirm(component,token,confirmUrl,JSON.stringify(data));
+                }else if(acMap.errormsg != ''){
                     this.error(acMap.errormsg);
-                    component.set('v.loginEdit', false);
-                } else {
+                    component.set('v.loginEdit',false);
+                }else {
                     this.error('agency contact insert id error.');
-                    component.set('v.loginEdit', false);
+                    component.set('v.loginEdit',false);
                 }
-            } else {
+            }
+            else{
                 this.error('agency contact insert error.');
-                component.set('v.loginEdit', false);
+                component.set('v.loginEdit',false);
             }
         });
         $A.enqueueAction(action);
     },
 
-    to_confirm: function (component, token, confirmUrl, payload) {
+    to_confirm : function(component,token,confirmUrl,payload) {
         fetch(confirmUrl, {
             method: 'POST',
             body: payload,
@@ -1924,47 +1462,40 @@
                 'Content-Type': 'application/json',
                 'pi-token': token
             }
-        })
-            .then((data) => {
-                return data.json();
-            })
-            .then((result) => {
-                if (
-                    result.status == '0' &&
-                    result.hasOwnProperty('success') &&
-                    result.success
-                ) {
-                    component.set('v.truthy', false);
-                    var modal_newAC = component.find('modal_newAC');
-                    $A.util.addClass(modal_newAC, 'disp_none');
-                    this.success('.瀹㈡埛浜哄憳宸插垱寤恒��');
-                    this.set_doctor_list(component);
-                } else {
-                    this.error('AWS confirm error.');
-                    component.set('v.loginEdit', false);
-                }
-            })
-            .catch((error) => {
+        }).then((data) => {
+            return data.json();
+        }).then((result) => {
+            if(result.status == '0' && result.hasOwnProperty('success') && result.success){
+                component.set('v.truthy', false);
+                var modal_newAC = component.find('modal_newAC')
+                $A.util.addClass(modal_newAC, 'disp_none');
+                this.success('.瀹㈡埛浜哄憳宸插垱寤恒��');
+                this.set_doctor_list(component);
+            }else {
                 this.error('AWS confirm error.');
-                component.set('v.loginEdit', false);
-            });
+                component.set('v.loginEdit',false);
+            }
+        }).catch(error => {
+            this.error('AWS confirm error.');
+            component.set('v.loginEdit',false);
+        });
     },
     // PIPL update Yin Mingjie 21/02/2022 end
 
-    set_doctor_list: function (component) {
+    set_doctor_list : function(component) {
         var hospital_id = component.get('v.hospitalLinkId');
         if (hospital_id) {
-            component.set('v.loginEdit', true);
+            component.set('v.loginEdit',true);
             var action = component.get('c.getDoctorList');
             action.setParams({
-                hospital_id: hospital_id
+                "hospital_id" : hospital_id,
             });
-            action.setCallback(this, function (response) {
+            action.setCallback(this,function(response){
                 var state = response.getState();
-                if (state == 'SUCCESS') {
+                if(state == 'SUCCESS'){
                     var retMap = this.conv_selected(response.getReturnValue());
                     // PIPL update Yin Mingjie 21/02/2022 start
-                    this.AWS_search(retMap, component);
+                    this.AWS_search(retMap,component);
                     /*
                     var default_doctor = component.get('v.default_select_doctor_id');
                     if (default_doctor != '' && res.length > 0) {
@@ -1991,10 +1522,11 @@
                     component.set('v.doctor_list', res);
                     component.set('v.login',false);
                     */
-                    // PIPL update Yin Mingjie 21/02/2022 end
-                } else {
+                   // PIPL update Yin Mingjie 21/02/2022 end
+                }
+                else{
                     this.error('set_doctor_list failed.');
-                    component.set('v.loginEdit', false);
+                    component.set('v.loginEdit',false);
                 }
             });
             $A.enqueueAction(action);
@@ -2002,49 +1534,35 @@
     },
 
     // PIPL update Yin Mingjie 21/02/2022 start
-    AWS_search: function (retMap, component) {
+    AWS_search : function(retMap,component) {
         var token = retMap.sre.token;
         var searchUrl = retMap.sre.searchUrl;
 
         var dataArr = new Array();
         for (const key in retMap) {
-            if (key == 'sre') {
-                continue;
-            }
+            if (key == 'sre') {continue;}
             dataArr.push(key);
         }
-        if (dataArr.length == 0) {
-            component.set('v.loginEdit', false);
+        if(dataArr.length == 0){
+            component.set('v.loginEdit',false);
             this.warning('娌℃湁鎵惧埌绗﹀悎鏉′欢鐨勫鎴蜂汉鍛�');
             return;
         }
-        let obj = Object.create(null);
+        let obj= Object.create(null);
         obj['dataIds'] = dataArr;
         var data = JSON.stringify(obj);
-        this.search_agency_contact(token, searchUrl, data, retMap, component);
+        this.search_agency_contact(token,searchUrl,data,retMap,component);
     },
 
-    search_agency_contact: function (
-        token,
-        searchUrl,
-        payload,
-        retMap,
-        component
-    ) {
-        this.search_core(
-            token,
-            searchUrl,
-            payload,
-            (result) => {
-                if (result.status == '0') {
-                    this.to_doctor_list(result, retMap, component);
-                } else {
-                    this.error('AWS search status4 : ' + result.status);
-                    component.set('v.loginEdit', false);
-                }
-            },
-            component
-        );
+    search_agency_contact : function(token,searchUrl,payload,retMap,component) {
+        this.search_core(token,searchUrl,payload,(result)=>{
+            if(result.status == '0'){
+                this.to_doctor_list(result,retMap,component);
+            }else{
+                this.error('AWS search status4 : ' + result.status);
+                component.set('v.loginEdit',false);
+            }
+        },component);
         // fetch(searchUrl, {
         //     method: 'POST',
         //     body: payload,
@@ -2055,13 +1573,13 @@
         // }).then((data) => {
         //     return data.json();
         // }).then((result) => {
-
+            
         // }).catch(error => {
         //     this.error('AWS search error.');
         //     component.set('v.login',false);
         // });
     },
-    search_core: function (token, searchUrl, payload, callback, component) {
+    search_core : function(token,searchUrl,payload,callback,component) {
         console.log('token = ' + token);
         console.log('searchUrl = ' + searchUrl);
         console.log('payload = ' + payload);
@@ -2072,22 +1590,19 @@
                 'Content-Type': 'application/json',
                 'pi-token': token
             }
-        })
-            .then((data) => {
-                return data.json();
-            })
-            .then((result) => {
-                component.set('v.loginEdit', false);
-                if (callback) callback(result);
-            })
-            .catch((error) => {
-                console.log('error = ' + JSON.stringify(error));
-                this.error('AWS search error.');
-                component.set('v.loginEdit', false);
-            });
+        }).then((data) => {
+            return data.json();
+        }).then((result) => {
+            component.set('v.loginEdit',false);
+            if(callback)callback(result);
+        }).catch(error => {
+            console.log('error = ' + JSON.stringify(error));
+            this.error('AWS search error.');
+            component.set('v.loginEdit',false);
+        });
     },
 
-    to_doctor_list: function (result, retMap, component) {
+    to_doctor_list : function(result,retMap,component) {
         var resls = result.object;
         var res = [];
         var space = {};
@@ -2125,10 +1640,10 @@
                 component.set('v.doctor_title', res[0].Doctor_Division1__c);
             }
         }
-
+        
         component.set('v.default_select_doctor_id', '');
         component.set('v.doctor_list', res);
-        component.set('v.loginEdit', false);
+        component.set('v.loginEdit',false);
     },
     // PIPL update Yin Mingjie 21/02/2022 end
 
@@ -2143,99 +1658,52 @@
     //     }
     //     options.splice(remove,1);
     // },
-
-    opportunityChange: function (component, event, helper) {
-        debugger;
+    
+    opportunityChange : function(component, event, helper) {
+        debugger
         var opp_id = component.get('v.data.Opportunity__c');
         if (opp_id == '') {
-            $A.util.addClass(
-                component.find('input-opportunity-stage'),
-                'disp_none'
-            );
-            $A.util.addClass(
-                component.find('input-opportunity-amount1'),
-                'disp_none'
-            );
-            $A.util.addClass(
-                component.find('input-opportunity-amount2'),
-                'disp_none'
-            );
-            $A.util.addClass(
-                component.find('input-opportunity-date'),
-                'disp_none'
-            );
-            $A.util.removeClass(
-                component.find('input-opportunity-blank'),
-                'disp_none'
-            );
+            $A.util.addClass(component.find('input-opportunity-stage'), 'disp_none');
+            $A.util.addClass(component.find('input-opportunity-amount1'), 'disp_none');
+            $A.util.addClass(component.find('input-opportunity-amount2'), 'disp_none');
+            $A.util.addClass(component.find('input-opportunity-date'), 'disp_none');
+            $A.util.removeClass(component.find('input-opportunity-blank'), 'disp_none');
         } else if (opp_id == 'MALFORMED_ID') {
             component.set('v.data.Opportunity__c', '');
-            $A.util.addClass(
-                component.find('input-opportunity-stage'),
-                'disp_none'
-            );
-            $A.util.addClass(
-                component.find('input-opportunity-amount1'),
-                'disp_none'
-            );
-            $A.util.addClass(
-                component.find('input-opportunity-amount2'),
-                'disp_none'
-            );
-            $A.util.addClass(
-                component.find('input-opportunity-date'),
-                'disp_none'
-            );
-            $A.util.removeClass(
-                component.find('input-opportunity-blank'),
-                'disp_none'
-            );
-        } else if (opp_id != '') {
+            $A.util.addClass(component.find('input-opportunity-stage'), 'disp_none');
+            $A.util.addClass(component.find('input-opportunity-amount1'), 'disp_none');
+            $A.util.addClass(component.find('input-opportunity-amount2'), 'disp_none');
+            $A.util.addClass(component.find('input-opportunity-date'), 'disp_none');
+            $A.util.removeClass(component.find('input-opportunity-blank'), 'disp_none');
+        } else if (opp_id != "") {
             var hospital_link_id = component.get('v.hospitalLinkId');
             if (hospital_link_id == '') {
                 this.warning('鍖婚櫌涓嶅瓨鍦�');
                 // ToDo闇�瑕佹祴璇曟墜鏈轰笂鑳借繍琛屼笉
                 component.set('v.data.Opportunity__c', '');
-                $A.util.addClass(
-                    component.find('input-opportunity-stage'),
-                    'disp_none'
-                );
-                $A.util.addClass(
-                    component.find('input-opportunity-amount1'),
-                    'disp_none'
-                );
-                $A.util.addClass(
-                    component.find('input-opportunity-amount2'),
-                    'disp_none'
-                );
-                $A.util.addClass(
-                    component.find('input-opportunity-date'),
-                    'disp_none'
-                );
-                $A.util.removeClass(
-                    component.find('input-opportunity-blank'),
-                    'disp_none'
-                );
+                $A.util.addClass(component.find('input-opportunity-stage'), 'disp_none');
+                $A.util.addClass(component.find('input-opportunity-amount1'), 'disp_none');
+                $A.util.addClass(component.find('input-opportunity-amount2'), 'disp_none');
+                $A.util.addClass(component.find('input-opportunity-date'), 'disp_none');
+                $A.util.removeClass(component.find('input-opportunity-blank'), 'disp_none');
                 // if ($A.get("$Browser.formFactor") == 'DESKTOP') {
                 //     var values = [];
                 //     // component.find('input-opportunity').get("v.body")[0].set('v.values', values);
                 // } else {
-                //     component.find('input-opportunity').get("v.body")[0].set('v.selectedLabel', '');
+                //     component.find('input-opportunity').get("v.body")[0].set('v.selectedLabel', '');            
                 // }
                 return false;
             }
-            var action = component.get(
-                'c.selectOpportunityByIdAndHospitalLinkId'
-            );
+            var action = component.get('c.selectOpportunityByIdAndHospitalLinkId');
             action.setParams({
-                opportunity_id: opp_id,
-                agency_hospital_link_id: component.get('v.hospitalLinkId')
+                "opportunity_id" : opp_id,
+                "agency_hospital_link_id" : component.get('v.hospitalLinkId'),
             });
 
-            component.set('v.loginEdit', true);
-            action.setCallback(this, function (response) {
+            component.set('v.loginEdit',true);
+            action.setCallback(this,function(response){
                 var state = response.getState();
-                if (state == 'SUCCESS') {
+                if(state == 'SUCCESS'){
                     var res = response.getReturnValue();
                     if (res.length <= 0) {
                         if (component.get('v.data.Opportunity__c')) {
@@ -2243,33 +1711,18 @@
                         }
                         // ToDo闇�瑕佹祴璇曟墜鏈轰笂鑳借繍琛屼笉
                         component.set('v.data.Opportunity__c', '');
-                        $A.util.addClass(
-                            component.find('input-opportunity-stage'),
-                            'disp_none'
-                        );
-                        $A.util.addClass(
-                            component.find('input-opportunity-amount1'),
-                            'disp_none'
-                        );
-                        $A.util.addClass(
-                            component.find('input-opportunity-amount2'),
-                            'disp_none'
-                        );
-                        $A.util.addClass(
-                            component.find('input-opportunity-date'),
-                            'disp_none'
-                        );
-                        $A.util.removeClass(
-                            component.find('input-opportunity-blank'),
-                            'disp_none'
-                        );
+                        $A.util.addClass(component.find('input-opportunity-stage'), 'disp_none');
+                        $A.util.addClass(component.find('input-opportunity-amount1'), 'disp_none');
+                        $A.util.addClass(component.find('input-opportunity-amount2'), 'disp_none');
+                        $A.util.addClass(component.find('input-opportunity-date'), 'disp_none');
+                        $A.util.removeClass(component.find('input-opportunity-blank'), 'disp_none');
                         // if ($A.get("$Browser.formFactor") == 'DESKTOP') {
                         //     var values = [];
                         //     component.find('input-opportunity').get("v.body")[0].set('v.values', values);
                         // } else {
-                        //     component.find('input-opportunity').get("v.body")[0].set('v.selectedLabel', '');
+                        //     component.find('input-opportunity').get("v.body")[0].set('v.selectedLabel', '');            
                         // }
-                        component.set('v.loginEdit', false);
+                        component.set('v.loginEdit',false);
                         return false;
                     }
                     //SWAG-CKH5M8  銆愬鎵樸�戝懆鎶ュ叧鑱旇浠凤紝鍙�夋嫨璇环鑼冨洿璋冩暣 fy start
@@ -2286,127 +1739,77 @@
                     //     //     var values = [];
                     //     //     component.find('input-opportunity').get("v.body")[0].set('v.values', values);
                     //     // } else {
-                    //     //     component.find('input-opportunity').get("v.body")[0].set('v.selectedLabel', '');
+                    //     //     component.find('input-opportunity').get("v.body")[0].set('v.selectedLabel', '');            
                     //     // }
                     //     component.set('v.login',false);
                     //     return false;
                     // }
                     //SWAG-CKH5M8  銆愬鎵樸�戝懆鎶ュ叧鑱旇浠凤紝鍙�夋嫨璇环鑼冨洿璋冩暣 fy end
-                    else {
+                     else {
                         component.set('v.loadOpp', false);
-                        component.set('v.oppdata', res[0]);
-                        this.set_selected(
-                            component,
-                            'select_stageName',
-                            res[0].StageName__c
-                        );
-                        component.set(
-                            'v.Close_Forecasted_Date__c_o',
-                            res[0].Close_Forecasted_Date__c
-                        );
+                        component.set('v.oppdata',res[0]);
+                        this.set_selected(component, 'select_stageName', res[0].StageName__c);
+                        component.set('v.Close_Forecasted_Date__c_o', res[0].Close_Forecasted_Date__c);
                         component.set('v.Amount__c_o', res[0].Amount__c);
-                        component.set(
-                            'v.OCMSale_Price__c_o',
-                            res[0].OCMSale_Price__c
-                        );
+                        component.set('v.OCMSale_Price__c_o', res[0].OCMSale_Price__c);
                         component.set('v.StageName__c_o', res[0].StageName__c);
 
-                        $A.util.removeClass(
-                            component.find('input-opportunity-stage'),
-                            'disp_none'
-                        );
-                        $A.util.removeClass(
-                            component.find('input-opportunity-amount1'),
-                            'disp_none'
-                        );
-                        $A.util.removeClass(
-                            component.find('input-opportunity-amount2'),
-                            'disp_none'
-                        );
-                        $A.util.removeClass(
-                            component.find('input-opportunity-date'),
-                            'disp_none'
-                        );
-                        $A.util.addClass(
-                            component.find('input-opportunity-blank'),
-                            'disp_none'
-                        );
+                        $A.util.removeClass(component.find('input-opportunity-stage'), 'disp_none');
+                        $A.util.removeClass(component.find('input-opportunity-amount1'), 'disp_none');
+                        $A.util.removeClass(component.find('input-opportunity-amount2'), 'disp_none');
+                        $A.util.removeClass(component.find('input-opportunity-date'), 'disp_none');
+                        $A.util.addClass(component.find('input-opportunity-blank'), 'disp_none');
                     }
-
-                    component.set('v.loginEdit', false);
-                } else {
-                    this.error(
-                        'selectOpportunityByIdAndHospitalLinkId failed.'
-                    );
-                    component.set('v.loginEdit', false);
+                    
+                    component.set('v.loginEdit',false);
+                }
+                else{
+                    this.error('selectOpportunityByIdAndHospitalLinkId failed.');
+                    component.set('v.loginEdit',false);
                 }
             });
             $A.enqueueAction(action);
         }
     },
-
-    productcategoryChange1: function (component, event, helper) {
-        var product_category_id = component
-            .find('select_Product1')
-            .get('v.value');
+    
+    productcategoryChange1 : function(component, event, helper) {
+        var product_category_id = component.find('select_Product1').get('v.value');
         var pcId1 = component.find('select_Product2').get('v.value');
         var pcId2 = component.find('select_Product3').get('v.value');
         var p1bool = pcId1 != '' && pcId1 != null && pcId1 != undefined;
         var p2bool = pcId2 != '' && pcId2 != null && pcId2 != undefined;
-        var p0bool =
-            product_category_id != '' &&
-            product_category_id != null &&
-            product_category_id != undefined;
-        if (
-            (p1bool && p0bool && product_category_id == pcId1) ||
-            (p2bool && p0bool && product_category_id == pcId2)
-        ) {
+        var p0bool = product_category_id != '' && product_category_id != null && product_category_id != undefined;
+        if ((p1bool && p0bool && product_category_id == pcId1) || (p2bool && p0bool && product_category_id == pcId2)) {
             this.warning('涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝佸尯鍒�');
-            component.find('select_Product1').set('v.value', '');
+            component.find('select_Product1').set('v.value','');
         }
     },
-    productcategoryChange2: function (component, event, helper) {
-        var product_category_id = component
-            .find('select_Product2')
-            .get('v.value');
+    productcategoryChange2 : function(component, event, helper) {
+        var product_category_id = component.find('select_Product2').get('v.value');
         var pcId1 = component.find('select_Product1').get('v.value');
         var pcId2 = component.find('select_Product3').get('v.value');
         var p1bool = pcId1 != '' && pcId1 != null && pcId1 != undefined;
         var p2bool = pcId2 != '' && pcId2 != null && pcId2 != undefined;
-        var p0bool =
-            product_category_id != '' &&
-            product_category_id != null &&
-            product_category_id != undefined;
-        if (
-            (p1bool && p0bool && product_category_id == pcId1) ||
-            (p2bool && p0bool && product_category_id == pcId2)
-        ) {
+        var p0bool = product_category_id != '' && product_category_id != null && product_category_id != undefined;
+        if ((p1bool && p0bool && product_category_id == pcId1) || (p2bool && p0bool && product_category_id == pcId2)) {
             this.warning('涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝佸尯鍒�');
-            component.find('select_Product2').set('v.value', '');
+            component.find('select_Product2').set('v.value','');
         }
     },
-    productcategoryChange3: function (component, event, helper) {
-        var product_category_id = component
-            .find('select_Product3')
-            .get('v.value');
+    productcategoryChange3 : function(component, event, helper) {
+        var product_category_id = component.find('select_Product3').get('v.value');
         var pcId1 = component.find('select_Product1').get('v.value');
         var pcId2 = component.find('select_Product2').get('v.value');
         var p1bool = pcId1 != '' && pcId1 != null && pcId1 != undefined;
         var p2bool = pcId2 != '' && pcId2 != null && pcId2 != undefined;
-        var p0bool =
-            product_category_id != '' &&
-            product_category_id != null &&
-            product_category_id != undefined;
-        if (
-            (p1bool && p0bool && product_category_id == pcId1) ||
-            (p2bool && p0bool && product_category_id == pcId2)
-        ) {
+        var p0bool = product_category_id != '' && product_category_id != null && product_category_id != undefined;
+        if ((p1bool && p0bool && product_category_id == pcId1) || (p2bool && p0bool && product_category_id == pcId2)) {
             this.warning('涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝佸尯鍒�');
-            component.find('select_Product3').set('v.value', '');
+            component.find('select_Product3').set('v.value','');
         }
     },
-
-    conv_selected: function (obj) {
+    
+    conv_selected : function(obj) {
         for (var i = 0; i < obj.length; i++) {
             if (obj[i].selected) {
                 if (obj[i].selected == 'true') {
@@ -2416,11 +1819,11 @@
                 }
             }
         }
-
+        
         return obj;
     },
-
-    set_selected: function (component, aura_id_name, value) {
+    
+    set_selected : function (component, aura_id_name, value) {
         var select_tmp = component.find(aura_id_name).get('v.options');
         if (select_tmp) {
             for (var i = 0; i < select_tmp.length; i++) {
@@ -2436,44 +1839,44 @@
             return false;
         }
     },
-
-    success: function (message) {
-        var toastEvent = $A.get('e.force:showToast');
+    
+    success : function(message) {
+        var toastEvent = $A.get("e.force:showToast");
         toastEvent.setParams({
-            title: '鎴愬姛!',
-            message: message,
-            type: 'success',
-            duration: '5000'
+            "title" : "鎴愬姛!",
+            "message" : message,
+            "type" : "success",
+            "duration" : "5000"
         });
         toastEvent.fire();
     },
-
-    warning: function (message) {
-        var toastEvent = $A.get('e.force:showToast');
+    
+    warning : function(message) {
+        var toastEvent = $A.get("e.force:showToast");
         toastEvent.setParams({
-            title: '璀﹀憡!',
-            message: message,
-            type: 'warning',
-            duration: '10000'
+            "title": "璀﹀憡!",
+            "message": message,
+            "type":"warning",
+            "duration" : "10000"
         });
         toastEvent.fire();
     },
-
-    error: function (message) {
+    
+    error : function(message) {
         // $('toastMessage.forceToastManager').css('white-space', 'pre-wrap');
-        var toastEvent = $A.get('e.force:showToast');
+        var toastEvent = $A.get("e.force:showToast");
 
         toastEvent.setParams({
-            title: '閿欒!',
-            message: message,
-            type: 'error',
-            duration: 'sticky'
+            "title": "閿欒!",
+            "message": message,
+            "type":"error",
+            "duration" : "sticky"
         });
         toastEvent.fire();
     },
-
-    createCon: function (component, event, helper) {
-        var modal_newAC = component.find('modal_newAC');
+    
+    createCon : function(component, event, helper) {
+        var modal_newAC = component.find('modal_newAC')
         $A.util.removeClass(modal_newAC, 'disp_none');
         component.set('v.truthy', true);
         // var modal_newAC = component.find('modal_newAC')
@@ -2486,7 +1889,7 @@
     //     var fields = component.find("newOpportunityField");
     //     var vaildationFailReason = '';
     //     var currentDate = new Date().toJSON().slice(0,10);
-
+ 
     //     fields.forEach(function (field) {
     //         if(field.get("v.fieldName") === 'Type__c' && $A.util.isEmpty(field.get("v.value"))){
     //             showValidationError = true;
@@ -2496,66 +1899,63 @@
     //             vaildationFailReason = "鍖荤敓鍖哄垎(鑱屽姟)涓嶈兘涓虹┖锛�";
     //         }
     //     });
-
+         
     //     if (showValidationError) {
     //         component.find('OppMessage').setError(vaildationFailReason);
     //     }
     // },
     // vivek end 娣诲姞楠岃瘉
 
-    hideCmp: function (component, event, helper) {
-        var div1 = component.find('report');
-        var div2 = component.find('report_list');
+    hideCmp : function(component, event, helper) {
+        var div1 = component.find('report')
+        var div2 = component.find('report_list')
         $A.util.addClass(div1, 'disp_none');
         $A.util.addClass(div2, 'disp_none');
     },
-
-    handleSuccess: function (component, event, helper) {
+            
+    handleSuccess : function(component, event, helper) {
         var insertId = event.getParams().response.Id;
         var displayValue = event.getParams().response.fields.Name.value;
         event.setParams({});
         component.set('v.truthy', false);
-        var modal_newAC = component.find('modal_newAC');
+        var modal_newAC = component.find('modal_newAC')
         $A.util.addClass(modal_newAC, 'disp_none');
         this.success('.瀹㈡埛浜哄憳宸插垱寤恒��');
         this.set_doctor_list(component);
     },
-
-    createCancel: function (component, event, helper) {
+    
+    createCancel : function(component, event, helper) {
         component.set('v.truthy', false);
-        var modal_newAC = component.find('modal_newAC');
+        var modal_newAC = component.find('modal_newAC')
         $A.util.addClass(modal_newAC, 'disp_none');
     },
-    setOpportunity_cfilter: function (component) {
-        debugger;
+    setOpportunity_cfilter : function(component) {
+        debugger
         var hosId = component.get('v.hospitalId');
-        var Department_Cateogy__c = component
-            .find('select_department')
-            .get('v.value');
+        var Department_Cateogy__c = component.find('select_department').get('v.value');
         var opportunity_cfilter = '';
         if (hosId != '' && hosId != null) {
-            opportunity_cfilter =
-                ' Agency_Hospital__r.Hospital__c=' + "'" + hosId + "'";
+            opportunity_cfilter = ' Agency_Hospital__r.Hospital__c=' + '\'' + hosId + '\'';
         }
         if (Department_Cateogy__c != '' && Department_Cateogy__c != null) {
             if (opportunity_cfilter != '' && opportunity_cfilter != null) {
                 opportunity_cfilter += ' AND ';
             }
-            opportunity_cfilter +=
-                'Department_Cateogy__c=' + "'" + Department_Cateogy__c + "'";
+            opportunity_cfilter += 'Department_Cateogy__c=' + '\'' + Department_Cateogy__c + '\'';
         }
         component.set('v.opportunity_cfilter', opportunity_cfilter);
         component.set('v.data.Opportunity__c', null);
     },
-    readFile: function (component, helper, file) {
+    readFile: function(component, helper, file) {
         if (!file) return;
         // console.log('file'+file.name);
-        if (!file.name.match(/\.(csv||CSV)$/)) {
+        if(!file.name.match(/\.(csv||CSV)$/)){
             return alert('only support csv files');
-        } else {
+        }else{
+            
             reader = new FileReader();
-            reader.onerror = function errorHandler(evt) {
-                switch (evt.target.error.code) {
+            reader.onerror =function errorHandler(evt) {
+                switch(evt.target.error.code) {
                     case evt.target.error.NOT_FOUND_ERR:
                         alert('File Not Found!');
                         break;
@@ -2566,176 +1966,141 @@
                         break; // noop
                     default:
                         alert('An error occurred reading this file.');
-                }
-            };
+                };
+            }
             //reader.onprogress = updateProgress;
-            reader.onabort = function (e) {
+            reader.onabort = function(e) {
                 alert('File read cancelled');
             };
-            reader.onloadstart = function (e) {
-                var output =
-                    '<ui type="disc"><li><strong>' +
-                    file.name +
-                    '</strong> (' +
-                    file.type +
-                    ')- ' +
-                    file.size +
-                    'bytes, last modified: ' +
-                    file.lastModifiedDate.toLocaleDateString() +
-                    '</li></ui>';
-                component.set('v.filename', file.name);
-                component.set('v.TargetFileName', output);
+            reader.onloadstart = function(e) { 
+                
+                var output = '<ui type=\"disc\"><li><strong>'+file.name +'</strong> ('+file.type+')- '+file.size+'bytes, last modified: '+file.lastModifiedDate.toLocaleDateString()+'</li></ui>';
+                component.set("v.filename",file.name);
+                component.set("v.TargetFileName",output);
+               
             };
-            reader.onload = function (e) {
-                var data = e.target.result;
-                component.set('v.fileContentData', data);
-                console.log('file data' + JSON.stringify(data));
+            reader.onload = function(e) {
+                var data=e.target.result;
+                component.set("v.fileContentData",data);
+                console.log("file data"+JSON.stringify(data));
                 // console.log("file data"+encodeURI(JSON.stringify(data),"utf-8"));
                 var allTextLines = data.split(/\r\n|\n/);
-                var dataRows = allTextLines.length - 1;
+                var dataRows=allTextLines.length-1;
                 var headers = allTextLines[0].split(',');
-
+                
                 // console.log("Rows length::"+dataRows);
-
-                var numOfRows = component.get('v.NumOfRecords');
-                if (
-                    dataRows > numOfRows + 1 ||
-                    dataRows == 1 ||
-                    dataRows == 0
-                ) {
-                    alert('File Rows between 1 to ' + numOfRows + ' .');
-                    component.set('v.showMain', true);
-                } else {
+               
+              
+                    var numOfRows=component.get("v.NumOfRecords");
+                    if(dataRows > numOfRows+1 || dataRows == 1 || dataRows== 0){
+                   
+                     alert("File Rows between 1 to "+numOfRows+" .");
+                    component.set("v.showMain",true);
+                    
+                } 
+                else{
                     var lines = [];
                     var filecontentdata;
-                    var content =
-                        '<table class="table slds-table slds-table--bordered slds-table--cell-buffer">';
-                    content += '<thead><tr class="slds-text-title--caps">';
-                    content += '<th scope="col">' + '琛屽彿' + '</th>';
-                    for (i = 0; i < headers.length; i++) {
-                        content += '<th scope="col">' + headers[i] + '</th>';
+                    var content = "<table class=\"table slds-table slds-table--bordered slds-table--cell-buffer\">";
+                    content += "<thead><tr class=\"slds-text-title--caps\">";
+                    content += '<th scope=\"col"\>'+'琛屽彿'+'</th>';
+                    for(i=0;i<headers.length; i++){
+                        content += '<th scope=\"col"\>'+headers[i]+'</th>';
                     }
-                    content += '</tr></thead>';
-                    for (var i = 1; i < allTextLines.length; i++) {
+                    content += "</tr></thead>";
+                    for (var i=1; i<allTextLines.length; i++) {
                         filecontentdata = allTextLines[i].split(',');
-                        if (filecontentdata[0] != '') {
-                            content += '<tr>';
-                            content += '<td>' + i + '</td>';
-                            for (var j = 0; j < filecontentdata.length; j++) {
-                                content +=
-                                    '<td>' + filecontentdata[j] + '</td>';
+                        if(filecontentdata[0]!=''){
+                            content +="<tr>";
+                            content +="<td>"+i+"</td>";
+                            for(var j=0;j<filecontentdata.length;j++){
+                                content +='<td>'+filecontentdata[j]+'</td>';
                             }
-                            content += '</tr>';
+                            content +="</tr>";
                         }
                     }
-                    content += '</table>';
+                    content += "</table>";
                     console.log(content);
-                    component.set('v.TableContent', content);
-                    component.set('v.showMain', false);
+                    component.set("v.TableContent",content);
+                    component.set("v.showMain",false);                   
                 }
-            };
-            reader.readAsText(file, 'gb2312');
+            }
+            reader.readAsText(file,'gb2312');
+            
         }
         var reader = new FileReader();
-        reader.onloadend = function () {};
+        reader.onloadend = function() {
+         
+        };
         reader.readAsDataURL(file);
     },
-
-    saveRecords: function (component, event, helper) {
-        debugger;
-        component.set('v.loginEdit', true);
+    
+    saveRecords : function(component,event,helper){
+        debugger
+        component.set('v.loginEdit',true);
         //fy 瀵煎叆 20220424 start
-        var action1 = component.get('c.processDataAWSId');
-        action1.setParams({
-            fileData: component.get('v.fileContentData')
-        });
-        debugger;
-        action1.setCallback(this, function (response) {
-            console.log('response = ' + JSON.stringify(response));
+        var action1 = component.get("c.processDataAWSId");
+        action1.setParams({ 
+            fileData : component.get("v.fileContentData"),
+        }); 
+        debugger
+        action1.setCallback(this, function(response) {
+            console.log('response = '  + JSON.stringify(response));
             var state = response.getState();
-            if (state === 'SUCCESS') {
+            if (state === "SUCCESS") {
                 var ress = response.getReturnValue();
-                console.log('ress = ' + JSON.stringify(ress));
-                if (ress) {
-                    var valur = ress.split('error1');
-                    if (valur.length <= 1) {
+                console.log('ress = '  + JSON.stringify(ress));
+                if(ress){
+                    var valur =ress.split('error1');
+                    if(valur.length<=1){
                         var res = JSON.parse(response.getReturnValue());
-                        console.log('res = ' + JSON.stringify(res));
+                        console.log('res = '  + JSON.stringify(res));
                         var dataArr = new Array();
                         var dataMap = new Map();
-                        res.forEach((item) => {
-                            if (item.AWS_Data_Id__c) {
+                        res.forEach(item => {
+                            if(item.AWS_Data_Id__c){
                                 dataArr.push(item.AWS_Data_Id__c);
                                 //dataMap.set(item.AWS_Data_Id__c,item.Name_Encrypted__c);
-                                dataMap.set(
-                                    item.AWS_Data_Id__c,
-                                    item.AWS_Data_Id__c
-                                ); //zhj 鏂版柟妗堟敼閫� 2022-12-21
+                                dataMap.set(item.AWS_Data_Id__c,item.AWS_Data_Id__c);       //zhj 鏂版柟妗堟敼閫� 2022-12-21
                             }
                         });
-                        let obj = Object.create(null);
+                        let obj= Object.create(null);
                         obj['dataIds'] = dataArr;
                         var payload = JSON.stringify(obj);
                         console.log('payload zhj = ' + JSON.stringify(payload));
-
-                        this.search_contact_url(
-                            component,
-                            'Agency_Contact__c',
-                            (result) => {
-                                var token = result.token;
-                                var searchUrl = result.searchUrl;
-                                this.search_core(
-                                    token,
-                                    searchUrl,
-                                    payload,
-                                    (result) => {
-                                        if (result.status == '0') {
-                                            if (
-                                                result.object != null &&
-                                                result.object.length != 0
-                                            ) {
-                                                // var resultjson = JSON.stringify(result.object);
-                                                // if(resultjson){
-                                                //     debugger
-                                                //     console.warn('001');
-                                                //     component.set('v.login',true);
-                                                //     this.ImportMethod(component,resultjson);
-                                                // }
-                                                component.set(
-                                                    'v.loginEdit',
-                                                    true
-                                                );
-                                                this.saveRecordsEditFile(
-                                                    component,
-                                                    dataMap,
-                                                    result.object,
-                                                    helper
-                                                );
-                                            } else {
-                                                this.error('AWS 鏌ヨ鏁版嵁涓虹┖ ');
-                                                component.set(
-                                                    'v.loginEdit',
-                                                    false
-                                                );
-                                            }
-                                        } else {
-                                            this.error(
-                                                'AWS search status6 : ' +
-                                                    result.status
-                                            );
-                                            component.set('v.loginEdit', false);
-                                        }
-                                    },
-                                    component
-                                );
-                                //     var resultjson =null;
-                                // this.ImportMethod(component,resultjson);
-                            }
-                        );
+                        
+                        this.search_contact_url(component, 'Agency_Contact__c', (result)=>{
+                            var token = result.token;
+                            var searchUrl = result.searchUrl;
+                            this.search_core(token,searchUrl,payload,(result)=>{
+                                if(result.status == '0'){
+                                    if(result.object != null&&result.object.length != 0){
+                                        // var resultjson = JSON.stringify(result.object);
+                                        // if(resultjson){
+                                        //     debugger
+                                        //     console.warn('001');
+                                        //     component.set('v.login',true);
+                                        //     this.ImportMethod(component,resultjson);
+                                        // }
+                                        component.set('v.loginEdit',true);
+                                        this.saveRecordsEditFile(component,dataMap,result.object,helper);
+                                    }else{
+                                        this.error('AWS 鏌ヨ鏁版嵁涓虹┖ ' );
+                                        component.set('v.loginEdit',false);
+                                    }
+                                }else{
+                                    this.error('AWS search status6 : ' + result.status);
+                                    component.set('v.loginEdit',false);
+                                }
+                            },component);
+                        //     var resultjson =null;
+                        // this.ImportMethod(component,resultjson);
+                            
+                        });
                         // var resultjson =null;
                         // this.ImportMethod(component,resultjson);
-                    } else {
-                        this.error(valur[1] + '\n' + '璇蜂慨鏀瑰悗閲嶆柊涓婁紶');
+                    }else{
+                        this.error(valur[1]+'\n'+"璇蜂慨鏀瑰悗閲嶆柊涓婁紶");
                     }
                 }
             }
@@ -2744,18 +2109,18 @@
         //fy 瀵煎叆 20220424 end
         // var action = component.get("c.processData");
         // var selectDate = component.find('select_date').get('v.value');
-        // var fieldsList=['Name','Phone','AccountNumber']; //Please write your code dynamic
+        // var fieldsList=['Name','Phone','AccountNumber']; //Please write your code dynamic 
         // var sss=component.get("v.fileContentData");
-        // action.setParams({
+        // action.setParams({ 
         //     fileData : component.get("v.fileContentData"),
         //     //selectDateselectDate :component.find('select_date').get('v.value'),
         //     sobjectName:'Account', //Any object
         //     fields:fieldsList
-        // });
+        // });        
         // action.setCallback(this, function(response) {
         //     var state = response.getState();
         //     if (state === "SUCCESS") {
-
+                
         //         var res = response.getReturnValue();
         //         var res1 = '';
         //         console.log("[[[[[["+res);
@@ -2776,7 +2141,7 @@
         //             // alert('saved successfully');
         //             component.set('v.login',false);
         //         }
-
+                
         //     }
         //     else if (state === "INCOMPLETE") {
         //         // do something
@@ -2786,7 +2151,7 @@
         //         var errors = response.getError();
         //         if (errors) {
         //             if (errors[0] && errors[0].message) {
-        //                 console.log("Error message: " +
+        //                 console.log("Error message: " + 
         //                          errors[0].message);
         //                 component.set('v.login',false);
         //             }
@@ -2797,199 +2162,154 @@
         //     }
         // });
         // $A.enqueueAction(action);
-    },
-    isNumber: function (str) {
+
+    },isNumber: function(str) {
         return /^\d+$/.test(str);
-    },
-    ImportMethod: function (component, fileStr) {
-        debugger;
-        var actionss = component.get('c.processData');
-        var selectDate = component.find('select_date').get('v.value');
-        var fieldsList = ['Name', 'Phone', 'AccountNumber']; //Please write your code dynamic
-        var sss = component.get('v.fileContentData');
-        actionss.setParams({
+    },ImportMethod : function(component,fileStr){
+        debugger
+        var actionss = component.get("c.processData");
+         var selectDate = component.find('select_date').get('v.value');
+        var fieldsList=['Name','Phone','AccountNumber']; //Please write your code dynamic 
+        var sss=component.get("v.fileContentData");
+        actionss.setParams({ 
             // fileData : component.get("v.fileContentData"),
-            fileData: fileStr,
+            fileData : fileStr,
             // selectDateselectDate :component.find('select_date').get('v.value'),
-            sobjectName: 'Account', //Any object
-            fields: fieldsList
+            sobjectName:'Account', //Any object
+            fields:fieldsList
             // Agency_ContactListjson:resultjson
-        });
-        actionss.setCallback(this, function (response) {
-            console.log('002');
-            var state = response.getState();
-            if (state === 'SUCCESS') {
-                var res = response.getReturnValue();
-                var res1 = '';
-                console.log('[[[[[[' + res);
-                if (res != 'success') {
-                    var ress = res.split('=');
-                    console.log(ress);
-                    let errorDatas = [];
-                    let errorDataRow = [];
-                    debugger;
-                    var fileContentData = component
-                        .get('v.fileContentData')
-                        .split('\n');
-                    for (var i = 0; i < ress.length; i++) {
-                        res1 += ress[i].substr(7) + '\n';
-                        if (ress[i] != '') {
-                            let errorData = {};
-                            if (
-                                !this.isNumber(
-                                    ress[i].substr(7).substring(1, 2)
-                                )
-                            ) {
-                                continue;
-                            }
-                            let index = errorDataRow.indexOf(
-                                ress[i].substr(7).substring(1, 2)
-                            );
-                            if (index == -1) {
-                                errorData.errorRow = ress[i]
-                                    .substr(7)
-                                    .substring(1, 2);
-                                errorDataRow.push(errorData.errorRow);
-                                errorData.errorInfo = ress[i]
-                                    .substr(7)
-                                    .substring(5)
-                                    .replace('=', '');
-                                if (errorData.errorInfo == '鎷滆浜轰笉瀛樺湪') {
-                                    console.log(
-                                        'errorData.errorRow = ' +
-                                            errorData.errorRow
-                                    );
-                                    errorData.errorInfo =
-                                        '鎷滆浜� ' +
-                                        fileContentData[
-                                            errorData.errorRow
-                                        ].split(',')[4] +
-                                        '涓嶅瓨鍦�';
+        }); 
+        actionss.setCallback(this, function(response) {
+                console.log('002');
+                var state = response.getState();
+                if (state === "SUCCESS") {
+                    var res = response.getReturnValue();
+                    var res1 = '';
+                    console.log("[[[[[["+res);
+                    if(res != 'success'){
+                        var ress = res.split('=');
+                        console.log(ress);
+                        let errorDatas = [];
+                        let errorDataRow = [];
+                        debugger
+                        var fileContentData = component.get("v.fileContentData").split('\n');
+                        for (var i=0; i<ress.length; i++) {
+                            res1 += ress[i].substr(7)+'\n';
+                            if (ress[i] != '') {
+                                let errorData = {}
+                                if(!this.isNumber(ress[i].substr(7).substring(1, 2))){
+                                    continue
                                 }
-                                errorDatas.push(errorData);
-                            } else {
-                                if (
-                                    ress[i].substr(7).substring(5) ==
-                                    '鎷滆浜轰笉瀛樺湪'
-                                ) {
-                                    errorDatas[index].errorInfo +=
-                                        '; ' +
-                                        '鎷滆浜� ' +
-                                        fileContentData[
-                                            errorDatas[index].errorRow
-                                        ].split(',')[4] +
-                                        '涓嶅瓨鍦�';
+                                let index = errorDataRow.indexOf(ress[i].substr(7).substring(1, 2));
+                                if (index == -1) {
+                                    errorData.errorRow = ress[i].substr(7).substring(1, 2);
+                                    errorDataRow.push(errorData.errorRow);
+                                    errorData.errorInfo = ress[i].substr(7).substring(5).replace('=','');
+                                    if(errorData.errorInfo == '鎷滆浜轰笉瀛樺湪'){
+                                        console.log('errorData.errorRow = ' + errorData.errorRow)
+                                        errorData.errorInfo ='鎷滆浜� ' + fileContentData[errorData.errorRow].split(',')[4] + '涓嶅瓨鍦�';
+                                    }
+                                    errorDatas.push(errorData);
                                 } else {
-                                    errorDatas[index].errorInfo +=
-                                        '; ' + ress[i].substr(7).substring(5);
+                                    if(ress[i].substr(7).substring(5) == '鎷滆浜轰笉瀛樺湪'){
+                                        errorDatas[index].errorInfo += '; ' + '鎷滆浜� ' + fileContentData[errorDatas[index].errorRow].split(',')[4] + '涓嶅瓨鍦�';
+                                    }else{
+                                        errorDatas[index].errorInfo += '; ' + ress[i].substr(7).substring(5);
+                                    }
                                 }
                             }
                         }
-                    }
-                    let errorColumns = [
-                        {
-                            label: '閿欒琛�',
-                            fieldName: 'errorRow',
-                            type: 'text',
-                            hideDefaultActions: true,
-                            initialWidth: 100
-                        },
-                        {
-                            label: '閿欒淇℃伅',
-                            fieldName: 'errorInfo',
-                            type: 'text',
-                            hideDefaultActions: true,
-                            initialWidth: 300,
-                            wrapText: true
+                        let errorColumns = [
+                            { label: '閿欒琛�', fieldName: 'errorRow', type: 'text', hideDefaultActions: true, initialWidth: 100 },
+                            { label: '閿欒淇℃伅', fieldName: 'errorInfo', type: 'text', hideDefaultActions: true, initialWidth: 300, wrapText: true }
+                        ];
+                        for (var i = 0; i < fileContentData[0].split(',').length; i++) {
+                            errorColumns.push({
+                                label: fileContentData[0].split(',')[i], 
+                                fieldName: 'field' + i, 
+                                type: 'text', 
+                                hideDefaultActions: true, 
+                                wrapText: true,
+                                initialWidth: 120
+                            });
                         }
-                    ];
-                    for (
-                        var i = 0;
-                        i < fileContentData[0].split(',').length;
-                        i++
-                    ) {
-                        errorColumns.push({
-                            label: fileContentData[0].split(',')[i],
-                            fieldName: 'field' + i,
-                            type: 'text',
-                            hideDefaultActions: true,
-                            wrapText: true,
-                            initialWidth: 120
-                        });
-                    }
 
-                    for (var i = 0; i < errorDatas.length; i++) {
-                        let data = fileContentData[errorDatas[i].errorRow];
-                        console.log('data = ' + JSON.stringify(data));
-                        if (data) {
-                            for (var j = 0; j < data.split(',').length; j++) {
-                                let label = 'field' + j;
-                                errorDatas[i][label] = data.split(',')[j];
+                        for (var i = 0; i < errorDatas.length; i++) {
+                            let data = fileContentData[errorDatas[i].errorRow];
+                            console.log('data = ' + JSON.stringify(data));
+                            if(data){
+                                for (var j = 0; j < data.split(',').length; j++) {
+                                    let label = 'field' + j;
+                                    errorDatas[i][label] = data.split(',')[j];
+                                }
                             }
                         }
+                        component.set('v.errorColumns', errorColumns);
+                        component.set('v.errorData', errorDatas);
+                        component.set("v.showErrorInfo", true);
+                        console.log("=="+res1);
+                        this.error(res1+"璇蜂慨鏀瑰悗閲嶆柊涓婁紶");
+                        component.set('v.loginEdit',false);
+                    }else{
+                        component.set("v.showMain",true);
+                        this.success("瀵煎叆鎴愬姛");
+                        // alert('saved successfully');
+                        component.set('v.loginEdit',false);
                     }
-                    component.set('v.errorColumns', errorColumns);
-                    component.set('v.errorData', errorDatas);
-                    component.set('v.showErrorInfo', true);
-                    console.log('==' + res1);
-                    this.error(res1 + '璇蜂慨鏀瑰悗閲嶆柊涓婁紶');
-                    component.set('v.loginEdit', false);
-                } else {
-                    component.set('v.showMain', true);
-                    this.success('瀵煎叆鎴愬姛');
-                    // alert('saved successfully');
-                    component.set('v.loginEdit', false);
+                    
                 }
-            } else if (state === 'INCOMPLETE') {
-                // do something
-                component.set('v.loginEdit', false);
-            } else if (state === 'ERROR') {
-                var errors = response.getError();
-                if (errors) {
-                    if (errors[0] && errors[0].message) {
-                        console.log('Error message: ' + errors[0].message);
-                        component.set('v.loginEdit', false);
+                else if (state === "INCOMPLETE") {
+                    // do something
+                    component.set('v.loginEdit',false);
+                }
+                else if (state === "ERROR") {
+                    var errors = response.getError();
+                    if (errors) {
+                        if (errors[0] && errors[0].message) {
+                            console.log("Error message: " + 
+                                    errors[0].message);
+                            component.set('v.loginEdit',false);
+                        }
+                    } else {
+                        console.log("Unknown error");
+                        component.set('v.loginEdit',false);
                     }
-                } else {
-                    console.log('Unknown error');
-                    component.set('v.loginEdit', false);
                 }
-            }
-        });
+        });    
         $A.enqueueAction(actionss);
-    },
-    saveRecordsEditFile: function (component, dataMap, searchData, helper) {
+    },saveRecordsEditFile : function(component,dataMap,searchData,helper){
         var searchDataMap = new Map();
-        for (var i = 0; i < searchData.length; i++) {
-            var sd = searchData[i];
-            if (sd.name) searchDataMap.set(sd.name.replace(' ', ''), sd.dataId);
-        }
-        console.log('searchDataMap=' + searchDataMap);
-        var error = '';
-        var fileData = component.get('v.fileContentData');
-        var files = fileData.split('\n');
+         for (var i = 0; i < searchData.length; i++) {
+         var sd = searchData[i];
+         if(sd.name)
+         searchDataMap.set(sd.name.replace(' ',''),sd.dataId);
+         }
+         console.log('searchDataMap='+searchDataMap);
+         var error = '';
+         var fileData = component.get("v.fileContentData");
+         var files = fileData.split('\n');
 
-        var fileStr = files[0];
-        fileStr += '\n';
+         var fileStr = files[0];
+         fileStr += '\n';
 
-        for (var i = 1; i < files.length - 1; i++) {
-            var filelist = files[i].split(',');
-            var fileName = filelist[4];
+       for (var i = 1; i < files.length-1; i++) {
+         var filelist = files[i].split(',');
+         var fileName = filelist[4];
 
-            if (searchDataMap.get(fileName.replace(' ', ''))) {
-                var nameDataId = searchDataMap.get(fileName.replace(' ', ''));
+         if (searchDataMap.get(fileName.replace(' ',''))) {
+                 var nameDataId = searchDataMap.get(fileName.replace(' ',''));
                 if (dataMap.get(nameDataId)) {
-                    filelist[4] = dataMap.get(nameDataId); //zhj 鏂版柟妗堟敼閫� filelist[4]涓嶅啀瀛樼殑nameEncrpt 2022-12-21
-                } else {
-                    error += 'error1 绗�' + i + '琛屾暟鎹嫓璁夸汉SF涓嶅瓨鍦�';
-                    error += '=';
+                     filelist[4] = dataMap.get(nameDataId);     //zhj 鏂版柟妗堟敼閫� filelist[4]涓嶅啀瀛樼殑nameEncrpt 2022-12-21
+                }else {
+                     error += 'error1 绗�'+i+'琛屾暟鎹嫓璁夸汉SF涓嶅瓨鍦�';
+                     error += '=';
                 }
-            } else {
-                error += 'error1 绗�' + i + '琛屾暟鎹嫓璁夸汉AWS涓嶅瓨鍦�';
-                error += '=';
+            }else {
+                 error += 'error1 绗�'+i+'琛屾暟鎹嫓璁夸汉AWS涓嶅瓨鍦�';
+                 error += '=';
             }
             fileStr += filelist.toString();
-            fileStr += '\n';
+             fileStr += '\n';
         }
 
         if (error != '') {
@@ -2997,86 +2317,44 @@
             let errorArray = error.split('error1');
             let errorDatas = [];
             let errorDataRow = [];
-            debugger;
-            var fileContentData = component
-                .get('v.fileContentData')
-                .split('\n');
-            console.log('errorArray = ' + JSON.stringify(errorArray));
+            debugger
+            var fileContentData = component.get("v.fileContentData").split('\n');
+            console.log('errorArray = ' + JSON.stringify(errorArray))
             for (var i in errorArray) {
                 if (errorArray[i] != '') {
-                    let errorData = {};
-                    if (!this.isNumber(errorArray[i].trim().substring(1, 2))) {
-                        continue;
+                    let errorData = {}
+                    if(!this.isNumber(errorArray[i].trim().substring(1, 2))){
+                        continue
                     }
-                    let index = errorDataRow.indexOf(
-                        errorArray[i].trim().substring(1, 2)
-                    );
+                    let index = errorDataRow.indexOf(errorArray[i].trim().substring(1, 2));
                     if (index == -1) {
-                        errorData.errorRow = errorArray[i]
-                            .trim()
-                            .substring(1, 2);
+                        errorData.errorRow = errorArray[i].trim().substring(1, 2);
                         errorDataRow.push(errorData.errorRow);
-                        errorData.errorInfo = errorArray[i]
-                            .trim()
-                            .substring(5, errorArray[i].trim().length)
-                            .replace('=', '');
-                        if (errorData.errorInfo == '鎷滆浜篈WS涓嶅瓨鍦�') {
-                            errorData.errorInfo =
-                                '鎷滆浜� ' +
-                                fileContentData[errorData.errorRow].split(
-                                    ','
-                                )[4] +
-                                '涓嶅瓨鍦�';
+                        errorData.errorInfo = errorArray[i].trim().substring(5,errorArray[i].trim().length).replace('=','');
+                        if(errorData.errorInfo == '鎷滆浜篈WS涓嶅瓨鍦�'){
+                            errorData.errorInfo ='鎷滆浜� ' + fileContentData[errorData.errorRow].split(',')[4] + '涓嶅瓨鍦�';
                         }
                         errorDatas.push(errorData);
                     } else {
-                        if (
-                            errorArray[i].trim().substring(5) ==
-                            '鎷滆浜篈WS涓嶅瓨鍦�'
-                        ) {
-                            errorData[index].errorInfo =
-                                '; ' +
-                                '鎷滆浜� ' +
-                                fileContentData[
-                                    errorDatas[index].errorRow
-                                ].split(',')[4] +
-                                '涓嶅瓨鍦�';
-                        } else {
-                            errorDatas[index].errorInfo +=
-                                '; ' +
-                                errorArray[i]
-                                    .trim()
-                                    .substring(5, errorArray[i].trim().length);
+                        if(errorArray[i].trim().substring(5) == '鎷滆浜篈WS涓嶅瓨鍦�'){
+                            errorData[index].errorInfo = '; ' + '鎷滆浜� ' + fileContentData[errorDatas[index].errorRow].split(',')[4] + '涓嶅瓨鍦�';
+                        }else{
+                            errorDatas[index].errorInfo += '; ' + errorArray[i].trim().substring(5,errorArray[i].trim().length);
                         }
                     }
                 }
             }
-            var fileContentData = component
-                .get('v.fileContentData')
-                .split('\n');
+            var fileContentData = component.get("v.fileContentData").split('\n');
             let errorColumns = [
-                {
-                    label: '閿欒琛�',
-                    fieldName: 'errorRow',
-                    type: 'text',
-                    hideDefaultActions: true,
-                    initialWidth: 100
-                },
-                {
-                    label: '閿欒淇℃伅',
-                    fieldName: 'errorInfo',
-                    type: 'text',
-                    hideDefaultActions: true,
-                    initialWidth: 300,
-                    wrapText: true
-                }
+                { label: '閿欒琛�', fieldName: 'errorRow', type: 'text', hideDefaultActions: true, initialWidth: 100 },
+                { label: '閿欒淇℃伅', fieldName: 'errorInfo', type: 'text', hideDefaultActions: true, initialWidth: 300, wrapText: true }
             ];
             for (var i = 0; i < fileContentData[0].split(',').length; i++) {
                 errorColumns.push({
-                    label: fileContentData[0].split(',')[i],
-                    fieldName: 'field' + i,
-                    type: 'text',
-                    hideDefaultActions: true,
+                    label: fileContentData[0].split(',')[i], 
+                    fieldName: 'field' + i, 
+                    type: 'text', 
+                    hideDefaultActions: true, 
                     wrapText: true,
                     initialWidth: 120
                 });
@@ -3090,355 +2368,248 @@
                     errorDatas[i][label] = data.split(',')[j];
                 }
             }
-            console.log('errorDatas =' + JSON.stringify(errorDatas));
+            console.log('errorDatas =' + JSON.stringify(errorDatas))
             component.set('v.errorColumns', errorColumns);
             component.set('v.errorData', errorDatas);
-            component.set('v.showErrorInfo', true);
+            component.set("v.showErrorInfo", true);
+
+
 
             console.log('error = ' + error);
             component.set('v.errorMessage', error);
 
             this.error(error);
-            console.log('error=' + error);
-            component.set('v.loginEdit', false);
+            console.log('error='+error);
+            component.set('v.loginEdit',false);
             return;
-        }
+         }
 
-        console.log('fileStr=' + fileStr);
-        $A.getCallback(function () {
-            debugger;
-            helper.ImportMethod(component, fileStr);
-        })();
-    },
-    convertArrayOfObjectsToCSV: function (component, objectRecords) {
-        var csvStringResult, counter, keys, columnDivider, lineDivider, thkeys;
+         console.log('fileStr='+fileStr);
+         $A.getCallback(function(){
+             debugger
+             helper.ImportMethod(component,fileStr);
+         })();
+
+     },
+    convertArrayOfObjectsToCSV : function(component,objectRecords){
+        var csvStringResult, counter, keys, columnDivider, lineDivider,thkeys;
         if (objectRecords == null || !objectRecords.length) {
             return null;
-        }
+         }
         columnDivider = ',';
-        lineDivider = '\n';
+        lineDivider =  '\n';
         //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',
-            'SupportNeeds__c'
-        ];
-        thkeys = [
-            '鍛�',
-            '鎷呭綋',
-            '娲诲姩鏃�',
-            '鍖婚櫌',
-            '绉戝',
-            '鎷滆浜�',
-            '鑱屼綅',
-            '浜у搧鍖哄垎1',
-            '浜у搧鍖哄垎2',
-            '浜у搧鍖哄垎3',
-            '娲诲姩鍖哄垎',
-            '缁撴灉',
-            '鏀彺闇�姹�'
-        ];
+        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','娲诲姩鍖哄垎','缁撴灉','鏀彺闇�姹�']
         csvStringResult = '';
         csvStringResult += thkeys.join(columnDivider);
         csvStringResult += lineDivider;
-        console.log('杩涘叆瀵煎嚭helper');
-        for (var i = 0; i < objectRecords.length; i++) {
+        console.log("杩涘叆瀵煎嚭helper");
+        for(var i=0; i < objectRecords.length; i++){   
             counter = 0;
-            for (var sTempkey in keys) {
+            for(var sTempkey in keys) {
                 var skey = keys[sTempkey];
-                if (counter > 0) {
-                    csvStringResult += columnDivider;
+                if(counter > 0){ 
+                    csvStringResult += columnDivider; 
                 }
-                if (typeof objectRecords[i][skey] === 'undefined') {
-                    csvStringResult += '"' + '' + '"';
+                if(typeof objectRecords[i][skey] === "undefined"){
+                    csvStringResult += '"'+''+'"';
                     continue;
+                }   
+                if(skey == 'Person_In_Charge2__c'){
+                    csvStringResult += '"'+ objectRecords[i].Person_In_Charge2__r.Name+'"';
+                }else if(skey == 'Agency_Hospital__c'){
+                    csvStringResult += '"'+ objectRecords[i].Agency_Hospital__r.Name+'"';
+                }else if(skey == 'doctor2__c'){
+                    csvStringResult += '"'+ objectRecords[i].doctor2__r.Name+'"';
+                }else if(skey == 'Product_Category1__c'){
+                    csvStringResult += '"'+ objectRecords[i].Product_Category1__r.Name+'"';
+                }else if(skey == 'Product_Category2__c'){
+                    csvStringResult += '"'+ objectRecords[i].Product_Category2__r.Name+'"';
+                }else if(skey == 'Product_Category3__c'){
+                    csvStringResult += '"'+ objectRecords[i].Product_Category3__r.Name+'"';
                 }
-                if (skey == 'Person_In_Charge2__c') {
-                    csvStringResult +=
-                        '"' + objectRecords[i].Person_In_Charge2__r.Name + '"';
-                } else if (skey == 'Agency_Hospital__c') {
-                    csvStringResult +=
-                        '"' + objectRecords[i].Agency_Hospital__r.Name + '"';
-                } else if (skey == 'doctor2__c') {
-                    csvStringResult +=
-                        '"' + objectRecords[i].doctor2__r.Name + '"';
-                } else if (skey == 'Product_Category1__c') {
-                    csvStringResult +=
-                        '"' + objectRecords[i].Product_Category1__r.Name + '"';
-                } else if (skey == 'Product_Category2__c') {
-                    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 {
-                    csvStringResult += '"' + objectRecords[i][skey] + '"';
+                else if(skey == 'SupportNeeds__c'){//SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
+                    csvStringResult += '"'+ objectRecords[i].SupportNeeds__c+'"';
+                }
+                else{
+                    csvStringResult += '"'+ objectRecords[i][skey]+'"';
                 }
                 counter++;
-            } // inner for loop close
-            console.log('瀵煎嚭寰幆缁撴潫');
+             
+            } // inner for loop close    
+            console.log("瀵煎嚭寰幆缁撴潫");
             csvStringResult += lineDivider;
-        } // outer main for loop close
-
-        // return the CSV formate String
-        return csvStringResult;
+        }// outer main for loop close 
+       
+       // return the CSV formate String 
+        return csvStringResult;        
     },
-    showExportDate: function (component, objectRecords) {
-        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',
-            'SupportNeeds__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++) {
-            content += '<th scope="col">' + headers[i] + '</th>';
+    showExportDate : function(component,objectRecords){
+        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','SupportNeeds__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++){
+            content += '<th scope=\"col"\>'+headers[i]+'</th>';
         }
-        content += '</tr></thead>';
-        for (var i = 0; i < objectRecords.length; i++) {
-            console.log('for' + content);
+        content += "</tr></thead>";
+        for(var i=0; i < objectRecords.length; i++){
+            console.log('for'+content);
             content += '<tr>';
             // content += '<td>'+(i+1)+'</td>';
-            for (var sTempkey in keys) {
-                console.log('for1' + sTempkey);
+            for(var sTempkey in keys) {
+                console.log('for1'+sTempkey);
                 var skey = keys[sTempkey];
-                if (typeof objectRecords[i][skey] === 'undefined') {
-                    content += '<td>' + '' + '</td>';
+                if(typeof objectRecords[i][skey] === "undefined"){
+                    content += '<td>'+''+'</td>';
                     continue;
                 }
-                console.log(
-                    'for2' + objectRecords[i].Person_In_Charge2__r.Name
-                );
-                if (skey == 'Person_In_Charge2__c') {
-                    content +=
-                        '<td>' +
-                        objectRecords[i].Person_In_Charge2__r.Name +
-                        '</td>';
-                } else if (skey == 'Agency_Hospital__c') {
-                    content +=
-                        '<td>' +
-                        objectRecords[i].Agency_Hospital__r.Name +
-                        '</td>';
-                } else if (skey == 'doctor2__c') {
-                    content +=
-                        '<td>' + objectRecords[i].doctor2__r.Name + '</td>';
-                } else if (skey == 'Product_Category1__c') {
-                    content +=
-                        '<td>' +
-                        objectRecords[i].Product_Category1__r.Name +
-                        '</td>';
-                } else if (skey == 'Product_Category2__c') {
-                    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 {
-                    content += '<td>' + objectRecords[i][skey] + '</td>';
+                console.log('for2'+objectRecords[i].Person_In_Charge2__r.Name);
+                if(skey == 'Person_In_Charge2__c'){
+                    content += '<td>'+ objectRecords[i].Person_In_Charge2__r.Name+'</td>';
+                }else if(skey == 'Agency_Hospital__c'){
+                    content += '<td>'+ objectRecords[i].Agency_Hospital__r.Name+'</td>';
+                }else if(skey == 'doctor2__c'){
+                    content += '<td>'+ objectRecords[i].doctor2__r.Name+'</td>';
+                }else if(skey == 'Product_Category1__c'){
+                    content += '<td>'+ objectRecords[i].Product_Category1__r.Name+'</td>';
+                }else if(skey == 'Product_Category2__c'){
+                    content += '<td>'+ objectRecords[i].Product_Category2__r.Name+'</td>';
+                }else if(skey == 'Product_Category3__c'){
+                    content += '<td>'+ objectRecords[i].Product_Category3__r.Name+'</td>';
                 }
-            } // inner for loop close
-            content += '</tr>';
-        } // outer main for loop close
+                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     
+            content += '</tr>'
+        }// outer main for loop close 
         content += '</table>';
-        console.log('helper寰幆缁撴潫' + content);
-        component.set('v.TableContent2', content);
-        component.set('v.showMain', false);
+        console.log("helper寰幆缁撴潫"+content);
+        component.set("v.TableContent2",content);
+        component.set("v.showMain",false);
     },
 
-    select_repores_date: function (component, event, helper) {
-        component.set('v.loginEdit', true);
+    select_repores_date : function(component,event,helper){
+        component.set('v.loginEdit',true);
         var reportsdate1 = component.find('input-report-date1').get('v.value');
         var reportsdate2 = component.find('input-report-date2').get('v.value');
-        console.log(
-            '杈撳叆鐨勫紑濮嬫棩鏈�' + reportsdate1 + '杈撳叆鐨勭粨鏉熸棩鏈�' + reportsdate2
-        );
-        var action = component.get('c.getReportsByDate');
+        console.log('杈撳叆鐨勫紑濮嬫棩鏈�'+reportsdate1+'杈撳叆鐨勭粨鏉熸棩鏈�'+reportsdate2);
+        var action = component.get("c.getReportsByDate");
         console.log('杈撳叆鐨勫紑濮嬫棩鏈�1');
-        action.setParams({
-            date1: reportsdate1,
+        action.setParams({ 
+            date1 : reportsdate1,
             date2: reportsdate2
         });
         console.log('杈撳叆鐨勫紑濮嬫棩鏈�2');
-        action.setCallback(this, function (response) {
+        action.setCallback(this, function(response) {
             var state = response.getState();
-            if (state === 'SUCCESS') {
+            if (state === "SUCCESS") {
+                
                 var res = response.getReturnValue();
-                console.log('杈撳叆鐨勫紑濮嬫棩鏈�3' + res);
-                component.set('v.loginEdit', false);
+                console.log('杈撳叆鐨勫紑濮嬫棩鏈�3'+res);
+                component.set('v.loginEdit',false);
 
                 // PI 鏀归�� By Bright 20220328
-                if (true) {
+                if(true){
                     let awsids = [];
                     for (let ri in res) {
-                        if (
-                            res[ri] &&
-                            res[ri].doctor2__r &&
-                            res[ri].doctor2__r.AWS_Data_Id__c
-                        ) {
+                        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) {
+                    }                    
+                    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;
-                                        }
+                        
+                        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];
                                     }
                                 }
-                                helper.showExportDate(component, res);
-
-                                component.set('v.loginEdit', false);
-                            },
-                            awsurl.token
-                        );
-                    } else {
+                                
+                                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.loginEdit', false);
+                        }, awsurl.token);
+                    }else{
                         helper.showExportDate(component, res);
                     }
                 }
+                
 
                 component.set('v.reports_date', res);
-            } else {
+                
+            }else{
                 alert('瀵煎嚭澶辫触,璇锋鏌ユ椿鍔ㄦ棩');
-                component.set('v.loginEdit', false);
+                component.set('v.loginEdit',false);
             }
         });
         $A.enqueueAction(action);
+
     },
 
-    showImport: function (component) {
+    showImport : function(component){
         // console.log('杩涘叆');
         // component.find('file').click();
         var modalimport = component.find('modal_import');
         var modalimportbg = component.find('modal_importbg');
         $A.util.removeClass(modalimport, 'disp_none');
-        $A.util.removeClass(modalimportbg, 'disp_none');
+        $A.util.removeClass(modalimportbg,'disp_none');
     },
 
-    showExport: function (component) {
+    showExport : function(component) {
         var modalimport = component.find('modal_export');
         var modalimportbg = component.find('modal_exportbg');
         $A.util.removeClass(modalimport, 'disp_none');
-        $A.util.removeClass(modalimportbg, 'disp_none');
+        $A.util.removeClass(modalimportbg,'disp_none');
     },
 
-    close_import: function (component) {
+    close_import : function(component){
         var modalimport = component.find('modal_import');
         var modalimportbg = component.find('modal_importbg');
         $A.util.addClass(modalimport, 'disp_none');
-        $A.util.addClass(modalimportbg, 'disp_none');
+        $A.util.addClass(modalimportbg,'disp_none');
     },
 
-    close_export: function (component) {
+    close_export : function(component){
         var modalimport = component.find('modal_export');
         var modalimportbg = component.find('modal_exportbg');
         $A.util.addClass(modalimport, 'disp_none');
-        $A.util.addClass(modalimportbg, 'disp_none');
+        $A.util.addClass(modalimportbg,'disp_none');
     },
 
     //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 start
-    CallBackAction: function (component, action_name, para, callback) {
-        var action = component.get(
-            'c.' + action_name.trimStart().replace('c.', '')
-        );
-        if (para) {
+    CallBackAction  : function(component,action_name,para,callback) {
+		var action = component.get("c." + action_name.trimStart().replace("c.",""));
+        if(para){
             action.setParams(para);
         }
-        if (callback) {
-            action.setCallback(this, function (data) {
+        if(callback){
+            action.setCallback(this,function(data){
                 callback(data);
             });
         }
-
+        
         $A.enqueueAction(action);
-    },
+	},
     //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 end
 
     //zhj 瀵煎嚭閿欒淇℃伅 2023-05-16 start
@@ -3448,7 +2619,7 @@
 
         var datas = [];
         let errorColumnsArray = [];
-        for (var i in errorColumns) {
+        for(var i in errorColumns){
             errorColumnsArray.push(errorColumns[i].label);
         }
         datas.push(errorColumnsArray);
@@ -3456,22 +2627,22 @@
 
         for (var i in errorData) {
             let data = [];
-            data.push(errorData[i].errorRow);
-            data.push(errorData[i].errorInfo);
-            for (var j = 0; j < Object.keys(errorData[i]).length - 2; j++) {
-                data.push(errorData[i]['field' + j]);
+            data.push(errorData[i].errorRow)
+            data.push(errorData[i].errorInfo)
+            for(var j = 0 ; j < Object.keys(errorData[i]).length - 2 ; j++){
+                data.push(errorData[i]['field' + j])
             }
             datas.push(data);
         }
 
         console.log('datas = ' + JSON.stringify(datas));
         var csv = this.convertToCSV(component, datas);
-        console.log('csv = ' + JSON.stringify(csv));
+        console.log('csv = ' + JSON.stringify(csv))
         this.downloadCSV(component, csv);
     },
 
     convertToCSV: function (component, data) {
-        console.log('enter convertToCSV');
+        console.log('enter convertToCSV')
         console.log('data = ' + data);
         var csv = '';
         for (var i = 0; i < data.length; i++) {
@@ -3481,11 +2652,7 @@
                 var val = '';
                 val = row[j] === null ? '' : row[j].toString();
                 console.log('val = ' + val);
-                if (
-                    val.indexOf(',') !== -1 ||
-                    val.indexOf('"') !== -1 ||
-                    val.indexOf('\n') !== -1
-                ) {
+                if (val.indexOf(',') !== -1 || val.indexOf('"') !== -1 || val.indexOf('\n') !== -1) {
                     //val = '"' + val.replace(/"/g,'""') + '"';
                 }
                 if (j > 0) {
@@ -3501,14 +2668,13 @@
     downloadCSV: function (component, csv) {
         var link = document.createElement('a');
         // 璁剧疆瀛楃闆嗗拰鏂囦欢澶�
-        var bom = '\uFEFF';
-        link.href =
-            'data:text/csv;charset=utf-8,' + encodeURIComponent(bom + csv);
+        var bom = "\uFEFF";
+        link.href = 'data:text/csv;charset=utf-8,' + encodeURIComponent(bom + csv);
         link.download = 'data.csv';
         document.body.appendChild(link);
         link.click();
         document.body.removeChild(link);
-    }
+    },
     //zhj 瀵煎嚭閿欒淇℃伅 2023-05-16 end
 
     // searchAgencyContact : function(res) {
@@ -3545,4 +2711,4 @@
     //     var data = this.search(searchUrl,data,token);
     //     return data;searchUrl,requestSearchPayload,token
     // },
-});
+})
\ No newline at end of file

--
Gitblit v1.9.1