From d54b469683ae25eb1c1d018ce2b6d291b84d7c68 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Mon, 21 Jun 2021 13:32:35 +0800
Subject: [PATCH] no message

---
 .../pages/manage/components/ProjectList.vue   |  7 +----
 .../js/pages/manage/components/TaskDetail.vue | 28 +++++++++++++++++--
 resources/assets/js/store/state.js            |  2 +-
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/resources/assets/js/pages/manage/components/ProjectList.vue b/resources/assets/js/pages/manage/components/ProjectList.vue
index c454b6e5..2a2ef0b2 100644
--- a/resources/assets/js/pages/manage/components/ProjectList.vue
+++ b/resources/assets/js/pages/manage/components/ProjectList.vue
@@ -542,7 +542,7 @@ export default {
         },
 
         completedList() {
-            const {projectId, tasks, searchText, projectCompleteShow} = this;
+            const {projectId, tasks, searchText} = this;
             const array = tasks.filter((task) => {
                 if (task.parent_id > 0) {
                     return false;
@@ -550,11 +550,6 @@ export default {
                 if (task.project_id != projectId) {
                     return false;
                 }
-                if (!projectCompleteShow) {
-                    if (task.complete_at) {
-                        return false;
-                    }
-                }
                 if (searchText) {
                     if (!$A.strExists(task.name, searchText) && !$A.strExists(task.desc, searchText)) {
                         return false;
diff --git a/resources/assets/js/pages/manage/components/TaskDetail.vue b/resources/assets/js/pages/manage/components/TaskDetail.vue
index 950cc4a5..40fe1d80 100644
--- a/resources/assets/js/pages/manage/components/TaskDetail.vue
+++ b/resources/assets/js/pages/manage/components/TaskDetail.vue
@@ -94,8 +94,8 @@
                 <Icon v-if="taskDetail.complete_at" class="icon completed" type="md-checkmark-circle" @click="updateData('uncomplete')"/>
                 <Icon v-else class="icon" type="md-radio-button-off" @click="updateData('complete')"/>
                 <div class="nav">
-                    <p v-if="taskDetail.project_name">{{taskDetail.project_name}}</p>
-                    <p v-if="taskDetail.column_name">{{taskDetail.column_name}}</p>
+                    <p v-if="projectName">{{projectName}}</p>
+                    <p v-if="columnName">{{columnName}}</p>
                     <p v-if="taskDetail.id">{{taskDetail.id}}</p>
                 </div>
                 <EDropdown
@@ -466,7 +466,29 @@ export default {
     },
 
     computed: {
-        ...mapState(['userId', 'taskId', 'tasks', 'taskContents', 'taskFiles', 'taskPriority']),
+        ...mapState(['userId', 'projects', 'columns', 'taskId', 'tasks', 'taskContents', 'taskFiles', 'taskPriority']),
+
+        projectName() {
+            if (!this.taskDetail.project_id) {
+                return ''
+            }
+            if (this.taskDetail.project_name) {
+                return this.taskDetail.project_name;
+            }
+            const project = this.projects.find(({id}) => id == this.taskDetail.project_id)
+            return project ? project.name : '';
+        },
+
+        columnName() {
+            if (!this.taskDetail.column_id) {
+                return ''
+            }
+            if (this.taskDetail.column_name) {
+                return this.taskDetail.column_name;
+            }
+            const column = this.columns.find(({id}) => id == this.taskDetail.column_id)
+            return column ? column.name : '';
+        },
 
         taskContent() {
             if (!this.taskId) {
diff --git a/resources/assets/js/store/state.js b/resources/assets/js/store/state.js
index 3c96162b..7ca111a3 100644
--- a/resources/assets/js/store/state.js
+++ b/resources/assets/js/store/state.js
@@ -229,13 +229,13 @@ const state = { method };
     'projectTablePanel',    // 项目面板显示类型
     'taskMyShow',           // 项目面板显示我的任务
     'taskUndoneShow',       // 项目面板显示未完成任务
-    'taskCompletedShow'     // 项目面板显示已完成任务
 ].forEach((key) => {
     state[key] = state.method.getStorageBoolean("boolean:" + key, true)
 });
 
 [
     'projectChatShow',      // 项目聊天显示
+    'taskCompletedShow',    // 项目面板显示已完成任务
     'projectCompleteShow'   // 项目面板显示已完成列表
 ].forEach((key) => {
     state[key] = state.method.getStorageBoolean("boolean:" + key, false)