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 | 249 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 198 insertions(+), 51 deletions(-)
diff --git a/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js b/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js
index 10a6ca0..5dbdbe7 100644
--- a/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js
+++ b/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js
@@ -60,11 +60,11 @@
if(result.object != null){
this.to_contact_list(result,contactData,component);
}else{
- component.set('v.login',false);
+ component.set('v.loginEdit',false);
}
}else{
this.error('AWS search status1 : ' + result.status);
- component.set('v.login',false);
+ component.set('v.loginEdit',false);
}
},component);
@@ -90,7 +90,7 @@
}
component.find('select_agency_person').set('v.options',res);
component.set('v.allselectlistAgencyPerson',res);
- component.set('v.login',false);
+ component.set('v.loginEdit',false);
},
search_contact_url : function(component, sobject, callback) {
@@ -106,7 +106,7 @@
}
else{
this.error('AWS url/token error.');
- component.set('v.login',false);
+ component.set('v.loginEdit',false);
}
});
$A.enqueueAction(action);
@@ -281,6 +281,133 @@
});
$A.enqueueAction(action);
},
+ 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,
+ });
+
+ component.set('v.loginEdit',true);
+ action.setCallback(this,function(response){
+ var state = response.getState();
+ if(state == 'SUCCESS'){
+ var res = response.getReturnValue();
+ component.set('v.reports', res.reports);
+
+ // 20220222 PI鏀归�� by Bright--start
+ let dataIds = [];
+ let dataIds1 = [];
+ let mm = {};
+ let b = false;
+ let b1 = false;
+ for (const rep of res.reports) {
+ if (rep.doctor2__r && rep.doctor2__r.AWS_Data_Id__c) {
+ dataIds.push(rep.doctor2__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){
+ 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.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);
+ }
+ }
+
+ 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('璇烽噸鏂板埛鏂伴〉闈㈣繘琛岃В瀵�');
+ }
+ },component);
+ }else{
+ b = true;
+ }
+
+
+
+ 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);
+ }
+ },component);
+ }else{
+ b1 = true;
+ }
+ // 20220222 PI鏀归�� by Bright--end
+
+ component.set('v.report_count', res.reports.length);
+
+ // 鏇存柊淇濆瓨寰屻伄select_data鐢�
+ var report_id = component.get('v.update_select_report_data_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]);
+ 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{
+ this.error('get_reports failed.');
+ 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'));
@@ -334,7 +461,7 @@
// 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') {
var select_data = '';
if (component.get('v.mode') == 'edit') {
@@ -437,7 +564,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);
@@ -446,9 +573,12 @@
component.set('v.edit_copy_select_report_id', "");
}
}
+ setTimeout(function() {
+ component.set('v.loginEdit',false);
+ }, 1000);
} 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');
@@ -638,6 +768,7 @@
},
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');
@@ -781,7 +912,7 @@
// 淇濆瓨鍑︾悊
- component.set('v.login',true);
+ 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');
@@ -829,10 +960,10 @@
component.find('select_agency_person').set('v.options', select_agency_list);
component.set('v.update_select_report_data_id', report_id);
- this.get_reports(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.login',false);
+ component.set('v.loginEdit',false);
}
else{
// var error = response.getError();
@@ -846,7 +977,7 @@
// }
this.error('save_report failed.');
component.find('save_button').set('v.disabled', false);
- component.set('v.login',false);
+ component.set('v.loginEdit',false);
}
});
$A.enqueueAction(action);
@@ -886,7 +1017,7 @@
var report_id = response.getReturnValue();
component.set('v.create_agency_report_id', report_id);
- this.get_reports(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'));
// 銉€兗銉�銉偊銈ｃ兂銉夈偊鍐呫伄涓�瑕х敤
var action2 = component.get('c.getReportsById');
@@ -925,21 +1056,21 @@
else{
this.error('get_reports_now failed.');
component.find('save_button').set('v.disabled', false);
- component.set('v.login',false);
+ component.set('v.loginEdit',false);
}
});
$A.enqueueAction(action2);
this.allclear(component);
component.find('save_button').set('v.disabled', false);
- component.set('v.login',false);
+ 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.login',false);
+ component.set('v.loginEdit',false);
}
});
$A.enqueueAction(action);
@@ -1227,7 +1358,7 @@
}
else{
this.error('AWS url/token error.');
- component.set('v.login',false);
+ component.set('v.loginEdit',false);
}
});
$A.enqueueAction(action);
@@ -1264,7 +1395,7 @@
})();
}else{
console.log('AWS status error:' + result)
- component.set('v.login',false);
+ component.set('v.loginEdit',false);
if(result.status == '129'){
component.find('OppMessage').setError('璇ュ鎴蜂汉鍛樺悕瀛楀凡瀛樺湪锛屽湪'+hospitalName+'鍖婚櫌锛岃淇敼');
}else{
@@ -1273,7 +1404,7 @@
}
}).catch(error => {
console.log('AWS insert error:' + error)
- component.set('v.login',false);
+ component.set('v.loginEdit',false);
component.find('OppMessage').setError('AWS insert error.');
});
@@ -1309,15 +1440,15 @@
this.to_confirm(component,token,confirmUrl,JSON.stringify(data));
}else if(acMap.errormsg != ''){
this.error(acMap.errormsg);
- component.set('v.login',false);
+ component.set('v.loginEdit',false);
}else {
this.error('agency contact insert id error.');
- component.set('v.login',false);
+ component.set('v.loginEdit',false);
}
}
else{
this.error('agency contact insert error.');
- component.set('v.login',false);
+ component.set('v.loginEdit',false);
}
});
$A.enqueueAction(action);
@@ -1342,11 +1473,11 @@
this.set_doctor_list(component);
}else {
this.error('AWS confirm error.');
- component.set('v.login',false);
+ component.set('v.loginEdit',false);
}
}).catch(error => {
this.error('AWS confirm error.');
- component.set('v.login',false);
+ component.set('v.loginEdit',false);
});
},
// PIPL update Yin Mingjie 21/02/2022 end
@@ -1354,7 +1485,7 @@
set_doctor_list : function(component) {
var hospital_id = component.get('v.hospitalLinkId');
if (hospital_id) {
- component.set('v.login',true);
+ component.set('v.loginEdit',true);
var action = component.get('c.getDoctorList');
action.setParams({
"hospital_id" : hospital_id,
@@ -1395,7 +1526,7 @@
}
else{
this.error('set_doctor_list failed.');
- component.set('v.login',false);
+ component.set('v.loginEdit',false);
}
});
$A.enqueueAction(action);
@@ -1413,7 +1544,7 @@
dataArr.push(key);
}
if(dataArr.length == 0){
- component.set('v.login',false);
+ component.set('v.loginEdit',false);
this.warning('娌℃湁鎵惧埌绗﹀悎鏉′欢鐨勫鎴蜂汉鍛�');
return;
}
@@ -1429,7 +1560,7 @@
this.to_doctor_list(result,retMap,component);
}else{
this.error('AWS search status4 : ' + result.status);
- component.set('v.login',false);
+ component.set('v.loginEdit',false);
}
},component);
// fetch(searchUrl, {
@@ -1462,12 +1593,12 @@
}).then((data) => {
return data.json();
}).then((result) => {
- component.set('v.login',false);
+ 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.login',false);
+ component.set('v.loginEdit',false);
});
},
@@ -1512,7 +1643,7 @@
component.set('v.default_select_doctor_id', '');
component.set('v.doctor_list', res);
- component.set('v.login',false);
+ component.set('v.loginEdit',false);
},
// PIPL update Yin Mingjie 21/02/2022 end
@@ -1569,7 +1700,7 @@
"agency_hospital_link_id" : component.get('v.hospitalLinkId'),
});
- component.set('v.login',true);
+ component.set('v.loginEdit',true);
action.setCallback(this,function(response){
var state = response.getState();
if(state == 'SUCCESS'){
@@ -1591,7 +1722,7 @@
// } else {
// component.find('input-opportunity').get("v.body")[0].set('v.selectedLabel', '');
// }
- component.set('v.login',false);
+ component.set('v.loginEdit',false);
return false;
}
//SWAG-CKH5M8 銆愬鎵樸�戝懆鎶ュ叧鑱旇浠凤紝鍙�夋嫨璇环鑼冨洿璋冩暣 fy start
@@ -1630,11 +1761,11 @@
$A.util.addClass(component.find('input-opportunity-blank'), 'disp_none');
}
- component.set('v.login',false);
+ component.set('v.loginEdit',false);
}
else{
this.error('selectOpportunityByIdAndHospitalLinkId failed.');
- component.set('v.login',false);
+ component.set('v.loginEdit',false);
}
});
$A.enqueueAction(action);
@@ -1906,7 +2037,7 @@
saveRecords : function(component,event,helper){
debugger
- component.set('v.login',true);
+ component.set('v.loginEdit',true);
//fy 瀵煎叆 20220424 start
var action1 = component.get("c.processDataAWSId");
action1.setParams({
@@ -1951,15 +2082,15 @@
// component.set('v.login',true);
// this.ImportMethod(component,resultjson);
// }
- component.set('v.login',true);
+ component.set('v.loginEdit',true);
this.saveRecordsEditFile(component,dataMap,result.object,helper);
}else{
this.error('AWS 鏌ヨ鏁版嵁涓虹┖ ' );
- component.set('v.login',false);
+ component.set('v.loginEdit',false);
}
}else{
this.error('AWS search status6 : ' + result.status);
- component.set('v.login',false);
+ component.set('v.loginEdit',false);
}
},component);
// var resultjson =null;
@@ -2061,6 +2192,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 +2205,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 }
@@ -2110,18 +2249,18 @@
component.set("v.showErrorInfo", true);
console.log("=="+res1);
this.error(res1+"璇蜂慨鏀瑰悗閲嶆柊涓婁紶");
- component.set('v.login',false);
+ component.set('v.loginEdit',false);
}else{
component.set("v.showMain",true);
this.success("瀵煎叆鎴愬姛");
// alert('saved successfully');
- component.set('v.login',false);
+ component.set('v.loginEdit',false);
}
}
else if (state === "INCOMPLETE") {
// do something
- component.set('v.login',false);
+ component.set('v.loginEdit',false);
}
else if (state === "ERROR") {
var errors = response.getError();
@@ -2129,11 +2268,11 @@
if (errors[0] && errors[0].message) {
console.log("Error message: " +
errors[0].message);
- component.set('v.login',false);
+ component.set('v.loginEdit',false);
}
} else {
console.log("Unknown error");
- component.set('v.login',false);
+ component.set('v.loginEdit',false);
}
}
});
@@ -2179,6 +2318,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 +2331,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);
+ }
}
}
}
@@ -2233,7 +2380,7 @@
this.error(error);
console.log('error='+error);
- component.set('v.login',false);
+ component.set('v.loginEdit',false);
return;
}
@@ -2349,7 +2496,7 @@
},
select_repores_date : function(component,event,helper){
- component.set('v.login',true);
+ 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);
@@ -2366,7 +2513,7 @@
var res = response.getReturnValue();
console.log('杈撳叆鐨勫紑濮嬫棩鏈�3'+res);
- component.set('v.login',false);
+ component.set('v.loginEdit',false);
// PI 鏀归�� By Bright 20220328
if(true){
@@ -2400,7 +2547,7 @@
}
helper.showExportDate(component, res);
- component.set('v.login', false);
+ component.set('v.loginEdit', false);
}, awsurl.token);
}else{
helper.showExportDate(component, res);
@@ -2412,7 +2559,7 @@
}else{
alert('瀵煎嚭澶辫触,璇锋鏌ユ椿鍔ㄦ棩');
- component.set('v.login',false);
+ component.set('v.loginEdit',false);
}
});
$A.enqueueAction(action);
--
Gitblit v1.9.1