From df42250725c6938ac3a8c68ca570dbc36f1dbdf0 Mon Sep 17 00:00:00 2001 From: duxingchen Date: Thu, 6 Aug 2026 12:06:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E5=BA=8F=E9=93=81=E5=BE=8B:=20?= =?UTF-8?q?=E4=B8=BB=E5=88=86=E6=94=AF=E5=BC=BA=E5=88=B6=E7=BD=AE=E9=A1=B6?= =?UTF-8?q?(parent=5Ftask=5Fid=E4=B8=BA=E7=A9=BA=E4=BC=98=E5=85=88)+?= =?UTF-8?q?=E5=AD=90=E5=88=86=E6=94=AF=E6=8C=89created=5Fat=E6=AD=A3?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- track-uniapp/src/pages/scan/components/WorkspaceArea.vue | 7 +++++++ track-uniapp/src/pages/tasks/index.vue | 8 +++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/track-uniapp/src/pages/scan/components/WorkspaceArea.vue b/track-uniapp/src/pages/scan/components/WorkspaceArea.vue index 8814978..4c0941f 100644 --- a/track-uniapp/src/pages/scan/components/WorkspaceArea.vue +++ b/track-uniapp/src/pages/scan/components/WorkspaceArea.vue @@ -132,6 +132,13 @@ export default { } }; if (this.product) walk(this.product.task_tree); + result.sort((a, b) => { + const aIsMain = !a.parent_task_id; + const bIsMain = !b.parent_task_id; + if (aIsMain && !bIsMain) return -1; + if (!aIsMain && bIsMain) return 1; + return new Date(a.created_at) - new Date(b.created_at); + }); return result; }, lockedTask() { return this.focusTasks.find(t => t.id === this.lockedTaskId) || null; }, diff --git a/track-uniapp/src/pages/tasks/index.vue b/track-uniapp/src/pages/tasks/index.vue index 8b83743..70fa978 100644 --- a/track-uniapp/src/pages/tasks/index.vue +++ b/track-uniapp/src/pages/tasks/index.vue @@ -100,7 +100,13 @@ export default { try { const username = this.currentUser?.username || ""; const res = await get("/tasks/", { assignee_id: username, limit: 100 }); - this.tasks = res.tasks || []; + this.tasks = (res.tasks || []).sort((a, b) => { + const aIsMain = !a.parent_task_id; + const bIsMain = !b.parent_task_id; + if (aIsMain && !bIsMain) return -1; + if (!aIsMain && bIsMain) return 1; + return new Date(a.created_at) - new Date(b.created_at); + }); } catch { this.tasks = []; } finally { this.loading = false; } },