From 50ce6a5e5ae7ac6ce3e6281acca9a0db568306e6 Mon Sep 17 00:00:00 2001
From: unknown <sunxia@prec-tech.com>
Date: 星期三, 23 八月 2023 14:54:59 +0800
Subject: [PATCH] Merge branch 'LEX_dev' of http://47.92.229.245:8089/r/lightningupdate into LEX_dev
---
force-app/main/default/lwc/lexReturnDeliverySlip/lexReturnDeliverySlip.js | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/force-app/main/default/lwc/lexReturnDeliverySlip/lexReturnDeliverySlip.js b/force-app/main/default/lwc/lexReturnDeliverySlip/lexReturnDeliverySlip.js
index 01b9adc..383774e 100644
--- a/force-app/main/default/lwc/lexReturnDeliverySlip/lexReturnDeliverySlip.js
+++ b/force-app/main/default/lwc/lexReturnDeliverySlip/lexReturnDeliverySlip.js
@@ -5,7 +5,7 @@
import { ShowToastEvent } from 'lightning/platformShowToastEvent';
import { updateRecord } from 'lightning/uiRecordApi';
-import init from '@salesforce/apex/ReturnDeliverySlipController.init';
+import init from '@salesforce/apex/LexReturnDeliverySlipController.init';
export default class lexReturnDeliverySlip extends LightningElement {
@api recordId;
@@ -28,13 +28,17 @@
init({
recordId: this.recordId
}).then(result =>{
- console.log(JSON.stringify(result.raeSet));
- var check = result.raeSet && result.raeSet.length>0;
- if((check || result.rentalApplyEquipmentSetCnt - result.loanerReceivedNgNum > 0) && result.rentalApplyEquipmentSetCnt > 0){
- this.dispatchEvent(new CloseActionScreenEvent());
- window.open("/apex/EquipmentSetShippmentReceived4?id=" + result.name);
+ console.log('result==='+JSON.stringify(result));
+ if(result){
+ var check = result.raeSet && result.raeSet.length>0;
+ if((check || result.rentalApplyEquipmentSetCnt - result.loanerReceivedNgNum > 0) && result.rentalApplyEquipmentSetCnt > 0){
+ this.dispatchEvent(new CloseActionScreenEvent());
+ window.open("/apex/EquipmentSetShippmentReceived4?id=" + result.name);
+ }else{
+ this.showToast("娌℃湁鐢宠鑰呮敹鍒扮‘璁ょ殑鍊熷嚭澶囧搧", 'error');
+ }
}else{
- this.showToast("娌℃湁鐢宠鑰呮敹鍒扮‘璁ょ殑鍊熷嚭澶囧搧", 'error');
+ this.showToast("鏈煡鍒版暟鎹�", 'error');
}
}).catch(err=>{
this.dispatchEvent(new CloseActionScreenEvent());
--
Gitblit v1.9.1