From 212967a5a65a12f9673170b80e3d8c766dcee5d0 Mon Sep 17 00:00:00 2001
From: unknown <sunxia@prec-tech.com>
Date: 星期四, 06 七月 2023 10:46:18 +0800
Subject: [PATCH] Merge branch 'LEX_dev' of http://47.92.229.245:8089/r/lightningupdate into LEX_dev
---
force-app/main/default/lwc/lexEquipmentRentalApply_FromSA/lexEquipmentRentalApply_FromSA.js | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/force-app/main/default/lwc/lexEquipmentRentalApply_FromSA/lexEquipmentRentalApply_FromSA.js b/force-app/main/default/lwc/lexEquipmentRentalApply_FromSA/lexEquipmentRentalApply_FromSA.js
index 0794680..5512f33 100644
--- a/force-app/main/default/lwc/lexEquipmentRentalApply_FromSA/lexEquipmentRentalApply_FromSA.js
+++ b/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());
}
}
\ No newline at end of file
--
Gitblit v1.9.1