Merge branch 'LEX_dev' of http://47.92.229.245:8089/r/lightningupdate into ...

unknown

2023-07-06 212967a5a65a12f9673170b80e3d8c766dcee5d0

 force-app/main/default/lwc/lexEquipmentRentalApply_FromSA/lexEquipmentRentalApply_FromSA.js

@@ -51,18 +51,18 @@
                                return;
                            }else{
                                const defaultValues = encodeDefaultFieldValues({
                                    Statu_Achievements: result.achievement,
                                    Statu_Achievements__c: result.achievement,
                                    retURL:this.recordId,
                                    Hospital: result.hospital,
                                    Hospital__c: result.hospital,
                                    Name:'*',
                                    Strategic_dept: result.departmentClass,
                                    Account:result.oppClassName,
                                    Demo_purpose1:'产品试用',
                                    demo_purpose2:'已购待货',
                                    Person_In_Charge:res.lastName + res.firstName,
                                    applyUser:res.lastName + res.firstName,
                                    Loaner_received_staff:res.lastName + res.firstName,
                                    Follow_UP_Opp:result.opportunity
                                    Strategic_dept__c: result.departmentClass,
                                    Account__c:result.oppClassName,
                                    Demo_purpose1__c:'产品试用',
                                    demo_purpose2__c:'已购待货',
                                    Person_In_Charge__c:res.lastName + res.firstName,
                                    applyUser__c:res.lastName + res.firstName,
                                    Loaner_received_staff__c:res.lastName + res.firstName,
                                    Follow_UP_Opp__c:result.opportunity
                                });
    
                                this[NavigationMixin.Navigate]({
@@ -85,7 +85,7 @@
                    console.log(error);
                })
            }else{
                this.showToast(res,'warning');
                this.showToast(res,'error');
                return;
            }
        })
@@ -94,10 +94,11 @@

    showToast(message, type) {
        const evt = new ShowToastEvent({
            title: '',
            title: 'Error',
            message: message,
            variant: type
        });
        this.dispatchEvent(evt);
        this.dispatchEvent(new CloseActionScreenEvent());
    }
}