From 988f9735377909b6310301e582c15804e004783f Mon Sep 17 00:00:00 2001
From: 19626 <1962676589@qq.com>
Date: 星期六, 07 十月 2023 10:36:13 +0800
Subject: [PATCH] 近期修改cjw

---
 force-app/main/default/aura/taskManage/taskManageHelper.js |   92 +++++++++++++++++++++++++++++++++------------
 1 files changed, 67 insertions(+), 25 deletions(-)

diff --git a/force-app/main/default/aura/taskManage/taskManageHelper.js b/force-app/main/default/aura/taskManage/taskManageHelper.js
index f9d344b..2afe47f 100644
--- a/force-app/main/default/aura/taskManage/taskManageHelper.js
+++ b/force-app/main/default/aura/taskManage/taskManageHelper.js
@@ -928,7 +928,9 @@
         cmp.set("v.mergeIsOpen_Over", false);
         var selectedData = cmp.get("v.selectedData");
         if(!selectedData || selectedData.length <=1 ){
-            alert("璇烽�夋嫨涓ゆ潯浠ヤ笂鐨勪换鍔¤繘琛屽悎骞讹紒");
+            cmp.set("v.errorMessage", '璇烽�夋嫨涓ゆ潯浠ヤ笂鐨勪换鍔¤繘琛屽悎骞讹紒');
+            this.showErrorToast(cmp);
+            // alert("璇烽�夋嫨涓ゆ潯浠ヤ笂鐨勪换鍔¤繘琛屽悎骞讹紒");
             return;
         }
         var action = cmp.get("c.mergeTask");
