From 36d15f189de2e83ce2576715dac30c3c260388dd Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:47:50 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReportController.js | 215 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 212 insertions(+), 3 deletions(-)
diff --git a/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReportController.js b/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReportController.js
index 733c1c0..c7cfa2b 100644
--- a/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReportController.js
+++ b/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReportController.js
@@ -38,8 +38,13 @@
},
showRequiredFields: function (component, event, helper) {
+<<<<<<< HEAD
+ $A.util.removeClass(component.find('newOpportunityField'), 'none');
+ $A.util.removeClass(component.find('newOpportunityField'), 'none');
+=======
$A.util.removeClass(component.find("newOpportunityField"), "none");
$A.util.removeClass(component.find("newOpportunityField"), "none");
+>>>>>>> LEXCommunityLiJun
},
handleSuccess: function (component, event, helper) {
@@ -49,6 +54,109 @@
handleSubmit: function (component, event, helper) {
event.preventDefault(); // stop form submission
var showValidationError = false;
+<<<<<<< HEAD
+ var fields = component.find('newOpportunityField');
+ var vaildationFailReason = '';
+ let agencyReport = Object.create(null);
+ fields.forEach(function (field) {
+ if (
+ field.get('v.fieldName') === 'Type__c' &&
+ $A.util.isEmpty(field.get('v.value'))
+ ) {
+ showValidationError = true;
+ vaildationFailReason = '鍒嗙被涓嶈兘涓虹┖锛�';
+ } else if (
+ field.get('v.fieldName') === 'Doctor_Division1__c' &&
+ $A.util.isEmpty(field.get('v.value'))
+ ) {
+ showValidationError = true;
+ if (vaildationFailReason != '') {
+ vaildationFailReason += '鍖荤敓鍖哄垎(鑱屽姟)涓嶈兘涓虹┖锛�';
+ } else {
+ vaildationFailReason = '鍖荤敓鍖哄垎(鑱屽姟)涓嶈兘涓虹┖锛�';
+ }
+ }
+ //SWAG-CF58C3 fy start
+ if (field.get('v.fieldName') === 'Name') {
+ agencyReport['name'] = field.get('v.value');
+ } else if (field.get('v.fieldName') === 'Type__c') {
+ agencyReport['type'] = field.get('v.value');
+ } else if (field.get('v.fieldName') === 'Doctor_Division1__c') {
+ agencyReport['doctorDivision1'] = field.get('v.value');
+ }
+ //SWAG-CF58C3 fy end
+ });
+ if (!showValidationError) {
+ //SWAG-CF58C3 fy start
+ var agencyHospitalid = component.get('v.hospitalLinkId');
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 start
+ debugger;
+ let hospitalName = '';
+ //璋冪敤鍚庣searchAgencyDataId鏂规硶鏌ヨ鍑哄尰闄笅闈㈡墍鏈夊鎴蜂汉鍛榙ataid
+ helper.CallBackAction(
+ component,
+ 'searchAgencyDataId',
+ {
+ hospitalId: agencyHospitalid
+ },
+ function (data) {
+ if (data.getState() == 'SUCCESS') {
+ var data = data.getReturnValue();
+ if (data.IsSuccess == true) {
+ let agencyContactIds = '';
+ if (
+ data.Message == '' &&
+ data.Data &&
+ data.Data.length > 0
+ ) {
+ hospitalName =
+ data.Data[0].Agency_Hospital__r.Name;
+ for (var i = 0; i < data.Data.length; i++) {
+ if (data.Data[i].AWS_Data_Id__c)
+ agencyContactIds +=
+ ',' + data.Data[i].AWS_Data_Id__c;
+ }
+ agencyContactIds =
+ agencyContactIds.substring(1);
+ agencyReport['agencyContactIds'] =
+ agencyContactIds;
+ } else {
+ agencyReport['agencyContactIds'] =
+ agencyContactIds;
+ }
+ var arr = new Array();
+ arr.push(agencyReport);
+ var requestData = JSON.stringify(arr);
+ // helper.set_aws_url(component,data,agencyHospitalid);
+
+ var token = component.get('v.AWStoken');
+ var newUrl = component.get('v.AWSinsert') + 'V2';
+
+ component.set('v.login', true);
+ helper.insert_agencycontact(
+ component,
+ token,
+ newUrl,
+ requestData,
+ agencyHospitalid,
+ helper,
+ hospitalName
+ );
+ } else {
+ helper.ShowToast({
+ message: data.message,
+ type: 'error'
+ });
+ }
+ } else {
+ helper.ShowToast({
+ message: 'searchAgency澶辫触',
+ type: 'error'
+ });
+ }
+ }
+ );
+=======
var fields = component.find("newOpportunityField");
var vaildationFailReason = '';
let agencyReport = Object.create(null);
@@ -123,6 +231,7 @@
});
}
})
+>>>>>>> LEXCommunityLiJun
//zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 end
// var arr = new Array();
// arr.push(agencyReport);
@@ -131,7 +240,11 @@
// var newUrl = component.get('v.AWSinsert');
// component.set('v.login',true);
// helper.insert_agencycontact(component,token,newUrl,data,agencyHospitalid,helper);
+<<<<<<< HEAD
+ //SWAG-CF58C3 fy end
+=======
//SWAG-CF58C3 fy end
+>>>>>>> LEXCommunityLiJun
// helper.newlyBuild(component, event, helper);
} else {
component.find('OppMessage').setError(vaildationFailReason);
@@ -144,12 +257,28 @@
yes_button: function (component, event, helper) {
component.set('v.confirm_status', 1);
+<<<<<<< HEAD
+ helper.close_confirm(
+ component,
+ component.get('v.modal_confirm_title'),
+ component.get('v.modal_confirm_text')
+ );
+=======
helper.close_confirm(component, component.get('v.modal_confirm_title'), component.get('v.modal_confirm_text'));
+>>>>>>> LEXCommunityLiJun
},
no_button: function (component, event, helper) {
component.set('v.confirm_status', 2);
+<<<<<<< HEAD
+ helper.close_confirm(
+ component,
+ component.get('v.modal_confirm_title'),
+ component.get('v.modal_confirm_text')
+ );
+=======
helper.close_confirm(component, component.get('v.modal_confirm_title'), component.get('v.modal_confirm_text'));
+>>>>>>> LEXCommunityLiJun
},
toggle_report: function (component, event, helper) {
@@ -165,13 +294,22 @@
},
select_agency_change: function (component, event, helper) {
+<<<<<<< HEAD
+ debugger;
+=======
debugger
+>>>>>>> LEXCommunityLiJun
helper.select_agency_change(component, event, helper);
},
hosChange: function (component, event, helper) {
+<<<<<<< HEAD
+ var hospital_name = event.getParam('value');
+ var hospital_nameld = component.get('v.UseProduct1s');
+=======
var hospital_name = event.getParam("value");
var hospital_nameld = component.get("v.UseProduct1s");
+>>>>>>> LEXCommunityLiJun
if (hospital_name.match(/(\S+\s)+/)) {
if (hospital_nameld != hospital_name) {
helper.searchHos(component, event, helper);
@@ -190,9 +328,15 @@
},
//浣跨敤浜у搧1
UseProduct1Change: function (component, event, helper) {
+<<<<<<< HEAD
+ var UseProduct1Name = event.getParam('value');
+ var UseProduct1Nameold = component.get('v.UseProduct1s');
+ debugger;
+=======
var UseProduct1Name = event.getParam("value");
var UseProduct1Nameold = component.get("v.UseProduct1s");
debugger
+>>>>>>> LEXCommunityLiJun
if (UseProduct1Name.match(/(\S+\s)+/)) {
if (UseProduct1Name != UseProduct1Nameold) {
helper.searchUseProduct1(component, event, helper);
@@ -210,8 +354,13 @@
},
//浣跨敤浜у搧2
UseProduct2Change: function (component, event, helper) {
+<<<<<<< HEAD
+ var UseProduct2Name = event.getParam('value');
+ var UseProduct2Nameold = component.get('v.UseProduct2s');
+=======
var UseProduct2Name = event.getParam("value");
var UseProduct2Nameold = component.get("v.UseProduct2s");
+>>>>>>> LEXCommunityLiJun
if (UseProduct2Name.match(/(\S+\s)+/)) {
if (UseProduct2Name != UseProduct2Nameold) {
helper.searchUseProduct2(component, event, helper);
@@ -232,8 +381,13 @@
},
//浣跨敤浜у搧3
UseProduct3Change: function (component, event, helper) {
+<<<<<<< HEAD
+ var UseProduct3Name = event.getParam('value');
+ var UseProduct3Nameold = component.get('v.UseProduct3s');
+=======
var UseProduct3Name = event.getParam("value");
var UseProduct3Nameold = component.get("v.UseProduct3s");
+>>>>>>> LEXCommunityLiJun
if (UseProduct3Name.match(/(\S+\s)+/)) {
if (UseProduct3Name != UseProduct3Nameold) {
helper.searchUseProduct3(component, event, helper);
@@ -250,7 +404,10 @@
helper.seletUseProduct3Change(component, event, helper);
},
+<<<<<<< HEAD
+=======
+>>>>>>> LEXCommunityLiJun
select_department: function (component, event, helper) {
helper.setOpportunity_cfilter(component);
},
@@ -272,24 +429,55 @@
helper.readFile(component, helper, files[0]);
},
CreateRecord: function (component, event, helper) {
+<<<<<<< HEAD
+ var files = event.getSource().get('v.files');
+ helper.readFile(component, helper, files[0]);
+ component.set('v.showErrorInfo', false);
+=======
var files = event.getSource().get("v.files");
helper.readFile(component, helper, files[0]);
- component.set("v.showErrorInfo",false);
+ component.set("v.showErrorInfo", false);
+>>>>>>> LEXCommunityLiJun
},
processFileContent: function (component, event, helper) {
helper.saveRecords(component, event, helper);
+<<<<<<< HEAD
+ component.set('v.showErrorInfo', false);
+ },
+
+ cancel: function (component, event, helper) {
+ component.set('v.showMain', true);
+=======
component.set("v.showErrorInfo", false);
},
cancel: function (component, event, helper) {
component.set("v.showMain", true);
+>>>>>>> LEXCommunityLiJun
},
import: function (component, event, helper) {
helper.showImport(component);
},
exportDate: function (component, event, helper) {
+<<<<<<< HEAD
+ var stockData = component.get('v.reports_date');
+ console.log('瀵煎嚭鏁版嵁' + stockData);
+ var csv = helper.convertArrayOfObjectsToCSV(component, stockData);
+ if (csv == null) {
+ return;
+ }
+
+ var universalBOM = '\uFEFF';
+ var hiddenElement = document.createElement('a');
+ hiddenElement.href =
+ 'data:text/csv;charset=utf-8,' + encodeURI(universalBOM + csv);
+ hiddenElement.target = '_self'; //
+ hiddenElement.download = 'ExportData.csv'; // CSV file Name* you can change it.[only name not .csv]
+ document.body.appendChild(hiddenElement); // Required for FireFox browser
+ hiddenElement.click(); // using click() js function to download csv file
+=======
var stockData = component.get("v.reports_date");
console.log('瀵煎嚭鏁版嵁' + stockData);
var csv = helper.convertArrayOfObjectsToCSV(component, stockData);
@@ -303,6 +491,7 @@
document.body.appendChild(hiddenElement); // Required for FireFox browser
hiddenElement.click(); // using click() js function to download csv file
+>>>>>>> LEXCommunityLiJun
},
export_condition: function (component, event, helper) {
helper.showExport(component);
@@ -313,6 +502,17 @@
},
export: function (component, event, helper) {
console.log('杩涘叆export');
+<<<<<<< HEAD
+ var stockData = component.get('v.reports_date');
+ console.log('鏌ュ嚭鐨勬暟鎹�' + stockData);
+ },
+ close_import: function (component, event, helper) {
+ component.set('v.showMain', true);
+ helper.close_import(component);
+ },
+ close_export: function (component, event, helper) {
+ component.set('v.showMain', true);
+=======
var stockData = component.get("v.reports_date");
console.log('鏌ュ嚭鐨勬暟鎹�' + stockData);
},
@@ -322,6 +522,7 @@
},
close_export: function (component, event, helper) {
component.set("v.showMain", true);
+>>>>>>> LEXCommunityLiJun
helper.close_export(component);
},
select_ConsumptionOfConsumables: function (component, event, helper) {
@@ -342,7 +543,15 @@
return_main_page: function (component, event, helper) {
window.open('/customer/', '_self');
},
- exportErrorInfo: function(component,event,helper){
+ exportErrorInfo: function (component, event, helper) {
helper.exportErrorInfoHelper(component);
},
-})
\ No newline at end of file
+ closeErrorDiv: function (component, event, helper) {
+ var errorDiv01 = component.find('errorDiv01');
+ $A.util.addClass(errorDiv01, 'slds-hide');
+ }
+<<<<<<< HEAD
+});
+=======
+})
+>>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1