From f62ffbeb0ce6d67b56c0d409d7b93574a0070452 Mon Sep 17 00:00:00 2001
From: binxie <137736985@qq.com>
Date: 星期二, 20 六月 2023 15:49:16 +0800
Subject: [PATCH] backup0616

---
 force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReportHelper.js |  230 ++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 160 insertions(+), 70 deletions(-)

diff --git a/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReportHelper.js b/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReportHelper.js
index cb409fc..e5f83a9 100644
--- a/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReportHelper.js
+++ b/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReportHelper.js
@@ -32,7 +32,8 @@
                 component.set('v.login', false);
             }
             else {
-                component.set('v.errorMessage', 'doinit failed.');
+                //component.set('v.errorMessage', 'doinit failed.');
+                this.error('doinit failed.');
                 this.showErrorToast(component);
                 component.set('v.login', false);
             }
@@ -157,7 +158,8 @@
 
             }
             else {
-                component.set('v.errorMessage', 'get_reports failed.');
+                //component.set('v.errorMessage', 'get_reports failed.');
+                this.error('get_reports failed.');
                 this.showErrorToast(component);
                 component.set('v.login', false);
             }
@@ -800,7 +802,8 @@
                     component.set('v.login', false);
                 }
                 else {
-                    component.set('v.errorMessage', 'save_report failed.');
+                    //component.set('v.errorMessage', 'save_report failed.');
+                    this.error('save_report failed.');
                     this.showErrorToast(component);
                     component.find('save_button').set('v.disabled', false);
                     component.set('v.login', false);
@@ -872,7 +875,8 @@
                             }
                         }
                         else {
-                            component.set('v.errorMessage', 'get_reports_now failed.');
+                            // component.set('v.errorMessage', 'get_reports_now failed.');
+                            this.error('get_reports_now failed.');
                             this.showErrorToast(component);
                             component.find('save_button').set('v.disabled', false);
                             component.set('v.login', false);
@@ -887,7 +891,8 @@
                 }
                 else {
                     var error = response.getError();
-                    component.set('v.errorMessage', '淇濆瓨鏃ユ姤澶辫触');
+                    //component.set('v.errorMessage', '淇濆瓨鏃ユ姤澶辫触');
+                    this.error('淇濆瓨鏃ユ姤澶辫触');
                     this.showErrorToast(component);
                     component.find('save_button').set('v.disabled', false);
                     component.set('v.login', false);
@@ -970,14 +975,16 @@
     create_report_header: function (component, event, helper, name, s_agency, s_date) {
         s_date = this.get_date_string(s_date);
         if (s_date == false) {
-            component.set('v.errorMessage', 'get_date_string failed.');
+            //component.set('v.errorMessage', 'get_date_string failed.');
+            this.error('get_date_string failed.');
             this.showErrorToast(component);
             return false;
         }
         var head_key = this.create_header_input_key(s_agency, s_date);
         component.set('v.agency_report_header', head_key);
         if (head_key == false) {
-            component.set('v.errorMessage', 'create_header_input_key failed.');
+            //component.set('v.errorMessage', 'create_header_input_key failed.');
+            this.error('create_header_input_key failed.');
             this.showErrorToast(component);
             return false;
         }
@@ -999,7 +1006,8 @@
                 this.toggle_report(component, event, helper);
             }
             else {
-                component.set('v.errorMessage', 'createReportHeader callback failed.');
+                //component.set('v.errorMessage', 'createReportHeader callback failed.');
+                this.error('createReportHeader callback failed.');
                 this.showErrorToast(component);
                 component.set('v.login', false);
             }
@@ -1010,7 +1018,8 @@
         if (typeof (s_date) != 'string') {
             s_date = this.get_date_string(s_date);
             if (s_date == false) {
-                component.set('v.errorMessage', 'get_date_string in create_header_input_key.');
+                //component.set('v.errorMessage', 'get_date_string in create_header_input_key.');
+                this.error('get_date_string in create_header_input_key.');
                 this.showErrorToast(component);
                 return false;
             }
@@ -1187,7 +1196,8 @@
             component.set("v.UseProduct1s", accname);
             component.set("v.UseProduct1", accname);
         } else {
-            component.set('v.errorMessage', '涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝�');
+            //component.set('v.errorMessage', '涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝�');
+            this.error('涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝�');
             this.showErrorToast(component);
         }
     },
