From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte
---
force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunityController.js | 40 +++++++++++++---------------------------
1 files changed, 13 insertions(+), 27 deletions(-)
diff --git a/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunityController.js b/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunityController.js
index 263b5ea..7a076be 100644
--- a/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunityController.js
+++ b/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunityController.js
@@ -136,7 +136,7 @@
}
// component.set('v.fields',fields);
// component.set('v.staticResource',staticResource);
- component.set('v.showSpinner', false);
+ //component.set("v.showSpinner", false);
} else {
component.set('v.showSpinner', false);
helper.ShowToast({
@@ -144,36 +144,21 @@
type: 'error'
});
}
-<<<<<<< HEAD
} else {
component.set('v.showSpinner', false);
-=======
- // component.set('v.fields',fields);
- // component.set('v.staticResource',staticResource);
- //component.set("v.showSpinner", false);
- }else{
- component.set("v.showSpinner", false);
->>>>>>> LEXCommunityLiJun
helper.ShowToast({
message: 'Init error',
type: 'error'
});
}
}
-<<<<<<< HEAD
);
},
- saveClick: function (component, event, helper) {
-=======
- });
- },
- handleLoad: function(component, event, helper) {
- console.log('recordEditForm handleSuccess')
- component.set("v.showSpinner", false);
+ handleLoad: function (component, event, helper) {
+ console.log('recordEditForm handleSuccess');
+ component.set('v.showSpinner', false);
},
- saveClick : function(component, event, helper){
-
->>>>>>> LEXCommunityLiJun
+ saveClick: function (component, event, helper) {
let staticResource = component.get('v.staticResource');
let record_id = component.get('v.recordId');
let record_type_id = component.get('v.recordTypeId');
@@ -318,14 +303,15 @@
message: '璇峰厛閫夋嫨缁忛攢鍟嗗尰闄�',
type: 'warning'
});
-<<<<<<< HEAD
return;
-=======
- return
- }else if(item.field == 'Agency_Hospital__c' && item.value){
- component.set('v.agencyHospitalId',item.value)
- console.log('v.agencyHospitalId item.value = ' + item.value)
->>>>>>> LEXCommunityLiJun
+ } else if (
+ item.field == 'Agency_Hospital__c' &&
+ item.value
+ ) {
+ component.set('v.agencyHospitalId', item.value);
+ console.log(
+ 'v.agencyHospitalId item.value = ' + item.value
+ );
}
}
}
--
Gitblit v1.9.1