diff --git a/app/Http/Controllers/Api/ProjectController.php b/app/Http/Controllers/Api/ProjectController.php index 7e607298..365f2dfd 100755 --- a/app/Http/Controllers/Api/ProjectController.php +++ b/app/Http/Controllers/Api/ProjectController.php @@ -187,8 +187,8 @@ class ProjectController extends AbstractController } // if ($project->name != $name) { - $project->name = $name; $project->addLog("修改项目名称:{$project->name} => {$name}"); + $project->name = $name; } if ($project->desc != $desc) { $project->desc = $desc; @@ -511,6 +511,7 @@ class ProjectController extends AbstractController // $list = $builder ->join('project_task_users', 'project_tasks.id', '=', 'project_task_users.task_pid') + ->whereNull('project_tasks.archived_at') ->where('project_tasks.parent_id', 0) ->where('project_task_users.userid', $user->userid) ->orderByDesc('project_tasks.id') diff --git a/app/Models/ProjectTask.php b/app/Models/ProjectTask.php index 74989be6..deeeb421 100644 --- a/app/Models/ProjectTask.php +++ b/app/Models/ProjectTask.php @@ -356,8 +356,8 @@ class ProjectTask extends AbstractModel } elseif (mb_strlen($data['name']) > 255) { throw new ApiException('任务描述最多只能设置255个字'); } - $this->name = $data['name']; $this->addLog("修改{任务}标题:{$this->name} => {$data['name']}"); + $this->name = $data['name']; } // 负责人 if (Arr::exists($data, 'owner')) { @@ -420,8 +420,8 @@ class ProjectTask extends AbstractModel } // 背景色 if (Arr::exists($data, 'color') && $this->color != $data['color']) { - $this->color = $data['color']; $this->addLog("修改任务背景色:{$this->color} => {$data['color']}"); + $this->color = $data['color']; } // 内容 if (Arr::exists($data, 'content')) { diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue index 173f0dcb..519e0aa8 100644 --- a/resources/assets/js/pages/manage/components/DialogWrapper.vue +++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue @@ -45,7 +45,7 @@ -