@@ -1247,7 +1257,8 @@
             component.set("v.UseProduct2s", accname);
             component.set("v.UseProduct2", accname);
         } else {
-            component.set('v.errorMessage', '涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝�');
+            //component.set('v.errorMessage', '涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝�');
+            this.error('涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝�');
             this.showErrorToast(component);
         }
 
@@ -1308,7 +1319,8 @@
             component.set("v.UseProduct3s", accname);
             component.set("v.UseProduct3", accname);
         } else {
-            component.set('v.errorMessage', '涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝�');
+            //component.set('v.errorMessage', '涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝�');
+            this.error('涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝�');
             this.showErrorToast(component);
         }
 
@@ -1353,7 +1365,8 @@
                 component.set('v.AWStransactionURL', awsmap.transactionURL);
             }
             else {
-                component.set('v.errorMessage', 'AWS url/token error.');
+                // component.set('v.errorMessage', 'AWS url/token error.');
+                this.error('AWS url/token error.');
                 this.showErrorToast(component);
                 component.set('v.login', false);
             }
@@ -1427,17 +1440,20 @@
 
                     this.to_confirm(component, token, confirmUrl, JSON.stringify(data));
                 } else if (acMap.errormsg != '') {
-                    component.set('v.errorMessage', acMap.errormsg);
+                    // component.set('v.errorMessage', acMap.errormsg);
+                    this.error(acMap.errormsg);
                     this.showErrorToast(component);
                     component.set('v.login', false);
                 } else {
-                    component.set('v.errorMessage', 'agency contact insert id error.');
+                    //component.set('v.errorMessage', 'agency contact insert id error.');
+                    this.error('agency contact insert id error.');
                     this.showErrorToast(component);
                     component.set('v.login', false);
                 }
             }
             else {
-                component.set('v.errorMessage', 'agency contact insert error.');
+                //component.set('v.errorMessage', 'agency contact insert error.');
+                this.error('agency contact insert error.');
                 this.showErrorToast(component);
                 component.set('v.login', false);
             }
@@ -1470,12 +1486,14 @@
                 this.showSuccessToast(component);
                 this.set_doctor_list(component);
             } else {
-                component.set('v.errorMessage', 'AWS confirm error.');
+                //component.set('v.errorMessage', 'AWS confirm error.');
+                this.error('AWS confirm error.');
                 this.showErrorToast(component);
                 component.set('v.login', false);
             }
         }).catch(error => {
-            component.set('v.errorMessage', 'AWS confirm error.');
+            // component.set('v.errorMessage', 'AWS confirm error.');
+            this.error('AWS confirm error.');
             this.showErrorToast(component);
             component.set('v.login', false);
         });
@@ -1597,7 +1615,8 @@
                         component.set('v.login', false);
                     }
                     else {
-                        component.set('v.errorMessage', 'set_doctor_list failed.');
+                        // component.set('v.errorMessage', 'set_doctor_list failed.');
+                        this.error('set_doctor_list failed.');
                         this.showErrorToast(component);
                         component.set('v.login', false);
                     }
@@ -1644,7 +1663,8 @@
         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)) {
-            component.set('v.errorMessage', '涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝佸尯鍒�');
+            //component.set('v.errorMessage', '涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝佸尯鍒�');
+            this.error('涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝佸尯鍒�');
             this.showErrorToast(component);
             component.find('select_Product1').set('v.value', '');
         }
@@ -1657,7 +1677,8 @@
         var p2bool = pcId2 != '' && pcId2 != null;
         var p0bool = product_category_id != '' && product_category_id != null;
         if ((p1bool && p0bool && product_category_id == pcId1) || (p2bool && p0bool && product_category_id == pcId2)) {
-            component.set('v.errorMessage', '涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝佸尯鍒�');
+            //component.set('v.errorMessage', '涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝佸尯鍒�');
+            this.error('涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝佸尯鍒�');
             this.showErrorToast(component);
             component.set('v.UseProduct2_TEXT', '');
         }
