From 74e6a383570060d05c58f731fa7cd9f241db50bd Mon Sep 17 00:00:00 2001
From: twysparks <twysparks@163.com>
Date: 星期四, 20 四月 2023 14:07:42 +0800
Subject: [PATCH] Merge branch 'LEX_dev' of http://47.92.229.245:8089/r/lightningupdate into LEX_dev

---
 force-app/main/default/lwc/lexCancelSubmit/lexCancelSubmit.js |   31 +++++++++++++++++++++----------
 1 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/force-app/main/default/lwc/lexCancelSubmit/lexCancelSubmit.js b/force-app/main/default/lwc/lexCancelSubmit/lexCancelSubmit.js
index 85014ed..17d0216 100644
--- a/force-app/main/default/lwc/lexCancelSubmit/lexCancelSubmit.js
+++ b/force-app/main/default/lwc/lexCancelSubmit/lexCancelSubmit.js
@@ -1,3 +1,11 @@
+/*
+ * @Description: 
+ * @version: 
+ * @Author: chen jing wu
+ * @Date: 2023-04-07 09:02:03
+ * @LastEditors: chen jing wu
+ * @LastEditTime: 2023-04-11 11:17:24
+ */
 import { LightningElement,wire,track,api} from 'lwc';
 import { CurrentPageReference } from "lightning/navigation";
 import { CloseActionScreenEvent } from 'lightning/actions';
@@ -37,30 +45,23 @@
         }).then(result => {
             console.log(result);
             if (result != null) {
-                this.IsLoading = false;
                 this.ownerId = result.ownerId;
                 this.monthlyReportId = result.Id;
                 this.cancelSubmit();
                 console.log("end");
-                this.dispatchEvent(new CloseActionScreenEvent());
-                this.showToast();
-                this.updateRecordView(this.recordId);
-
                 //window.location.replace("https://ocsm--partial.sandbox.lightning.force.com/lightning/r/Monthly_Report__c/" + this.monthlyReportId + "/view");
             }
         }).catch(error => {
             console.log("error");
             console.log(error);
-        }).finally(() => {
-            
         });   
     }
 
-    showToast() {
+    showToast(msg,type) {
         const event = new ShowToastEvent({
             title: '',
-            message: '鍙栨秷鎻愪氦鎴愬姛锛�',
-            variant: 'success'
+            message: msg,
+            variant: type
         });
         this.dispatchEvent(event);
     }
@@ -72,10 +73,20 @@
         if(this.ownerId == UserInfo_Owner.Id) {
             cancel({
                 recordId: this.recordId
+            }).then(result=>{
+                if(result){
+                    this.showToast(result,"error");
+                }else{
+                    this.showToast("鎴愬姛","success");
+                    this.updateRecordView(this.recordId);
+                }
+                this.IsLoading = false;
+                this.dispatchEvent(new CloseActionScreenEvent());
             });
             console.log("321");
             } else {
             this.showToast("鍙湁鍛ㄦ姤鐨勬墍鏈変汉鍙互鍙栨秷","error");
+            this.dispatchEvent(new CloseActionScreenEvent());
             }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.1