From c1fb67f143491969aaced86065d452d69cd19568 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A6=E8=8D=A3=E8=B6=85?= <302645122@qq.com>
Date: Fri, 11 Mar 2022 17:42:47 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E5=B7=B2=E5=88=A0=E9=99=A4=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=93=8D=E4=BD=9C=E6=96=87=E6=A1=88=E5=8F=8A=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Models/ProjectTask.php                               | 6 +++++-
 resources/assets/js/pages/manage/components/TaskMenu.vue | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/Models/ProjectTask.php b/app/Models/ProjectTask.php
index bcc1a5b15..75cefe50b 100644
--- a/app/Models/ProjectTask.php
+++ b/app/Models/ProjectTask.php
@@ -1232,7 +1232,11 @@ class ProjectTask extends AbstractModel
         $task = $builder->first();
         //
         if (empty($task)) {
-            throw new ApiException('任务不存在', [ 'task_id' => $task_id ], -4002);
+            if(self::whereId(intval($task_id))->withTrashed()->exists()){
+                throw new ApiException('任务已删除，不可编辑', [ 'task_id' => $task_id ], -4002);
+            }else{
+                throw new ApiException('任务不存在', [ 'task_id' => $task_id ], -4002);
+            }
         }
         if ($archived === true && $task->archived_at != null) {
             throw new ApiException('任务已归档', [ 'task_id' => $task_id ]);
diff --git a/resources/assets/js/pages/manage/components/TaskMenu.vue b/resources/assets/js/pages/manage/components/TaskMenu.vue
index 8e2f0a028..1014a2458 100644
--- a/resources/assets/js/pages/manage/components/TaskMenu.vue
+++ b/resources/assets/js/pages/manage/components/TaskMenu.vue
@@ -52,7 +52,7 @@
                                 <Icon type="ios-filing" />{{$L(task.archived_at ? '还原归档' : '归档')}}
                             </div>
                         </EDropdownItem>
-                        <EDropdownItem command="remove">
+                        <EDropdownItem command="remove" v-if="!task.deleted_at">
                             <div class="item hover-del">
                                 <Icon type="md-trash" />{{$L('删除')}}
                             </div>