From 14a4679b3498e0a08041637a1b95a34282620cbe Mon Sep 17 00:00:00 2001
From: twysparks <twysparks@163.com>
Date: 星期一, 15 五月 2023 14:29:01 +0800
Subject: [PATCH] Merge branch 'LEX_dev' of http://47.92.229.245:8089/r/lightningupdate into LEX_dev
---
force-app/main/default/lwc/lexSplitApplyFlowLWC/lexSplitApplyFlowLWC.js | 3 ++-
force-app/main/default/lwc/lexQISIntakeuniversalcode/lexQISIntakeuniversalcode.js | 2 +-
force-app/main/default/lwc/lexQisUniversalFailureCode/lexQisUniversalFailureCode.js | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/force-app/main/default/lwc/lexQISIntakeuniversalcode/lexQISIntakeuniversalcode.js b/force-app/main/default/lwc/lexQISIntakeuniversalcode/lexQISIntakeuniversalcode.js
index f3236b0..5ec60dc 100644
--- a/force-app/main/default/lwc/lexQISIntakeuniversalcode/lexQISIntakeuniversalcode.js
+++ b/force-app/main/default/lwc/lexQISIntakeuniversalcode/lexQISIntakeuniversalcode.js
@@ -45,7 +45,7 @@
console.log('result2='+this.paeId);
}
var url = '';
- if (result!=null){
+ if (result!=null&& this.paeId!=null){
url = "/apex/PAEDecisionRecord?Id="+this.paeId+"&QISReportId="+this.qisReportId +"&RecordTypeIds="+RecordTypeId ;
} else {
url = "/apex/PAEDecisionRecord?QISReportId="+this.qisReportId +"&RecordTypeIds="+RecordTypeId;
diff --git a/force-app/main/default/lwc/lexQisUniversalFailureCode/lexQisUniversalFailureCode.js b/force-app/main/default/lwc/lexQisUniversalFailureCode/lexQisUniversalFailureCode.js
index f368b27..c08db18 100644
--- a/force-app/main/default/lwc/lexQisUniversalFailureCode/lexQisUniversalFailureCode.js
+++ b/force-app/main/default/lwc/lexQisUniversalFailureCode/lexQisUniversalFailureCode.js
@@ -44,7 +44,7 @@
console.log('result='+this.paeId);
}
var url = '';
- if (result!=null){
+ if (result!=null&& this.paeId!=null){
url = "/apex/PAEDecisionRecord?Id="+this.paeId+"&QISReportId="+this.qisReportId +"&RecordTypeIds="+RecordTypeId ;
} else {
url = "/apex/PAEDecisionRecord?QISReportId="+this.qisReportId +"&RecordTypeIds="+RecordTypeId;
diff --git a/force-app/main/default/lwc/lexSplitApplyFlowLWC/lexSplitApplyFlowLWC.js b/force-app/main/default/lwc/lexSplitApplyFlowLWC/lexSplitApplyFlowLWC.js
index fd326ad..758f066 100644
--- a/force-app/main/default/lwc/lexSplitApplyFlowLWC/lexSplitApplyFlowLWC.js
+++ b/force-app/main/default/lwc/lexSplitApplyFlowLWC/lexSplitApplyFlowLWC.js
@@ -15,12 +15,13 @@
connectedCallback(){
if (this.recordId && JSON.stringify(this.rentalApplyIds)) {
window.open("/apex/RentalApplySplit?objId="+this.recordId+"&raesIds="+this.rentalApplyIds, 'RentalApplySplit', 'width=600,height=200');
+ this.closeAction();
}else{
this.msg = '璇烽�夋嫨鍊熷嚭澶囧搧涓�瑙堣褰�';
this.IsLoading = false;
}
}
- closeAction(event) {
+ closeAction() {
//杩斿洖褰撳墠鐨勫鍝佺敵璇�
window.open("/"+this.recordId,'_self');
}
--
Gitblit v1.9.1