github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2025-12-12 11:19:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf: 已删除任务操作文案及显示优化

Browse Source
This commit is contained in:
韦荣超 2022-03-11 17:42:47 +08:00
parent 7c82769448
commit c1fb67f143
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Models/ProjectTask.php
View File

@ -1232,7 +1232,11 @@ class ProjectTask extends AbstractModel
$task = $builder->first(); $task = $builder->first();
// //
if (empty($task)) { 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) { if ($archived === true && $task->archived_at != null) {
throw new ApiException('任务已归档', [ 'task_id' => $task_id ]); throw new ApiException('任务已归档', [ 'task_id' => $task_id ]);

2
resources/assets/js/pages/manage/components/TaskMenu.vue
View File

@ -52,7 +52,7 @@
<Icon type="ios-filing" />{{$L(task.archived_at ? '还原归档' : '归档')}} <Icon type="ios-filing" />{{$L(task.archived_at ? '还原归档' : '归档')}}
</div> </div>
</EDropdownItem> </EDropdownItem>
<EDropdownItem command="remove"> <EDropdownItem command="remove" v-if="!task.deleted_at">
<div class="item hover-del"> <div class="item hover-del">
<Icon type="md-trash" />{{$L('删除')}} <Icon type="md-trash" />{{$L('删除')}}
</div> </div>