Merge branch 'LEX_dev' of http://47.92.229.245:8089/r/lightningupdate into ...

黄千龙

2023-05-10 d7393addacb96c1e5eb114ede852aa777df45232

Merge branch 'LEX_dev' of http://47.92.229.245:8089/r/lightningupdate into LEX_dev

 force-app/main/default/lwc/lexCancelApply/lexCancelApply.js

@@ -37,8 +37,7 @@
            label: 'this is the aria-label value',
            
        }).then(cancel=>{
      //       this.IsLoading=false;
            // this.dispatchEvent(new CloseActionScreenEvent());
	    	
            if(cancel) {
                cancelApply({
                    taId : this.recordId
@@ -55,6 +54,9 @@

                    
                });
            } else {
                this.IsLoading=false;
                this.dispatchEvent(new CloseActionScreenEvent());
            }
            
        });
@@ -65,8 +67,9 @@
    async cancelSubmit(){
        if(this.cancelResult == '1') {
            await this.showToast("",'取消成功',"success"); 
            window.location.href = window.location;
					
            setTimeout(function(){
                window.location.href = window.location;
            }, 1500 )
        } else {
            console.log("result:",this.cancelResult);
            await this.showToast("",this.cancelResult,"warning");     

 force-app/main/default/lwc/lexRentalApplyESetRefreshStatus/lexRentalApplyESetRefreshStatus.js

@@ -34,7 +34,6 @@
        }).then(result => {
            this.refreshResult = result;
            
			
            this.cancelSubmit().then(res=>{
                this.IsLoading=false;
                this.dispatchEvent(new CloseActionScreenEvent());

 force-app/main/default/lwc/lexSubmitApprovalProcess/lexSubmitApprovalProcess.js

@@ -43,8 +43,11 @@
    }
    
    cancelSubmit(){
		
        if (this.transferApplyPermission == false) {
            this.showToast('','没有提交申请的权限','warning');
            this.IsLoading=false;
            this.dispatchEvent(new CloseActionScreenEvent());
        } else{
            LightningConfirm.open({
                message: '一旦提交此记录以待批准，根据您的设置您可能不再能够编辑此记录或将他从批准过程中调回。是否继续？',
@@ -55,14 +58,21 @@
                    submitApply({taId:this.recordId}).then(submitRes=>{
                        if(submitRes == '1'){
                            this.showToast('','提交成功','success');
                            window.location.href = window.location;
                            setTimeout(function(){
                                window.location.href = window.location;
                            }, 1500 );
                        }else{
                            this.showToast("",submitRes,"warning");
                        }
                        this.IsLoading=false;
                        this.dispatchEvent(new CloseActionScreenEvent());
						
                    });    
                    this.IsLoading=false;
                    this.dispatchEvent(new CloseActionScreenEvent());
                } else{
                    this.IsLoading=false;
                    this.dispatchEvent(new CloseActionScreenEvent());
                }
	        	
            });
            
        }