fixconflict

buli

2023-07-14 36d15f189de2e83ce2576715dac30c3c260388dd

 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
                    }
                }
            }