From 2cc792b5e113befc3c569ebb7eae9c8d03b9d0b6 Mon Sep 17 00:00:00 2001
From: chenjingwu <chenjingwu@prec-tech.com>
Date: 星期五, 12 四月 2024 14:41:57 +0800
Subject: [PATCH] 123

---
 force-app/main/default/lwc/lexSubmitExtensionApprovalProcess/lexSubmitExtensionApprovalProcess.js |   69 +++++++++++++++++++---------------
 1 files changed, 39 insertions(+), 30 deletions(-)

diff --git a/force-app/main/default/lwc/lexSubmitExtensionApprovalProcess/lexSubmitExtensionApprovalProcess.js b/force-app/main/default/lwc/lexSubmitExtensionApprovalProcess/lexSubmitExtensionApprovalProcess.js
index 54846fe..eefc389 100644
--- a/force-app/main/default/lwc/lexSubmitExtensionApprovalProcess/lexSubmitExtensionApprovalProcess.js
+++ b/force-app/main/default/lwc/lexSubmitExtensionApprovalProcess/lexSubmitExtensionApprovalProcess.js
@@ -3,6 +3,7 @@
 import { CloseActionScreenEvent } from 'lightning/actions';
 
 import init from '@salesforce/apex/SubmitExtensionApprovalProcessController.init';
+import extension_approval_processCheck from '@salesforce/apex/RentalApplyWebService.extension_approval_processCheck'
 export default class lexSubmitExtensionApprovalProcess extends LightningElement {
 	@api
 	recordId;
@@ -23,45 +24,53 @@
 		init({
 			recordId:this.recordId
 		}).then(result=>{
+			console.log(result);
 			var today = new Date();
 			//杩藉姞澶囧搧鐢宠鐘舵�佺‘璁わ紝宸茬粡鎻愪氦杩囩殑鐢宠锛屼笉鑳介噸澶嶆彁浜tatus__c 
 			if(result.ExtensionStatus == '濉啓瀹屾瘯' || result.ExtensionStatus == '鐢宠涓�') {
 				alert('璇风‘璁ゅ欢鏈熺敵璇风姸鎬侊紝宸茬粡鎻愪氦杩囩殑鐢宠锛屼笉鑳介噸澶嶆彁浜�');
 				return; 
 			}
-
-			var rs1 = sforce.apex.execute("RentalApplyWebService", "extension_approval_processCheck", {rentalApplyId: this.recordId});
-			if(rs1 != '1'){
-				if(rs1 == '2'){
-					//杩斿洖鍊间负2锛屽垽鏂叆鍙d负浠庡崟杩樻槸涓诲崟锛屽鏋滄槸浠庡崟锛岄偅涔堝氨闇�瑕佽烦鍘熸潵鐨勫崟涓欢鏈熼〉闈� 
-					if(result.RootRentalApply == '' || result.RootRentalApply == null){
-						window.open("/apex/RentalApplyMultiPostpone?parentId=" + this.recordId); 
-					}else {
-						window.open("/apex/RentalApplyExtensions?parentId=" + this.recordId); 
+			extension_approval_processCheck({rentalApplyId:this.recordId}).then( result =>{
+				if(result != '1'){
+					if(result == '2'){
+						//杩斿洖鍊间负2锛屽垽鏂叆鍙d负浠庡崟杩樻槸涓诲崟锛屽鏋滄槸浠庡崟锛岄偅涔堝氨闇�瑕佽烦鍘熸潵鐨勫崟涓欢鏈熼〉闈� 
+						if(result.RootRentalApply == '' || result.RootRentalApply == null){
+							window.open("/apex/RentalApplyMultiPostpone?parentId=" + this.recordId); 
+						}else {
+							window.open("/apex/RentalApplyExtensions?parentId=" + this.recordId); 
+						}
+					}else{
+						alert(result);
+						this.dispatchEvent(new CloseActionScreenEvent());
+						return
 					}
 				}else{
-					alert(rs1);
-					return
+					if(result.demoPurpose2 == '鍗忚鍊熺敤'){
+						alert('璇峰湪[闄勪欢]鍐呬笂浼犳柊鐨勫悎鍚岄檮浠讹紝骞朵緷鎹悎鍚屽唴鏈熼檺杩涜鏃ユ湡濉啓锛屼箣鍚庢彁浜ゅ鎵�'); 
+						return;
+					}
+					if(result.AgreementBorrowingExtensionDate =='' || result.AgreementBorrowingExtensionDate == null){
+						alert('鍗忚鍊熺敤鐨勫欢鏈熺敵璇风殑銆愬崗璁�熺敤寤舵湡鏃ユ湡銆戜笉鑳戒负绌�'); 
+						return;
+					}
+					if(result.AgreementBorrowingExtensionDate <= result.ReturnDadelineFinal){
+						alert('鍗忚鍊熺敤鐨勫欢鏈熺敵璇风殑銆愬崗璁�熺敤寤舵湡鏃ユ湡銆戝繀椤诲ぇ浜庢渶鏂伴瀹氬綊杩樻棩');
+						return; 
+					}
+					if(result.AgreementBorrowingExtensionDate <= today ){
+						alert('鍗忚鍊熺敤鐨勫欢鏈熺敵璇风殑銆愬崗璁�熺敤寤舵湡鏃ユ湡銆戝繀椤诲ぇ浜庝粖澶�');
+						return; 
+					}
 				}
-			}else{
-				if(result.demoPurpose2 == '鍗忚鍊熺敤'){
-					alert('璇峰湪[闄勪欢]鍐呬笂浼犳柊鐨勫悎鍚岄檮浠讹紝骞朵緷鎹悎鍚屽唴鏈熼檺杩涜鏃ユ湡濉啓锛屼箣鍚庢彁浜ゅ鎵�'); 
-					return;
-				}
-				if(result.AgreementBorrowingExtensionDate =='' || result.AgreementBorrowingExtensionDate == null){
-					alert('鍗忚鍊熺敤鐨勫欢鏈熺敵璇风殑銆愬崗璁�熺敤寤舵湡鏃ユ湡銆戜笉鑳戒负绌�'); 
-					return;
-				}
-				if(result.AgreementBorrowingExtensionDate <= result.ReturnDadelineFinal){
-					alert('鍗忚鍊熺敤鐨勫欢鏈熺敵璇风殑銆愬崗璁�熺敤寤舵湡鏃ユ湡銆戝繀椤诲ぇ浜庢渶鏂伴瀹氬綊杩樻棩');
-					return; 
-				}
-				if(result.AgreementBorrowingExtensionDate <= today ){
-					alert('鍗忚鍊熺敤鐨勫欢鏈熺敵璇风殑銆愬崗璁�熺敤寤舵湡鏃ユ湡銆戝繀椤诲ぇ浜庝粖澶�');
-					return; 
-				}
-			}
-			window.open("/apex/RentalApplyExtensions?parentId=" + this.recordId); 
+				window.open("/apex/RentalApplyExtensions?parentId=" + this.recordId); 
+				this.dispatchEvent(new CloseActionScreenEvent());
+			}).catch(err=>{
+				console.log('extension_approval_processCheckerr==='+err);
+			})
+		})			
+		.catch(err=>{
+			console.log('error====>'+err);
 		})
 	}
 }
\ No newline at end of file

--
Gitblit v1.9.1