From af7b716a60d889acea95560abba0e46eee008b8f Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期三, 05 七月 2023 13:54:50 +0800
Subject: [PATCH] backup0705
---
force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js | 284 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 232 insertions(+), 52 deletions(-)
diff --git a/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js b/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js
index 9597a16..b31c0f9 100644
--- a/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js
+++ b/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js
@@ -96,11 +96,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
@@ -127,7 +127,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) {
@@ -142,7 +142,7 @@
if (callback) callback(result);
} else {
this.error("AWS url/token error.");
- component.set("v.login", false);
+ component.set("v.loginEdit", false);
}
});
$A.enqueueAction(action);
@@ -339,6 +339,152 @@
});
$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(
@@ -404,7 +550,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"
@@ -560,6 +706,9 @@
component.set("v.edit_copy_select_report_id", "");
}
}
+ setTimeout(function () {
+ component.set("v.loginEdit", false);
+ }, 1000);
} else {
// CLOSE
@@ -785,6 +934,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");
@@ -987,7 +1137,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");
@@ -1041,7 +1191,7 @@
.set("v.options", select_agency_list);
component.set("v.update_select_report_data_id", report_id);
- this.get_reports(
+ this.get_reports_edit(
component,
event,
helper,
@@ -1050,7 +1200,7 @@
);
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));
@@ -1063,7 +1213,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);
@@ -1103,7 +1253,7 @@
var report_id = response.getReturnValue();
component.set("v.create_agency_report_id", report_id);
- this.get_reports(
+ this.get_reports_edit(
component,
event,
helper,
@@ -1147,20 +1297,20 @@
} 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);
@@ -1526,7 +1676,7 @@
component.set("v.AWStransactionURL", awsmap.transactionURL);
} else {
this.error("AWS url/token error.");
- component.set("v.login", false);
+ component.set("v.loginEdit", false);
}
});
$A.enqueueAction(action);
@@ -1572,7 +1722,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")
@@ -1586,7 +1736,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.");
});
},
@@ -1621,14 +1771,14 @@
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);
@@ -1659,12 +1809,12 @@
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
@@ -1672,7 +1822,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
@@ -1712,7 +1862,7 @@
// PIPL update Yin Mingjie 21/02/2022 end
} else {
this.error("set_doctor_list failed.");
- component.set("v.login", false);
+ component.set("v.loginEdit", false);
}
});
$A.enqueueAction(action);
@@ -1732,7 +1882,7 @@
dataArr.push(key);
}
if (dataArr.length == 0) {
- component.set("v.login", false);
+ component.set("v.loginEdit", false);
this.warning("娌℃湁鎵惧埌绗﹀悎鏉′欢鐨勫鎴蜂汉鍛�");
return;
}
@@ -1758,7 +1908,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
@@ -1795,13 +1945,13 @@
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);
});
},
@@ -1846,7 +1996,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
@@ -1933,7 +2083,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") {
@@ -1970,7 +2120,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
@@ -2031,10 +2181,10 @@
);
}
- 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);
@@ -2328,7 +2478,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({
@@ -2380,7 +2530,7 @@
// component.set('v.login',true);
// this.ImportMethod(component,resultjson);
// }
- component.set("v.login", true);
+ component.set("v.loginEdit", true);
this.saveRecordsEditFile(
component,
dataMap,
@@ -2389,11 +2539,11 @@
);
} 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
@@ -2498,6 +2648,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] != "") {
@@ -2515,14 +2666,28 @@
.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: "閿欒琛�",
@@ -2566,26 +2731,26 @@
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();
if (errors) {
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);
}
}
});
@@ -2631,6 +2796,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] != "") {
@@ -2648,11 +2814,25 @@
.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);
+ }
}
}
}
@@ -2703,7 +2883,7 @@
this.error(error);
console.log("error=" + error);
- component.set("v.login", false);
+ component.set("v.loginEdit", false);
return;
}
@@ -2882,7 +3062,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(
@@ -2900,7 +3080,7 @@
if (state === "SUCCESS") {
var res = response.getReturnValue();
console.log("杈撳叆鐨勫紑濮嬫棩鏈�3" + res);
- component.set("v.login", false);
+ component.set("v.loginEdit", false);
// PI 鏀归�� By Bright 20220328
if (true) {
@@ -2947,7 +3127,7 @@
}
helper.showExportDate(component, res);
- component.set("v.login", false);
+ component.set("v.loginEdit", false);
},
awsurl.token
);
@@ -2959,7 +3139,7 @@
component.set("v.reports_date", res);
} else {
alert("瀵煎嚭澶辫触,璇锋鏌ユ椿鍔ㄦ棩");
- component.set("v.login", false);
+ component.set("v.loginEdit", false);
}
});
$A.enqueueAction(action);
--
Gitblit v1.9.1