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/lexRentalFixtureSetAssign/lexRentalFixtureSetAssign.js |   22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/force-app/main/default/lwc/lexRentalFixtureSetAssign/lexRentalFixtureSetAssign.js b/force-app/main/default/lwc/lexRentalFixtureSetAssign/lexRentalFixtureSetAssign.js
index 3c2f3ba..6127b72 100644
--- a/force-app/main/default/lwc/lexRentalFixtureSetAssign/lexRentalFixtureSetAssign.js
+++ b/force-app/main/default/lwc/lexRentalFixtureSetAssign/lexRentalFixtureSetAssign.js
@@ -6,6 +6,9 @@
 export default class lexRentalFixtureSetAssign extends LightningElement {
 	@api recordId
 	msg;
+	IsLoading = true;
+	IsShow = false;
+
 	@wire(CurrentPageReference)
 	getStateParameters(currentPageReference){
 		console.log("杩涘叆椤甸潰");
@@ -22,19 +25,20 @@
 		init({
 			recordId:this.recordId
 		}).then(result =>{
-			console.log(this.recordId);
-			console.log(result);
+			this.IsLoading = false;
 			let res = result.ra;
 			console.log("res==="+JSON.stringify(res));
 			if(res.Campaign__c != '' || res.Campaign__c != undefined){
 				if(res.CampaignStatus == '鍙栨秷'){
+					this.IsShow = true;
 					this.msg = '瀛︿細鍙栨秷锛屼笉鍙垎閰�';
 					return;
 				}
 			}
-
 			if(res.Repair__c != '' || res.Repair__c != undefined){
-				if(res.Repair_Final_Inspection_Date_F__c != null && res.Repair_Final_Inspection_Date_F__c !='' || (res.RC_return_to_office__c!=null && res.RC_return_to_office__c != '')){
+				if(res.Repair_Final_Inspection_Date_F__c != null && res.Repair_Final_Inspection_Date_F__c !='' || 
+					(res.RC_return_to_office__c!=null && res.RC_return_to_office__c != '')){
+					this.IsShow = true;
 					this.msg = '淇悊鏈夋渶缁堟娴嬫棩鎴栦慨鐞嗗搧杩旈�佹棩锛屼笉鍙垎閰�';
 					return;
 				}
@@ -46,16 +50,22 @@
 				if(res.Status__c == '鍙栨秷' && res.Rental_Apply_Equipment_Set_Cnt__c != 0){
 					window.open("/apex/RentalFixtureSetAssign?pt_recid=" + this.recordId); 
 					this.closeAction();
-				}else if((res.demo_purpose2__c == '瀛︿細灞曚細' || res.demo_purpose2__c == '璇鹃鐮旂┒' || res.demo_purpose2__c == '鍩硅涓績')&& res.Status__c == '鑽夋涓�'){
+				}else if((res.demo_purpose2__c == '瀛︿細灞曚細' || res.demo_purpose2__c == '璇鹃鐮旂┒' || res.demo_purpose2__c == '鍩硅涓績')
+					&& res.Status__c == '鑽夋涓�'){
+					this.IsShow = true;
 					this.msg = "涓嶈兘鍒嗛厤锛岃纭鐢宠鐨勭姸鎬�";
 					return
-				}else if((res.demo_purpose2__c =='璇曠敤锛堟棤璇环锛�' || res.demo_purpose2__c == '璇曠敤锛堟湁璇环锛�' || res.demo_purpose2__c =='鍔ㄧ墿瀹為獙' || res.demo_purpose2__c == '涓�鑸淮淇唬鐢�' || res.demo_purpose2__c== '淇濅慨鍚堝悓鐢ㄦ埛缁翠慨浠g敤' || res.demo_purpose2__c == '宸茶喘寰呰揣') && res.Status__c != '宸叉壒鍑�' && res.Status__c != '宸插嚭搴撴寚绀�'){
+				}else if((res.demo_purpose2__c =='璇曠敤锛堟棤璇环锛�' || res.demo_purpose2__c == '璇曠敤锛堟湁璇环锛�' || res.demo_purpose2__c =='鍔ㄧ墿瀹為獙' 
+					|| res.demo_purpose2__c == '涓�鑸淮淇唬鐢�' || res.demo_purpose2__c== '淇濅慨鍚堝悓鐢ㄦ埛缁翠慨浠g敤' || res.demo_purpose2__c == '宸茶喘寰呰揣') 
+					&& res.Status__c != '宸叉壒鍑�' && res.Status__c != '宸插嚭搴撴寚绀�'){
+					this.IsShow = true;
 					this.msg = "涓嶈兘鍒嗛厤锛岃纭鐢宠鐨勭姸鎬�";
 					return;
 				}else if(resultMsg == 'Fin'){
 					window.open("/apex/RentalFixtureSetAssign?pt_recid=" + this.recordId); 
 					this.closeAction();
 				}else{
+					this.IsShow = true;
 					this.msg = resultMsg;
 					return;
 				}

--
Gitblit v1.9.1