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/NewAgencyOpportunity/NewAgencyOpportunityController.js | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunityController.js b/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunityController.js
index 671f8e3..263b5ea 100644
--- a/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunityController.js
+++ b/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunityController.js
@@ -144,17 +144,36 @@
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);
+ },
+ saveClick : function(component, event, helper){
+
+>>>>>>> LEXCommunityLiJun
let staticResource = component.get('v.staticResource');
let record_id = component.get('v.recordId');
let record_type_id = component.get('v.recordTypeId');
@@ -299,7 +318,14 @@
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
}
}
}
--
Gitblit v1.9.1