From 744f42c5496e656a1f9927740a3b37c0b97a6cba Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:34:12 +0800
Subject: [PATCH] lexcommunityupload0714

---
 force-app/main/default/aura/DealerPersonnelInformationImport/DealerPersonnelInformationImportHelper.js |   36 ++++++++++++++++++++++++++----------
 1 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/force-app/main/default/aura/DealerPersonnelInformationImport/DealerPersonnelInformationImportHelper.js b/force-app/main/default/aura/DealerPersonnelInformationImport/DealerPersonnelInformationImportHelper.js
index ddd60f2..cbd114b 100644
--- a/force-app/main/default/aura/DealerPersonnelInformationImport/DealerPersonnelInformationImportHelper.js
+++ b/force-app/main/default/aura/DealerPersonnelInformationImport/DealerPersonnelInformationImportHelper.js
@@ -77,6 +77,9 @@
         };
         reader.readAsDataURL(file);
     },
+    isNumber: function(str) {
+        return /^\d+$/.test(str);
+    },
     saveRecords: function (component, event, helper) {
         component.set('v.login', true);
         var action = component.get("c.processData");
@@ -101,34 +104,44 @@
                         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(6);
+                                errorData.errorInfo = ress[i].substr(7).substring(5);
                                 errorDatas.push(errorData);
                             } else {
-                                errorDatas[index].errorInfo += '; ' + ress[i].substr(7).substring(6);
+                                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++) {
                         errorColumns.push({
-                            label: fileContentData[0].split(',')[i], fieldName: 'field' + i, type: 'text', hideDefaultActions: true,wrapText: true
+                            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));
-                        for(var j = 0; j < data.split(',').length; j++){
-                            let label = 'field' + j;
-                            errorDatas[i][label] = data.split(',')[j];
+                        if(data){
+                            for(var j = 0; j < data.split(',').length; j++){
+                                let label = 'field' + j;
+                                errorDatas[i][label] = data.split(',')[j];
+                            }
                         }
                     }
                     console.log('errorDatas = ' + JSON.stringify(errorDatas))
@@ -142,12 +155,14 @@
                     component.set('v.errorMessage', res1 + "璇蜂慨鏀瑰悗閲嶆柊涓婁紶");
                     this.showErrorToast(component);
                     component.set('v.login', false);
+                    component.find('save_con').set('v.disabled', true); 
                 } else {
                     // this.success('瀵煎叆鎴愬姛');
                     component.set('v.successMessage', '瀵煎叆鎴愬姛');
                     this.showSuccessToast01(component);
                     component.set("v.showMain", true);
                     component.set('v.login', false);
+                    component.find('save_con').set('v.disabled', false); 
                 }
             }
             else if (state === "INCOMPLETE") {
@@ -195,7 +210,7 @@
         window.setTimeout($A.getCallback(function () {
             $A.util.addClass(component.find('errorDiv'), 'slds-hide');
         }),
-            4000
+            7000
         );
     },
     success: function (message) {
@@ -283,8 +298,9 @@
     downloadCSV: function (component, csv) {
         var link = document.createElement('a');
         // 璁剧疆瀛楃闆嗗拰鏂囦欢澶�
-        let 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.href = URL.createObjectURL(csvFile);
         link.download = 'data.csv';
         document.body.appendChild(link);
         link.click();

--
Gitblit v1.9.1