From 34d9607524cad4f765299b28b4f9423cc2fa9e32 Mon Sep 17 00:00:00 2001
From: 沙世明 <shashiming@prec-tech.com>
Date: 星期三, 23 三月 2022 18:07:42 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG
---
force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js b/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js
index 52e7b79..93c578b 100644
--- a/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js
+++ b/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js
@@ -57,7 +57,11 @@
var searchUrl = result.searchUrl;
this.search_core(token,searchUrl,payload,(result)=>{
if(result.status == '0'){
- this.to_contact_list(result,contactData,component);
+ if(result.object != null){
+ this.to_contact_list(result,contactData,component);
+ }else{
+ component.set('v.login',false);
+ }
}else{
this.error('AWS search status : ' + result.status);
component.set('v.login',false);
@@ -299,8 +303,8 @@
get_agency_person_name : function(component, agency_person_value) {
// PIPL update Yin Mingjie 21/02/2022 start
- // var allselectlist = component.get('v.allselectlist.AgencyPerson__c');
- var allselectlist = component.get('v.allselectlistAgencyPerson');
+ var allselectlist = component.get('v.allselectlist.AgencyPerson__c');
+ // var allselectlist = component.get('v.allselectlistAgencyPerson');
// PIPL update Yin Mingjie 21/02/2022 end
var new_label = '';
for (var i = 0; i < allselectlist.length; i++) {
@@ -665,13 +669,13 @@
component.find('save_button').set('v.disabled', true);
var Report_Date__c = component.get('v.data.Report_Date__c');
- alert('Report_Date__c'+Report_Date__c);
+ // alert('Report_Date__c'+Report_Date__c);
var Person_In_Charge2__c = "";
var Submit_date__c = "";
if (component.get('v.mode') == 'edit') {
// 鍛� Submit_date__c
Submit_date__c = component.get('v.select_report_data').Submit_date__c;
- alert('Submit_date__c'+Submit_date__c);
+ // alert('Submit_date__c'+Submit_date__c);
// 鎷呭綋 Person_In_Charge2__c
@@ -679,7 +683,7 @@
} else {
// 鍛� Submit_date__c
Submit_date__c = this.get_date_string(component.find('select_date').get('v.value'));
- alert('Submit_date__c'+Submit_date__c);
+ // alert('Submit_date__c'+Submit_date__c);
// 鎷呭綋 Person_In_Charge2__c
Person_In_Charge2__c = component.find('select_agency_person').get('v.value');
@@ -750,7 +754,7 @@
if (!Department_Cateogy__c) { error.push("绉戝 涓嶅瓨鍦�"); }
if (!doctor2__c) { error.push("鎷滆浜� 涓嶅瓨鍦�"); }
if (!Purpose_Type__c) { error.push("娲诲姩鍖哄垎 涓嶅瓨鍦�"); }
- if (!SupportNeeds__c) { error.push("鏀彺闇�姹� 涓嶅瓨鍦�"); }
+ // if (!SupportNeeds__c) { error.push("鏀彺闇�姹� 涓嶅瓨鍦�"); }
if (!Opportunity__c) { Opportunity__c = ""; }
if (!Product_Category1__c) { error.push("浜у搧鍖哄垎1 涓嶅瓨鍦�"); }
if (Purpose_Type__c && (Purpose_Type__c.substr(-3) == 'SIS' || Purpose_Type__c.substr(-3) == 'OPD')) {
@@ -770,7 +774,8 @@
if (component.get('v.mode') == 'edit') {
var Agency_Report__c = component.get('v.select_report_data').Id;
var action = component.get('c.editAgencyReport');
- alert("Purpose_Type:"+Purpose_Type__c+","+"SupportNeedsc:"+SupportNeeds__c);
+ debugger
+ // alert("Purpose_Type:"+Purpose_Type__c+","+"SupportNeedsc:"+SupportNeeds__c);
action.setParams({
"Agency_Report_Id" : Agency_Report__c,
"Department_Cateogy" : Department_Cateogy__c,
@@ -838,6 +843,8 @@
/* Save (New & Copy) */
var action = component.get('c.saveAgencyReport');
+ debugger;
+ // alert(SupportNeeds__c);
action.setParams({
"Department_Cateogy" : Department_Cateogy__c,
"Purpose_Type" : Purpose_Type__c,
@@ -1114,6 +1121,7 @@
searchHos : function(component, event, helper) {
var hospital_name = event.getParam("value");
var action = component.get("c.getHospitalList");
+ debugger;
action.setParams({"hospital_name": hospital_name});
action.setCallback(this, function(response) {
@@ -1140,6 +1148,7 @@
},
selectHos : function(component, event, helper) {
+ debugger
var hospital_list = component.find('hospital_list');
$A.util.removeClass(hospital_list, 'slds-is-open');
var accname = event.currentTarget.dataset.accname;
--
Gitblit v1.9.1