From dd1c643be561ebfbb521431b49d6e1e65bfcbd81 Mon Sep 17 00:00:00 2001 From: buli <137736985@qq.com> Date: 星期五, 14 七月 2023 14:49:07 +0800 Subject: [PATCH] fixconflict --- force-app/main/default/aura/WeeklyReport/WeeklyReportController.js | 297 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 297 insertions(+), 0 deletions(-) diff --git a/force-app/main/default/aura/WeeklyReport/WeeklyReportController.js b/force-app/main/default/aura/WeeklyReport/WeeklyReportController.js index 5e2cad0..b16b34d 100644 --- a/force-app/main/default/aura/WeeklyReport/WeeklyReportController.js +++ b/force-app/main/default/aura/WeeklyReport/WeeklyReportController.js @@ -1,21 +1,35 @@ ({ +<<<<<<< HEAD doInit: function (component, event, helper) { console.log('zhj 鏂版柟妗坵eeklyReport'); if (window.location.href.endsWith('weekly-report')) { +======= + doInit : function(component, event, helper) { + console.log('zhj 鏂版柟妗坵eeklyReport'); + if (window.location.href.endsWith("weekly-report")) { +>>>>>>> LEXCommunityLiJun helper.doinit(component, event, helper); } else { helper.hideCmp(component, event, helper); } +<<<<<<< HEAD component.set('v.showErrorInfo', false); }, createAopp: function (component, event, helper) { +======= + component.set("v.showErrorInfo", false); + }, + + createAopp : function(component, event, helper) { +>>>>>>> LEXCommunityLiJun var addRecordEvent = $A.get('e.force:createRecord'); addRecordEvent.setParams({ entityApiName: 'Agency_Opportunity__c', recordTypeId: '012100000006KW7' }); addRecordEvent.fire(); +<<<<<<< HEAD component.set('v.showErrorInfo', false); }, @@ -53,6 +67,45 @@ }, handleSubmit: function (component, event, helper) { +======= + component.set("v.showErrorInfo", false); + }, + + new_report : function(component, event, helper) { + component.find('save_button').set('v.label', '淇濆瓨骞舵柊寤�'); + component.set('v.data.Report_Date__c', ''); + helper.new_report(component, event, helper); + }, + + copy_button : function(component, event, helper) { + component.find('save_button').set('v.label', '淇濆瓨骞舵柊寤�'); + helper.copy_button(component, event, helper); + }, + + change_report_radio : function(component, event, helper) { + helper.change_report_radio(component, event, helper); + }, + + edit_button : function(component, event, helper) { + component.find('save_button').set('v.label', '淇濆瓨'); + helper.edit_button(component, event, helper); + }, + + createCon : function(component, event, helper) { + helper.createCon(component, event, helper); + }, + + showRequiredFields: function(component, event, helper){ + $A.util.removeClass(component.find("newOpportunityField"), "none"); + $A.util.removeClass(component.find("newOpportunityField"), "none"); + }, + + handleSuccess : function(component, event, helper) { + helper.handleSuccess(component, event, helper); + }, + + handleSubmit : function(component, event, helper) { +>>>>>>> LEXCommunityLiJun /* var params = event.getParams(); params.fields["Agency_Hospital__c"] = component.get('v.hospitalLinkId'); @@ -63,6 +116,7 @@ // vivek 娣诲姞楠岃瘉 start // helper.handleFormSubmit(component); var showValidationError = false; +<<<<<<< HEAD var fields = component.find('newOpportunityField'); var vaildationFailReason = ''; // var vaildationFailReason2 = ''; @@ -101,6 +155,41 @@ // PIPL update Yin Mingjie 21/02/2022 end }); +======= + var fields = component.find("newOpportunityField"); + var vaildationFailReason = ''; + // var vaildationFailReason2 = ''; + // var currentDate = new Date().toJSON().slice(0,10); + + // PIPL update Yin Mingjie 21/02/2022 start + let agencyReport = Object.create(null); + // PIPL update Yin Mingjie 21/02/2022 end + + 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 = "鍖荤敓鍖哄垎(鑱屽姟)涓嶈兘涓虹┖锛�"; + } + + } + // PIPL update Yin Mingjie 21/02/2022 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"); + } + // PIPL update Yin Mingjie 21/02/2022 end + }); + +>>>>>>> LEXCommunityLiJun if (!showValidationError) { // PIPL update Yin Mingjie 21/02/2022 start /* @@ -111,6 +200,7 @@ var agencyHospitalid = component.get('v.hospitalLinkId'); //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 start +<<<<<<< HEAD debugger; let hospitalName = ''; //璋冪敤鍚庣searchAgencyDataId鏂规硶鏌ヨ鍑哄尰闄笅闈㈡墍鏈夊鎴蜂汉鍛榙ataid @@ -177,6 +267,52 @@ } } ); +======= + 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.loginEdit',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" + }); + } + }) +>>>>>>> LEXCommunityLiJun //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 end // var arr = new Array(); // arr.push(agencyReport); @@ -185,12 +321,20 @@ // var token = component.get('v.AWStoken'); // var newUrl = component.get('v.AWSinsert'); +<<<<<<< HEAD +======= + +>>>>>>> LEXCommunityLiJun // component.set('v.login',true); // helper.insert_agencycontact(component,token,newUrl,data,agencyHospitalid,helper); // PIPL update Yin Mingjie 21/02/2022 end +<<<<<<< HEAD } else { +======= + }else{ +>>>>>>> LEXCommunityLiJun component.find('OppMessage').setError(vaildationFailReason); } // var eventFields = event.getParam("fields"); @@ -198,6 +342,7 @@ // component.find('recordEditForm').submit(eventFields); // vivek 娣诲姞楠岃瘉 end }, +<<<<<<< HEAD createCancel: function (component, event, helper) { helper.createCancel(component, event, helper); @@ -307,10 +452,114 @@ }, import: function (component, event, helper) { +======= + + createCancel : function(component, event, helper) { + helper.createCancel(component, event, helper); + }, + + yes_button : function(component, event, helper) { + component.set('v.confirm_status', 1); + helper.close_confirm(component, component.get('v.modal_confirm_title'), component.get('v.modal_confirm_text')); + }, + + no_button : function(component, event, helper) { + component.set('v.confirm_status', 2); + helper.close_confirm(component, component.get('v.modal_confirm_title'), component.get('v.modal_confirm_text')); + }, + + toggle_report : function(component, event, helper) { + helper.toggle_report(component); + }, + + save_report : function(component, event, helper) { + helper.save_report(component, event, helper); + }, + + select_date_change : function(component, event, helper) { + helper.select_date_change(component, event, helper); + }, + + select_agency_change : function(component, event, helper) { + helper.select_agency_change(component, event, helper); + }, + + hosChange : function(component, event, helper) { + var hospital_name = event.getParam("value"); + if (hospital_name.match(/(\S+\s)+/)) { + helper.searchHos(component, event, helper); + } else { + helper.hideSearch(component, event, helper); + } + }, + + selectHos : function(component, event, helper) { + helper.selectHos(component, event, helper); + helper.setOpportunity_cfilter(component); + }, + select_department : function(component, event, helper) { + helper.select_department(component, event, helper); + helper.setOpportunity_cfilter(component); + }, + select_purpose_type : function(component, event, helper) { + helper.select_purpose_type(component, event, helper); + }, + + doctor_change : function(component, event, helper) { + helper.doctor_change(component, event, helper); + }, + + opportunityChange : function(component, event, helper) { + helper.opportunityChange(component, event, helper); + }, + + productcategoryChange1 : function(component, event, helper) { + helper.productcategoryChange1(component, event, helper); + }, + productcategoryChange2 : function(component, event, helper) { + helper.productcategoryChange2(component, event, helper); + }, + productcategoryChange3 : function(component, event, helper) { + helper.productcategoryChange3(component, event, helper); + }, + stageNameChange : function(component, event, helper) { + helper.stageNameChange(component, event, helper); + }, + onDragOver : function(component, event, helper) { + event.preventDefault(); + }, + + onDrop : function(component, event, helper) { + event.stopPropagation(); + event.preventDefault(); + event.dataTransfer.dropEffect='copy'; + var files=event.dataTransfer.files; + helper.readFile(component,helper,files[0]); + }, + CreateRecord : function(component, event, helper){ + var files = event.getSource().get("v.files"); + // var fileInput = component.find("file").getElement(); + // var file = fileInput.files[0]; + helper.readFile(component,helper,files[0]); + component.set("v.showErrorInfo", false); + }, + + processFileContent : function(component,event,helper){ + helper.saveRecords(component,event,helper); + component.set("v.showErrorInfo", false); + }, + + cancel : function(component,event,helper){ + component.set("v.showMain",true); + }, + + import : function(component,event,helper){ +>>>>>>> LEXCommunityLiJun // component.find('file').click(); // console.log('lll'+component.find('file')); helper.showImport(component); }, +<<<<<<< HEAD exportDate: function (component, event, helper) { var stockData = component.get('v.reports_date'); console.log('瀵煎嚭鏁版嵁' + stockData); @@ -337,11 +586,38 @@ select_repores_date: function (component, event, helper) { helper.select_repores_date(component, event, helper); +======= + exportDate : function(component,event,helper){ + var stockData = component.get("v.reports_date"); + console.log('瀵煎嚭鏁版嵁'+stockData); + var csv = helper.convertArrayOfObjectsToCSV(component,stockData); + if (csv == null){return;} + + // ####--code for create a temp. <a> html tag [link tag] for download the CSV file--#### + 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 + // helper.showExport(component); + + }, + + export_condition : function(component,event,helper){ + helper.showExport(component); + }, + + select_repores_date : function(component,event,helper){ + helper.select_repores_date(component,event,helper); +>>>>>>> LEXCommunityLiJun // var stockData = component.get("v.reports_date"); // console.log('鏌ュ嚭鐨勬暟鎹�'+stockData); // helper.showExportDate(component,stockData); // this.export(component,event,helper); }, +<<<<<<< HEAD export: function (component, event, helper) { console.log('杩涘叆export'); var stockData = component.get('v.reports_date'); @@ -361,3 +637,24 @@ helper.exportErrorInfoHelper(component); } }); +======= + export : function(component,event,helper){ + console.log('杩涘叆export'); + var stockData = component.get("v.reports_date"); + console.log('鏌ュ嚭鐨勬暟鎹�'+stockData); + // helper.showExportDate(component,stockData); + // helper.showExport(component); + }, + 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); + helper.close_export(component); + }, + exportErrorInfo: function(component,event,helper){ + helper.exportErrorInfoHelper(component); + }, +}) +>>>>>>> LEXCommunityLiJun -- Gitblit v1.9.1