@@ -990,7 +992,7 @@
                     this.showErrorToast(cmp);
                 }else{
                     
-                    window.open('/apex/PCLLostReportPage?pageStatus=Create&oppId=' + returnValue + '&lostType=澶卞崟','_blank');
+                    window.open('/apex/PCLLostReportPageLwc?pageStatus=Create&oppId=' + returnValue + '&lostType=澶卞崟','_blank');
                 }
 
             }else if (state === "ERROR") {
@@ -1052,45 +1054,61 @@
         if(IsGeneratePlan==false&&IsEventDefault==false){            
             //check 0            
             if(activityDateV==null||activityDateV==''||activityDateV==undefined){
-                alert('閫夋嫨鏈敓鎴愯鍒掔殑璇�,鍒欏繀椤诲~鍐� 鎷滆鏃�');
+                cmp.set("v.errorMessage", '閫夋嫨鏈敓鎴愯鍒掔殑璇�,鍒欏繀椤诲~鍐� 鎷滆鏃�');
+                this.showErrorToast(cmp);
+                // alert('閫夋嫨鏈敓鎴愯鍒掔殑璇�,鍒欏繀椤诲~鍐� 鎷滆鏃�');
                 return;
             }
             if(feedbackPlanDateV==null||feedbackPlanDateV==''||feedbackPlanDateV==undefined){
-                alert('閫夋嫨鏈敓鎴愯鍒掔殑璇�,鍒欏繀椤诲~鍐� 璁″垝鍙嶉鏃�');
+                cmp.set("v.errorMessage", '閫夋嫨鏈敓鎴愯鍒掔殑璇�,鍒欏繀椤诲~鍐� 璁″垝鍙嶉鏃�');
+                this.showErrorToast(cmp);
+                // alert('閫夋嫨鏈敓鎴愯鍒掔殑璇�,鍒欏繀椤诲~鍐� 璁″垝鍙嶉鏃�');
                 return;
             }
             //check 1
             var regx = new RegExp(/^\d{4}\-\d{2}\-\d{2}$/);
             if(!regx.test(activityDateV)){
-                alert('璇疯緭鍏ユ湁鏁堟椂闂�');
+                cmp.set("v.errorMessage", '璇疯緭鍏ユ湁鏁堟椂闂�');
+                this.showErrorToast(cmp);
+                // alert('璇疯緭鍏ユ湁鏁堟椂闂�');
                 return;
             }
 
             var regx = new RegExp(/^\d{4}\-\d{2}\-\d{2}$/);
             if(!regx.test(feedbackPlanDateV)){
-                alert('璇疯緭鍏ユ湁鏁堟椂闂�');
+                cmp.set("v.errorMessage", '璇疯緭鍏ユ湁鏁堟椂闂�');
+                this.showErrorToast(cmp);
+                // alert('璇疯緭鍏ユ湁鏁堟椂闂�');
                 return;
             }
             //check 2
             var today = new Date();
             if(today>=activityDate){
-                alert('璇疯緭鍏ヤ粖澶╀互鍚庣殑鏃ユ湡');
+                cmp.set("v.errorMessage", '璇疯緭鍏ヤ粖澶╀互鍚庣殑鏃ユ湡');
+                this.showErrorToast(cmp);
+                // alert('璇疯緭鍏ヤ粖澶╀互鍚庣殑鏃ユ湡');
                 return;
             }
             if(today>=feedbackPlanDate){
-                alert('璇疯緭鍏ヤ粖澶╀互鍚庣殑鏃ユ湡');
+                cmp.set("v.errorMessage", '璇疯緭鍏ヤ粖澶╀互鍚庣殑鏃ユ湡');
+                this.showErrorToast(cmp);
+                // alert('璇疯緭鍏ヤ粖澶╀互鍚庣殑鏃ユ湡');
                 return;
             }
             //2021-11-25  mzy  浠诲姟绠$悊鏀瑰杽  start
             //check 3
             //璁″垝鍙嶉鏃ヤ笉鑳借秴杩囧笇鏈涘畬鎴愭棩
             if(feedbackPlanDate>HopeCompletionDate){
-                alert('璁″垝鍙嶉鏃ヤ笉鑳借秴杩囧笇鏈涘畬鎴愭棩('+HopeCompletionDateV+')');
+                cmp.set("v.errorMessage", '璁″垝鍙嶉鏃ヤ笉鑳借秴杩囧笇鏈涘畬鎴愭棩('+HopeCompletionDateV+')');
+                this.showErrorToast(cmp);
+                // alert('璁″垝鍙嶉鏃ヤ笉鑳借秴杩囧笇鏈涘畬鎴愭棩('+HopeCompletionDateV+')');
                 return;
             }
 
             if(activityDate>HopeCompletionDate){
-                alert('鎷滆鏃ヤ笉鑳借秴杩囧笇鏈涘畬鎴愭棩('+HopeCompletionDateV+')');
+                cmp.set("v.errorMessage", '鎷滆鏃ヤ笉鑳借秴杩囧笇鏈涘畬鎴愭棩('+HopeCompletionDateV+')');
+                this.showErrorToast(cmp);
+                // alert('鎷滆鏃ヤ笉鑳借秴杩囧笇鏈涘畬鎴愭棩('+HopeCompletionDateV+')');
                 return;
             }
             //2021-11-25  mzy  浠诲姟绠$悊鏀瑰杽  end
@@ -1106,13 +1124,17 @@
             var estimatedFinishDate = cmp.get("v.estimatedFinishDate");
 
             if (!estimatedFinishDate) {
-                alert('璇疯緭鍏ラ璁″畬鎴愭椂闂达紒');
+                cmp.set("v.errorMessage", '璇疯緭鍏ラ璁″畬鎴愭椂闂达紒');
+                this.showErrorToast(cmp);
+                // alert('璇疯緭鍏ラ璁″畬鎴愭椂闂达紒');
                 return;
             }
 
             var latestFinishDate = row.latestFinishDate;
             if (estimatedFinishDate > latestFinishDate) {
-                alert('棰勮瀹屾垚鏃堕棿涓嶈兘瓒呰繃鏈�鏅氬畬鎴愭棩('+latestFinishDate+')');
+                cmp.set("v.errorMessage", '棰勮瀹屾垚鏃堕棿涓嶈兘瓒呰繃鏈�鏅氬畬鎴愭棩('+latestFinishDate+')');
+                this.showErrorToast(cmp);
+                // alert('棰勮瀹屾垚鏃堕棿涓嶈兘瓒呰繃鏈�鏅氬畬鎴愭棩('+latestFinishDate+')');
                 return;
             }
         }
@@ -1205,11 +1227,15 @@
         var cancelReason = cmp.get("v.cancelReason");
         var cancelReasonOther = cmp.get("v.cancelReasonOther");
         if(!cancelReason){
-            alert('璇疯緭鍏ュ彇娑堢悊鐢憋紒');
+            cmp.set("v.errorMessage", '璇疯緭鍏ュ彇娑堢悊鐢憋紒');
+            this.showErrorToast(cmp);
+            // alert('璇疯緭鍏ュ彇娑堢悊鐢憋紒');
             return;
         }
         if(cancelReason == '鍏朵粬' && !cancelReasonOther){
-            alert('鍙栨秷鐞嗙敱(閫夐」)涓哄叾浠栨椂璇疯緭鍏ュ彇娑堢悊鐢憋紙鍏朵粬锛夛紒');
+            cmp.set("v.errorMessage", '鍙栨秷鐞嗙敱(閫夐」)涓哄叾浠栨椂璇疯緭鍏ュ彇娑堢悊鐢憋紙鍏朵粬锛夛紒');
+            this.showErrorToast(cmp);
+            // alert('鍙栨秷鐞嗙敱(閫夐」)涓哄叾浠栨椂璇疯緭鍏ュ彇娑堢悊鐢憋紙鍏朵粬锛夛紒');
             return;
 
         }
@@ -1260,11 +1286,15 @@
         var delayReasonOther = cmp.get("v.delayReasonOther");
 
         if(!delayReason){
-            alert('璇疯緭鍏ュ欢鏈熺悊鐢憋紒');
+            cmp.set("v.errorMessage", '璇疯緭鍏ュ欢鏈熺悊鐢憋紒');
+            this.showErrorToast(cmp);
+            // alert('璇疯緭鍏ュ欢鏈熺悊鐢憋紒');
             return;
         }
         if(delayReason == '鍏朵粬' && !delayReasonOther){
-            alert('寤舵湡鐞嗙敱(閫夐」)涓哄叾浠栨椂璇疯緭鍏ュ欢鏈熺悊鐢憋紙鍏朵粬锛夛紒');
+            cmp.set("v.errorMessage", '寤舵湡鐞嗙敱(閫夐」)涓哄叾浠栨椂璇疯緭鍏ュ欢鏈熺悊鐢憋紙鍏朵粬锛夛紒');
+            this.showErrorToast(cmp);
+            // alert('寤舵湡鐞嗙敱(閫夐」)涓哄叾浠栨椂璇疯緭鍏ュ欢鏈熺悊鐢憋紙鍏朵粬锛夛紒');
             return;
         }
         // 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc Start
@@ -1274,13 +1304,17 @@
             var estimatedFinishDate = cmp.get("v.estimatedFinishDate");
 
             if (!estimatedFinishDate) {
-                alert('璇疯緭鍏ュ欢鏈熻嚦鏃堕棿锛�');
+                cmp.set("v.errorMessage", '璇疯緭鍏ュ欢鏈熻嚦鏃堕棿锛�');
+                this.showErrorToast(cmp);
+                // alert('璇疯緭鍏ュ欢鏈熻嚦鏃堕棿锛�');
                 return;
             }
 
             var createdAfter3Month = tempdata.createdAfter3Month;
             if (estimatedFinishDate > createdAfter3Month) {
-                alert('寤舵湡鑷虫椂闂翠笉鑳借秴杩�('+createdAfter3Month+')');
+                cmp.set("v.errorMessage", '寤舵湡鑷虫椂闂翠笉鑳借秴杩�('+createdAfter3Month+')');
+                this.showErrorToast(cmp);
+                // alert('寤舵湡鑷虫椂闂翠笉鑳借秴杩�('+createdAfter3Month+')');
                 return;
             }
         }