@@ -1670,7 +1691,8 @@
         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)) {
-            component.set('v.errorMessage', '涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝佸尯鍒�');
+            //component.set('v.errorMessage', '涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝佸尯鍒�');
+            this.error('涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝佸尯鍒�');
             this.showErrorToast(component);
             component.find('select_Product3').set('v.value', '');
         }
@@ -1848,9 +1870,13 @@
                     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>';
+                    content += '<th scope=\"col"\ style=\"width:100px">' + '琛屽彿' + '</th>';
                     for (i = 0; i < headers.length; i++) {
-                        content += '<th scope=\"col"\>' + headers[i] + '</th>';
+                        if (headers[i] == '浜у搧1鍚岀被鑰楁潗绉戝鏈堜娇鐢ㄩ噺') {
+                            content += '<th scope=\"col"\ style=\"width:250px"\>' + headers[i] + '</th>';
+                        } else {
+                            content += '<th scope=\"col"\ style=\"width:200px"\>' + headers[i] + '</th>';
+                        }
                     }
                     content += "</tr></thead>";
                     for (var i = 1; i < allTextLines.length; i++) {
@@ -1891,7 +1917,8 @@
                 if (callback) callback(result);
             }
             else {
-                component.set('v.errorMessage', 'AWS url/token error.');
+                //component.set('v.errorMessage', 'AWS url/token error.');
+                this.error('AWS url/token error.');
                 this.showErrorToast01(component);
                 component.set('v.login', false);
             }
@@ -1915,13 +1942,15 @@
             if (callback) callback(result);
         }).catch(error => {
             console.log('AWS search error = ' + JSON.stringify(error));
-            component.set('v.errorMessage', 'AWS search error.');
+            // component.set('v.errorMessage', 'AWS search error.');
+            this.error('AWS search error.');
             this.showErrorToast01(component);
             component.set('v.login', false);
         });
     },
     saveRecords: function (component, event, helper) {
-        component.set('v.login', true);
+        //component.set('v.login', true);
+        component.set('v.modal_import_spinner', true);
         //fy 瀵煎叆 202200506 start
         var action1 = component.get("c.processDataAWSId");
         action1.setParams({
@@ -1960,24 +1989,31 @@
                                 console.log('result = ' + JSON.stringify(result));
                                 if (result.status == '0') {
                                     if (result.object != null && result.object.length != 0) {
-                                        component.set('v.login', true);
+                                        //component.set('v.login', true);
+                                        component.set('v.modal_import_spinner', true);
                                         this.saveRecordsEditFile(component, dataMap, result.object, helper);
                                     } else {
-                                        component.set('v.errorMessage', 'AWS 鏌ヨ鏁版嵁涓虹┖ ');
+                                        //component.set('v.errorMessage', 'AWS 鏌ヨ鏁版嵁涓虹┖ ');
+                                        this.error('AWS 鏌ヨ鏁版嵁涓虹┖ ');
                                         this.showErrorToast01(component);
-                                        component.set('v.login', false);
+                                        //component.set('v.login', false);
+                                        component.set('v.modal_import_spinner', false);
                                     }
                                 } else {
-                                    component.set('v.errorMessage', 'AWS search status : ' + result.status);
+                                    //component.set('v.errorMessage', 'AWS search status : ' + result.status);
+                                    this.error('AWS search status : ' + result.status);
                                     this.showErrorToast01(component);
-                                    component.set('v.login', false);
+                                    //component.set('v.login', false);
+                                    component.set('v.modal_import_spinner', false);
                                 }
                             }, component);
                         });
                     } else {
-                        component.set('v.errorMessage', valur[1] + '\n' + "璇蜂慨鏀瑰悗閲嶆柊涓婁紶");
+                        //component.set('v.errorMessage', valur[1] + '\n' + "璇蜂慨鏀瑰悗閲嶆柊涓婁紶");
+                        this.error(valur[1] + '\n' + "璇蜂慨鏀瑰悗閲嶆柊涓婁紶");
                         this.showErrorToast01(component);
-                        component.set('v.login', false);
+                        //component.set('v.login', false);
+                        component.set('v.modal_import_spinner', false);
                     }
                 }
             }
