From bc0dded968724c965823a184d47003602c95c2da Mon Sep 17 00:00:00 2001
From: TianyangZhang <zty18395607196@163.com>
Date: Sat, 9 May 2026 13:10:46 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E6=8A=A5=E9=80=81=E4=BB=BB=E5=8A=A1=E9=A1=B5=E9=9D=A2=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E5=92=8C=E4=BA=A4=E4=BA=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

任务列表按年份+周期倒序（年置于该年最底部）；点击行高亮当前选中行；切换公司时重置到第一页并清除高亮。

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 client/src/views/supervisionNew/mytask.vue | 8 ++++++--
 server/apps/supervision/views.py           | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/client/src/views/supervisionNew/mytask.vue b/client/src/views/supervisionNew/mytask.vue
index 120bdf5..3a44494 100644
--- a/client/src/views/supervisionNew/mytask.vue
+++ b/client/src/views/supervisionNew/mytask.vue
@@ -16,7 +16,7 @@
             :value="item.id"
           />
         </el-select>
-        <el-table :data="dataList.results" @row-click="itemClick">
+        <el-table ref="taskTable" :data="dataList.results" highlight-current-row @row-click="itemClick">
           <el-table-column type="expand" >
             <template slot-scope="props"  v-if="props.row.task2_&&props.row.task2_.type==20">
               <el-form label-position="left" inline class="demo-table-expand">
@@ -801,7 +801,7 @@
       type: 10,
   };
   const listQuery = {
-    page: 0,
+    page: 1,
     belong_dept:null,
     page_size: 20,
   };
@@ -1031,6 +1031,10 @@
               that.deptName = item.name;
             }
           })
+          that.listQuery.page = 1;
+          if (that.$refs.taskTable) {
+            that.$refs.taskTable.setCurrentRow();
+          }
           that.getList();
         },
         close_dialog(){
diff --git a/server/apps/supervision/views.py b/server/apps/supervision/views.py
index e13c4cd..63362c3 100644
--- a/server/apps/supervision/views.py
+++ b/server/apps/supervision/views.py
@@ -561,8 +561,8 @@ class Task2DoViewSet(ListModelMixin, DestroyModelMixin, GenericViewSet):
         """
         mydept = request.user.dept
         belong_depts = get_child_queryset2(mydept)
-        queryset = Task2Do.objects.filter(belong_dept__in = belong_depts).exclude(task2__state=10).order_by('-create_time')
-        queryset = self.filter_queryset(queryset)
+        queryset = Task2Do.objects.filter(belong_dept__in = belong_depts).exclude(task2__state=10)
+        queryset = self.filter_queryset(queryset).order_by('-task2__year', '-task2__cycle')
         page = self.paginate_queryset(queryset)
         if page is not None:
             serializer = Task2DoSerializer(page, many=True)