@@ -1338,7 +1372,9 @@
         cmp.set("v.assignIsOpen", false);
         var assignee =  cmp.get('v.subTempTask.assignee__c');
         if(!assignee){
-            alert('璇疯緭鍏ユ柊琚垎閰嶈�咃紒');
+            cmp.set("v.errorMessage", '璇疯緭鍏ユ柊琚垎閰嶈�咃紒');
+            this.showErrorToast(cmp);
+            // alert('璇疯緭鍏ユ柊琚垎閰嶈�咃紒');
             return;
         }
         var action = cmp.get("c.resetAssignee");
@@ -1364,6 +1400,8 @@
                     cmp.set('v.data2', rows);
                     cmp.set('v.data2Copy',rows);
                     cmp.set("v.assignIsOpen", false);
+                    cmp.set("v.successMessage", '閲嶆柊鍒嗛厤鎴愬姛锛�');
+                    this.showSuccessToast(cmp);
                 }else{
                     cmp.set("v.errorMessage", res.result);
                     this.showErrorToast(cmp);
@@ -1382,7 +1420,9 @@
         cmp.set("v.assignIsOpen_Over", false);
         var assignee =  cmp.get('v.subTempTask.assignee__c');
         if(!assignee){
-            alert('璇疯緭鍏ユ柊琚垎閰嶈�咃紒');
+            cmp.set("v.errorMessage", '璇疯緭鍏ユ柊琚垎閰嶈�咃紒');
+            this.showErrorToast(cmp);
+            // alert('璇疯緭鍏ユ柊琚垎閰嶈�咃紒');
             return;
         }
         var action = cmp.get("c.resetAssignee_Owner");
@@ -1410,6 +1450,8 @@
                     cmp.set('v.data', rows);
                     cmp.set('v.dataCopy',rows);
                     cmp.set("v.assignIsOpen_Over", false);
+                    cmp.set("v.successMessage", '閲嶆柊鍒嗛厤鎴愬姛锛�');
+                    this.showSuccessToast(cmp);
                 }else{
                     cmp.set("v.errorMessage", res.result);
                     this.showErrorToast(cmp);
@@ -1425,11 +1467,11 @@
     //寮瑰嚭 鎴愬姛鎻愮ず
     showSuccessToast : function(cmp) {
         $A.util.removeClass(cmp.find('successDiv'), 'slds-hide');
-        window.setTimeout($A.getCallback(function() {
-            $A.util.addClass(cmp.find('successDiv'), 'slds-hide');
-            }),
-            5000
-        );
+        // window.setTimeout($A.getCallback(function() {
+        //     $A.util.addClass(cmp.find('successDiv'), 'slds-hide');
+        //     }),
+        //     5000
+        // );
     },
     //寮瑰嚭 閿欒鎻愮ず
     showErrorToast : function(cmp) {

--
Gitblit v1.9.1