From 614b1b648eceb33e325ed7cf8d8cb6a7a71b9ddc Mon Sep 17 00:00:00 2001
From: binxie <137736985@qq.com>
Date: 星期一, 26 六月 2023 11:28:13 +0800
Subject: [PATCH] backup0626
---
force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js b/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js
index 10a6ca0..7816c68 100644
--- a/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js
+++ b/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js
@@ -437,7 +437,7 @@
if (select_product_category3 != null && select_product_category3 != '') {
component.find('select_Product3').set('v.value', select_product_category3);
}
- console.log('reportDate = ' + reportDate);
+
if (reportDate != null) {
console.log('reportDate = ' + reportDate);
component.set('v.data.Report_Date__c', reportDate);
@@ -448,7 +448,7 @@
}
} else {
// CLOSE
- console.log('reportDate = ' + reportDate);
+
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');
@@ -2061,6 +2061,7 @@
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] != '') {
@@ -2073,13 +2074,20 @@
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);
+ }
}
}
}
- 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 }
@@ -2179,6 +2187,7 @@
let errorDatas = [];
let errorDataRow = [];
debugger
+ var fileContentData = component.get("v.fileContentData").split('\n');
console.log('errorArray = ' + JSON.stringify(errorArray))
for (var i in errorArray) {
if (errorArray[i] != '') {
@@ -2191,9 +2200,16 @@
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] + '涓嶅瓨鍦�';
+ }
errorDatas.push(errorData);
} 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);
+ }
}
}
}
--
Gitblit v1.9.1