From d9f4adbe264c6597e18c2f4b1718a1d628835357 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Sun, 23 Jan 2022 17:43:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=9F=A5=E7=9C=8B=E5=BD=92?=
 =?UTF-8?q?=E6=A1=A3=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Api/ProjectController.php | 6 +++++-
 app/Models/ProjectTask.php                     | 7 +++++--
 resources/assets/js/store/actions.js           | 3 +--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/Api/ProjectController.php b/app/Http/Controllers/Api/ProjectController.php
index c2633c9b..9776da6e 100755
--- a/app/Http/Controllers/Api/ProjectController.php
+++ b/app/Http/Controllers/Api/ProjectController.php
@@ -1387,7 +1387,11 @@ class ProjectController extends AbstractController
         } elseif ($type == 'add') {
             $task->archivedTask(Carbon::now());
         }
-        return Base::retSuccess('操作成功', ['id' => $task->id]);
+        return Base::retSuccess('操作成功', [
+            'id' => $task->id,
+            'archived_at' => $task->archived_at,
+            'archived_userid' => $task->archived_userid,
+        ]);
     }
 
     /**
diff --git a/app/Models/ProjectTask.php b/app/Models/ProjectTask.php
index 5a5b7123..746a48e6 100644
--- a/app/Models/ProjectTask.php
+++ b/app/Models/ProjectTask.php
@@ -918,7 +918,6 @@ class ProjectTask extends AbstractModel
                 $this->archived_userid = User::userid();
                 $this->archived_follow = 0;
                 $this->addLog("任务取消归档");
-                $this->pushMsg('add', ProjectTask::oneTask($this->id));
             } else {
                 // 归档任务
                 if ($isAuto === true) {
@@ -932,8 +931,12 @@ class ProjectTask extends AbstractModel
                 $this->archived_userid = $userid;
                 $this->archived_follow = 0;
                 $this->addLog($logText, [], $userid);
-                $this->pushMsg('archived');
             }
+            $this->pushMsg('update', [
+                'id' => $this->id,
+                'archived_at' => $this->archived_at,
+                'archived_userid' => $this->archived_userid,
+            ]);
             self::whereParentId($this->id)->update([
                 'archived_at' => $this->archived_at,
                 'archived_userid' => $this->archived_userid,
diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js
index f1fc567b..745610c0 100644
--- a/resources/assets/js/store/actions.js
+++ b/resources/assets/js/store/actions.js
@@ -1191,7 +1191,7 @@ export default {
                     task_id: task_id,
                 },
             }).then(result => {
-                dispatch("forgetTask", task_id)
+                dispatch("saveTask", result.data)
                 dispatch("taskLoadEnd", task_id)
                 resolve(result)
             }).catch(e => {
@@ -2094,7 +2094,6 @@ export default {
                                     case 'filedelete':
                                         dispatch("forgetTaskFile", data.id)
                                         break;
-                                    case 'archived':
                                     case 'delete':
                                         dispatch("forgetTask", data.id)
                                         break;