@@ -2108,14 +2144,16 @@
             let errorDatas = [];
             let errorDataRow = [];
             debugger
+            var fileContentData = component.get("v.fileContentData").split('\n');
+            console.log('fileContentData = ' + JSON.stringify(fileContentData))
             console.log('errorArray = ' + JSON.stringify(errorArray))
             for (var i in errorArray) {
-                if (errorArray[i] != '') {
-                    let errorData = {}
-                    errorData.errorRow = errorArray[i].trim().substring(1, 2);
-                    errorData.errorInfo = errorArray[i].trim().substring(5);
-                    errorDatas.push(errorData);
-                }
+                // if (errorArray[i] != '') {
+                //     let errorData = {}
+                //     errorData.errorRow = errorArray[i].trim().substring(1, 2);
+                //     errorData.errorInfo = errorArray[i].trim().substring(5);
+                //     errorDatas.push(errorData);
+                // }
                 if (errorArray[i] != '') {
                     let errorData = {}
                     let index = errorDataRow.indexOf(errorArray[i].trim().substring(1, 2));
@@ -2123,33 +2161,45 @@
                         errorData.errorRow = errorArray[i].trim().substring(1, 2);
                         errorDataRow.push(errorData.errorRow);
                         errorData.errorInfo = errorArray[i].trim().substring(5);
+                        if(errorData.errorInfo == '鎷滆浜篈WS涓嶅瓨鍦�'){
+                            errorData.errorInfo ='鎷滆浜� ' + fileContentData[errorData.errorRow].split(',')[5] + '涓嶅瓨鍦�';
+                        }
                         errorDatas.push(errorData);
                     } else {
-                        errorDatas[index].errorInfo += '; ' + errorArray[i].trim().substring(5);
+                        if(errorArray[i].trim().substring(5) == '鎷滆浜篈WS涓嶅瓨鍦�'){
+                            errorData[index].errorInfo = '; ' + '鎷滆浜� ' + fileContentData[errorDatas[index].errorRow].split(',')[5] + '涓嶅瓨鍦�';
+                        }else{
+                            errorDatas[index].errorInfo += '; ' + errorArray[i].trim().substring(5);
+                        }
                     }
                 }
             }
 
             var fileContentData = component.get("v.fileContentData").split('\n');
