From 1519870c0e18171ced014a840e86a459dc6b00f1 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 12 十二月 2023 17:26:06 +0800
Subject: [PATCH] 报工记录列表增加人员姓名

---
 src/stores/tasks.ts |   66 ++++++++++++++++++--------------
 1 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/src/stores/tasks.ts b/src/stores/tasks.ts
index 92035a0..33df9a7 100644
--- a/src/stores/tasks.ts
+++ b/src/stores/tasks.ts
@@ -3,6 +3,7 @@
 import type { Task, TasksGroupByChannel, TasksResponse } from '@/api/task'
 import type { TaskListParams } from '@/api'
 import { getTaskList } from '@/api'
+import { isNumber } from 'lodash-es'
 
 export interface ChannelMoreBtnStatus {
   /** true 浠诲姟鏈姞杞藉畬  false 鎵�鏈変换鍔″凡缁忓姞杞藉畬鎴�*/
@@ -17,8 +18,9 @@
   /**
    * 鑾峰彇浠诲姟鏁版嵁
    * @param type 1鏈畬鎴�2浠婂ぉ鏈畬鎴�3宸插畬鎴�
+   * @param init 鏄惁鏄娆¤幏鍙�,棣栨闇�瑕侀�変腑绗竴椤逛换鍔�
    */
-  function getChannels(type: 1 | 2 | 3) {
+  function getChannels(type: 1 | 2 | 3, init = false) {
     currentType.value = type
     const params: TaskListParams = {
       type,
@@ -28,15 +30,16 @@
     return getTaskList(params)
       .then((res) => {
         channels.value = res.data
-
-        // 棣栨鑾峰彇閫氶亾鏁版嵁鏃惰嚜鍔ㄩ�変腑绗竴涓换鍔�
-        if (!activeTask?.value) {
-          selectFirstTask(channels.value)
-        }
       })
       .catch((err) => {
         console.error(err)
         channels.value = []
+      })
+      .finally(() => {
+        if (init) {
+          // 棣栨鑾峰彇閫氶亾鏁版嵁鏃惰嚜鍔ㄩ�変腑绗竴涓换鍔�
+          selectFirstTask(channels.value)
+        }
       })
   }
 
@@ -44,12 +47,19 @@
     const firstNotEmptyChannel = Object.entries(channels).find((ele) => {
       const taskList = (ele[1] as TasksResponse)?.Tasks
 
-      return !!taskList.length
+      return !!taskList?.length
     })
 
     if (firstNotEmptyChannel) {
       const channelNumber = +firstNotEmptyChannel[0]
       activeTask.value = channels[channelNumber].Tasks[0]
+      setActiveChannel(channelNumber)
+    } else {
+      // 濡傛灉娌℃湁浠诲姟灏辨竻绌哄綋鍓嶉�変腑鐨勪换鍔�
+      activeTask.value = undefined
+      if (channels[0]) {
+        setActiveChannel(0)
+      }
     }
   }
 
@@ -60,6 +70,7 @@
     const currentChannelTaskList = channels.value[channel].Tasks
     if (currentChannelTaskList?.length) {
       activeTask.value = currentChannelTaskList[0]
+      setActiveChannel(channel)
     } else {
       const firstNotEmptyChannel = Object.entries(channels.value).find((ele) => {
         const taskList = (ele[1] as TasksResponse)?.Tasks
@@ -70,6 +81,7 @@
       if (firstNotEmptyChannel) {
         const channelNumber = +firstNotEmptyChannel[0]
         activeTask.value = channels.value[channelNumber].Tasks[0]
+        setActiveChannel(channel)
       }
     }
   }
@@ -77,10 +89,14 @@
   /**
    * 鍒锋柊鎵�鏈夋暟鎹�
    */
-  function reload(channel: number) {
-    getChannels(currentType.value).then(() => {
+  function reloadChannel(channel: number) {
+    return getChannels(currentType.value).then(() => {
       autoSelectTask(channel)
     })
+  }
+
+  function reloadAllData() {
+    getChannels(currentType.value)
   }
 
   function moreChannelTasksBtn(channelNumber: number) {
@@ -119,37 +135,29 @@
 
   /** 褰撳墠楂樹寒鐨勪换鍔� */
   const activeTask = ref<Task>()
-  function setActiveTask(task: Task) {
+  function setActiveTask(task: Task | undefined) {
     activeTask.value = task
+    if (isNumber(task?.Channel)) {
+      setActiveChannel(task?.Channel as number)
+    }
   }
 
-  const requestParamsMap = ref<{
-    [channel: number]: TaskListParams
-  }>({})
-  function getParamsByChannel(channel: number) {
-    return (
-      requestParamsMap.value[channel] ?? {
-        type: 1,
-        offset: 0,
-        limit: 3
-      }
-    )
+  const activeChannel = ref<number>(0)
+  function setActiveChannel(channelNumber: number) {
+    activeChannel.value = channelNumber
   }
 
-  function setParamsByChannel(channel: number, params: TaskListParams) {
-    requestParamsMap.value[channel] = params
-  }
   return {
     channels,
     getChannels,
     moreBtnStatus,
     activeTask,
-    reload,
+    reloadChannel,
     setActiveTask,
-    requestParamsMap,
-    getParamsByChannel,
-    setParamsByChannel,
     moreChannelTasksBtn,
-    foldChannelTasksBtn
+    foldChannelTasksBtn,
+    reloadAllData,
+    activeChannel,
+    setActiveChannel
   }
 })

--
Gitblit v1.8.0