diff --git a/app/Http/Controllers/Api/ProjectController.php b/app/Http/Controllers/Api/ProjectController.php index 5c77d2cb8..70e14f419 100755 --- a/app/Http/Controllers/Api/ProjectController.php +++ b/app/Http/Controllers/Api/ProjectController.php @@ -1159,6 +1159,7 @@ class ProjectController extends AbstractController $list = ProjectTask::with(['taskUser']) ->select([ 'projects.name as project_name', + 'project_tasks.project_id', 'project_tasks.id', 'project_tasks.name', 'project_tasks.start_at', diff --git a/resources/assets/js/pages/manage/components/TaskExistTips.vue b/resources/assets/js/pages/manage/components/TaskExistTips.vue index 2c645f5d4..8fcbd1f9d 100644 --- a/resources/assets/js/pages/manage/components/TaskExistTips.vue +++ b/resources/assets/js/pages/manage/components/TaskExistTips.vue @@ -11,13 +11,15 @@
-
-
- [{{ item.project_name }}] - {{ item.name }} +
@@ -87,7 +89,7 @@ export default { return } this.show = true; - let taskObj = {} + const taskObj = {} userids.map(userid => { data.data.map(h => { if ((h.task_user || []).map(k => k.owner ? k.userid : 0).indexOf(userid) !== -1) { @@ -102,6 +104,22 @@ export default { resolve(true) }); }); + }, + + formatItems(items) { + return Array.from( + items.reduce((map, item) => { + if (!map.has(item.project_id)) { + map.set(item.project_id, { + project_id: item.project_id, + project_name: item.project_name, + list: [] + }); + } + map.get(item.project_id).list.push(item); + return map; + }, new Map()).values() + ); } } } diff --git a/resources/assets/sass/pages/components/task-exist-tips.scss b/resources/assets/sass/pages/components/task-exist-tips.scss index 4166ed447..b74f75b3d 100644 --- a/resources/assets/sass/pages/components/task-exist-tips.scss +++ b/resources/assets/sass/pages/components/task-exist-tips.scss @@ -16,20 +16,20 @@ margin-left: 34px; margin-right: 6px; margin-top: 10px; + &.label { + color: #a7abb5; + } } - .list-task-info { + .list-task-name { flex: 1; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; padding-right: 12px; - span:first-child { - color: #A7ABB5; - } } .list-task-date { - //float: right; + float: right; } }