+            console.log('fileContentData = ' + JSON.stringify(fileContentData))
             let errorColumns = [
-                { label: '閿欒琛�', fieldName: 'errorRow', type: 'text', hideDefaultActions: true, initialWidth: 50 },
+                { 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 - 1; i++) {
+                let initialWidth = 180;
+                if (fileContentData[0].split(',')[i] == '浜у搧1鍚岀被鑰楁潗绉戝鏈堜娇鐢ㄩ噺' || fileContentData[0].split(',')[i] == '浣跨敤浜у搧1(浜у搧鍨嬪彿)') {
+                    initialWidth = 250;
+                }
                 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
+                    initialWidth: initialWidth
                 });
             }
 
             for (var i = 0; i < errorDatas.length; i++) {
                 let data = fileContentData[errorDatas[i].errorRow];
                 console.log('data = ' + JSON.stringify(data));
-                if(data){
+                if (data) {
                     for (var j = 0; j < data.split(',').length; j++) {
                         let label = 'field' + j;
                         errorDatas[i][label] = data.split(',')[j];
@@ -2162,10 +2212,12 @@
             component.set("v.showErrorInfo", true);
 
             console.log('error = ' + error);
-            component.set('v.errorMessage', error);
+            //component.set('v.errorMessage', error);
+            this.error(error);
             this.showErrorToast01(component);
             console.log('error=' + error);
-            component.set('v.login', false);
+            //component.set('v.login', false);
+            component.set('v.modal_import_spinner', false);
             return;
         }
 
@@ -2192,9 +2244,10 @@
                 if (res != 'success') {
                     var ress = res.split('=');
                     console.log(ress);
-
                     let errorDatas = [];
                     let errorDataRow = [];
+                    var fileContentData = component.get("v.fileContentData").split('\n');
+                    console.log('fileContentData[1].split(,)[5] = ' + fileContentData[1].split(',')[5])
                     debugger
                     for (var i = 0; i < ress.length; i++) {
                         res1 += ress[i].substr(7) + '\n';
@@ -2205,25 +2258,38 @@
                                 errorData.errorRow = ress[i].substr(7).substring(1, 2);
                                 errorDataRow.push(errorData.errorRow);
                                 errorData.errorInfo = ress[i].substr(7).substring(5);
+                                if(errorData.errorInfo == '鎷滆浜轰笉瀛樺湪'){
+                                    console.log('errorData.errorRow = ' + errorData.errorRow)
+                                    errorData.errorInfo ='鎷滆浜� ' + fileContentData[errorData.errorRow].split(',')[5] + '涓嶅瓨鍦�';
+                                }
                                 errorDatas.push(errorData);
                             } else {
-                                errorDatas[index].errorInfo += '; ' + ress[i].substr(7).substring(5);
+                                debugger
+                                if(ress[i].substr(7).substring(5) == '鎷滆浜轰笉瀛樺湪'){
+                                    errorDatas[index].errorInfo += '; ' + '鎷滆浜� ' + fileContentData[errorDatas[index].errorRow].split(',')[5] + '涓嶅瓨鍦�';
+                                }else{
+                                    errorDatas[index].errorInfo += '; ' + ress[i].substr(7).substring(5);
+                                }
                             }
                         }
                     }
                     var fileContentData = component.get("v.fileContentData").split('\n');
                     let errorColumns = [
-                        { label: '閿欒琛�', fieldName: 'errorRow', type: 'text', hideDefaultActions: true, initialWidth: 50 },
+                        { 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 - 1; i++) {
+                        let initialWidth = 180;
+                        if (fileContentData[0].split(',')[i] == '浜у搧1鍚岀被鑰楁潗绉戝鏈堜娇鐢ㄩ噺' || fileContentData[0].split(',')[i] == '浣跨敤浜у搧1(浜у搧鍨嬪彿)') {
+                            initialWidth = 250;
+                        }
                         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
+                            initialWidth: initialWidth
                         });
                     }
 
@@ -2240,19 +2306,23 @@
                     component.set("v.showErrorInfo", true);
 
                     console.log("==" + res1);
-                    component.set('v.errorMessage', res1 + "璇蜂慨鏀瑰悗閲嶆柊涓婁紶");
+                    //component.set('v.errorMessage', res1 + "璇蜂慨鏀瑰悗閲嶆柊涓婁紶");
+                    this.error(res1 + "璇蜂慨鏀瑰悗閲嶆柊涓婁紶");
                     this.showErrorToast01(component);
-                    component.set('v.login', false);
+                    //component.set('v.login', false);
+                    component.set('v.modal_import_spinner', false);
                 } else {
                     component.set('v.successMessage', '瀵煎叆鎴愬姛');
                     this.showSuccessToast01(component);
                     component.set("v.showMain", true);
-                    component.set('v.login', false);
+                    //component.set('v.login', false);
+                    component.set('v.modal_import_spinner', false);
                     this.doinit(component, event, helper);
                 }
             }
             else if (state === "INCOMPLETE") {
-                component.set('v.login', false);
+                //component.set('v.login', false);
+                component.set('v.modal_import_spinner', false);
             }
             else if (state === "ERROR") {
                 var errors = response.getError();
@@ -2260,11 +2330,13 @@
                     if (errors[0] && errors[0].message) {
                         console.log("Error message: " +
                             errors[0].message);
-                        component.set('v.login', false);
+                        //component.set('v.login', false);
+                        component.set('v.modal_import_spinner', false);
                     }
                 } else {
                     console.log("Unknown error");
-                    component.set('v.login', false);
+                    //component.set('v.login', false);
+                    component.set('v.modal_import_spinner', false);
                 }
             }
         });
@@ -2529,7 +2601,8 @@
                     component.set('v.login', false);
                 }
                 else {
-                    component.set('v.errorMessage', 'newlyBuild failed.');
+                    //component.set('v.errorMessage', 'newlyBuild failed.');
+                    this.error('newlyBuild failed.');
                     this.showErrorToast(component);
                     component.set('v.login', false);
                 }
@@ -2545,11 +2618,13 @@
                 if (sc.replace(/\D/gi, "")) {
                     component.set("v.select_ConsumptionOfConsumables", sc);
                 } else {
-                    component.set('v.errorMessage', '浜у搧1鍚岀被鑰楁潗绉戝鏈堜娇鐢ㄩ噺蹇呴』杈撳叆鏁板瓧!');
+                    //component.set('v.errorMessage', '浜у搧1鍚岀被鑰楁潗绉戝鏈堜娇鐢ㄩ噺蹇呴』杈撳叆鏁板瓧!');
+                    this.error('浜у搧1鍚岀被鑰楁潗绉戝鏈堜娇鐢ㄩ噺蹇呴』杈撳叆鏁板瓧!');
                     this.showErrorToast(component);
                 }
             } else {
-                component.set('v.errorMessage', '浜у搧1鍚岀被鑰楁潗绉戝鏈堜娇鐢ㄩ噺鏈�澶氳緭鍏�14浣嶆暟瀛�!');
+                //component.set('v.errorMessage', '浜у搧1鍚岀被鑰楁潗绉戝鏈堜娇鐢ㄩ噺鏈�澶氳緭鍏�14浣嶆暟瀛�!');
+                this.error('浜у搧1鍚岀被鑰楁潗绉戝鏈堜娇鐢ㄩ噺鏈�澶氳緭鍏�14浣嶆暟瀛�!');
                 this.showErrorToast(component);
             }
         }
@@ -2562,11 +2637,13 @@
                 if (sc.replace(/\D/gi, "")) {
                     component.set("v.select_warlocksNumber", sc);
                 } else {
-                    component.set('v.errorMessage', '浜у搧鐢ㄩ噺蹇呴』杈撳叆鏁板瓧!');
+                    //component.set('v.errorMessage', '浜у搧鐢ㄩ噺蹇呴』杈撳叆鏁板瓧!');
+                    this.error('浜у搧鐢ㄩ噺蹇呴』杈撳叆鏁板瓧!');
                     this.showErrorToast(component);
                 }
             } else {
-                component.set('v.errorMessage', '浜у搧鐢ㄩ噺鏈�澶氳緭鍏�14浣嶆暟瀛�!');
+                //component.set('v.errorMessage', '浜у搧鐢ㄩ噺鏈�澶氳緭鍏�14浣嶆暟瀛�!');
+                this.error('浜у搧鐢ㄩ噺鏈�澶氳緭鍏�14浣嶆暟瀛�!');
                 this.showErrorToast(component);
             }
         }
@@ -2741,11 +2818,24 @@
 
     downloadCSV: function (component, csv) {
         var link = document.createElement('a');
-        link.href = 'data:text/csv;charset=utf-8,' + encodeURIComponent(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);
     },
+    error: function (message) {
+        // $('toastMessage.forceToastManager').css('white-space', 'pre-wrap');
+        var toastEvent = $A.get("e.force:showToast");
+
+        toastEvent.setParams({
+            "title": "閿欒!",
+            "message": message,
+            "type": "error",
+            //"duration" : "sticky"
+        });
+        toastEvent.fire();
+    },
     //zhj 瀵煎嚭閿欒淇℃伅 2023-05-16 end
 })
\ No newline at end of file

--
Gitblit v1.9.1