From f2ba567b9340bad530968205bccdb5bc489454a9 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 13 Oct 2024 22:15:39 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E5=88=B7=E6=96=B0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/index.vue | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 496bef5..dff27e2 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -20,8 +20,10 @@
           <el-card shadow="never" class="todo-bg" @tab-add="refreshTodoOrDoneList(activeName)">
             <el-tabs v-model="activeName" editable>
               <template #add-icon>
-                刷新一下
-                <div style="width: 31px"></div>
+                <div @click="refreshTodoOrDoneList">
+                  刷新一下
+                  <div style="width: 31px"></div>
+                </div>
               </template>
               <el-tab-pane :label="'待办（'+(todoList?.length||0) +'）'" name="first">
                 <div class="todo-top">
@@ -542,9 +544,8 @@ const goToSpecialFund = () => {
   })
 }
 const refreshTodoOrDoneList = (name) => {
-  console.info("🚀 ~method:refreshTodoOrDoneList -----", name)
-  // getTodoList()
-  // getDoneList()
+  getTodoList()
+  getDoneList()
 }
 const initFundCharts = () => {
   data.fundPieCharts = echarts.init(document.getElementById('fundPie')).setOption(fundPieOption.value)
@@ -598,9 +599,7 @@ const getDoneList = () => {
   })
 }
 const changeResearchFundDataByYear = (year) => {
-  console.info("🚀 ~method:changeResearchFundDataByYear -----")
   if (year) {
-    console.info("🚀 243442-----")
     getResearchChart(year)
   }
 }

From 235ec0c4fff97a1752bc53695b49ca03ac0b1a6b Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 13 Oct 2024 22:18:18 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E5=88=B7=E6=96=B0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index dff27e2..8ef469e 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -20,7 +20,7 @@
           <el-card shadow="never" class="todo-bg" @tab-add="refreshTodoOrDoneList(activeName)">
             <el-tabs v-model="activeName" editable>
               <template #add-icon>
-                <div @click="refreshTodoOrDoneList">
+                <div @click="refreshTodoOrDoneList" style="margin-left: -50px">
                   刷新一下
                   <div style="width: 31px"></div>
                 </div>
@@ -1046,7 +1046,7 @@ const handleView = (row) => {
 }
 
 :deep(.el-tabs__new-tab ) {
-  width: auto !important;
+  width: 67px !important;
   border: none !important;
   color: #1476E3;
   font-size: 14px;

From f476dc9203c40033adf1bb9fd5d14fcc8bb0630f Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 13 Oct 2024 22:47:44 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat=20:=20=E9=A6=96=E9=A1=B5=E5=BE=85?=
 =?UTF-8?q?=E5=8A=9E/=E5=B7=B2=E5=8A=9E=E6=9F=A5=E7=9C=8B=E6=9B=B4?=
 =?UTF-8?q?=E5=A4=9A=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js          |  18 +++++
 src/views/doneList/index.vue | 139 +++++++++++++++++++++++++++++++++
 src/views/home/index.vue     |  27 +++++--
 src/views/todoList/index.vue | 144 +++++++++++++++++++++++++++++++++++
 4 files changed, 320 insertions(+), 8 deletions(-)
 create mode 100644 src/views/doneList/index.vue
 create mode 100644 src/views/todoList/index.vue

diff --git a/src/router/index.js b/src/router/index.js
index 727fabe..19e5a5f 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -190,6 +190,24 @@ const router = createRouter({
                         breadcrumb: false
                     }
                 },
+                {
+                    path: '/todolist',
+                    name: 'Todolist',
+                    component: () => import('@/views/todoList/index.vue'),
+                    meta: {
+                        title: '待办',
+                        breadcrumb: false
+                    }
+                },
+                {
+                    path: '/donelist',
+                    name: 'Donelist',
+                    component: () => import('@/views/doneList/index.vue'),
+                    meta: {
+                        title: '已办',
+                        breadcrumb: false
+                    }
+                },
             ]
         },
         {
diff --git a/src/views/doneList/index.vue b/src/views/doneList/index.vue
new file mode 100644
index 0000000..71980ec
--- /dev/null
+++ b/src/views/doneList/index.vue
@@ -0,0 +1,139 @@
+<template>
+  <fvTable ref="tableIns" :tableConfig="tableConfig" style="margin-top: 15px"></fvTable>
+</template>
+
+<script setup lang="jsx">
+const router = useRouter()
+const tableIns = ref()
+const tableConfig = reactive({
+  columns: [
+    {
+      prop: 'index',
+      type: 'index',
+      label: '序号',
+      align: 'center',
+      width:60,
+      index: index => {
+        return (tableIns.value.getQuery().pageNum - 1) * tableIns.value.getQuery().pageSize + index + 1
+      }
+    },
+    {
+      prop: 'targetName',
+      label: '名称',
+      align: 'center'
+    },
+    {
+      prop: 'initiatorName',
+      label: '发起人',
+      align: 'center'
+    },
+    {
+      prop: 'targetState',
+      label: '流程类型',
+      align: 'center',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        if (row.targetState !== null || row.targetState !== undefined) {
+          return (<Tag dictType={'todo_type'} value={row.targetState}/>)
+        } else {
+          return '--'
+        }
+      }
+    },
+    {
+      prop: 'submitTime',
+      label: '提交时间',
+      align: 'center'
+    },
+    {
+      prop: 'oper',
+      label: '操作',
+      align: 'center',
+      fixed: 'right',
+      width: 150,
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        let btn = []
+        btn.push({label: '查看', func: () => handleView(row), type: 'primary'})
+        return (
+            <div style={{width: '100%'}}>
+              {
+                btn.map(item => (
+                    <el-button
+                        type={item.type}
+                        onClick={() => item.func()}
+                        link
+                    >
+                      {item.label}
+                    </el-button>
+                ))
+              }
+            </div>
+        )
+      }
+    }
+    ],
+  api: '/workflow/mosr/process/task/about',
+})
+
+const handleView = (row) => {
+  if (row.targetState == '00' && row.targetId) {
+    router.push({
+      name: 'Requirement/detail',
+      query: {
+        id: row.targetId,
+        source: 'home'
+      }
+    })
+  } else if (row.targetState == '10' && row.targetId) {
+    router.push({
+      name: 'Summary/detail',
+      query: {
+        projectId: row.targetId,
+        state: row.state,
+        source: 'home'
+      }
+    })
+  } else if (row.targetState == '20' || row.targetState == '40' || row.targetState == '50') {
+    router.push({
+      name: 'Implementation/detail',
+      query: {
+        projectId: row.targetId,
+        state: row.state,
+        step: row.targetState,
+        source: 'home'
+      }
+    })
+  } else if (row.targetState == '70' && row.targetId) {
+    router.push({
+      name: 'Fund/detail',
+      query: {
+        id: row.targetId,
+        state: row.state,
+        source: 'home'
+      }
+    })
+  } else if (row.targetState == '80' && row.targetId) {
+    router.push({
+      name: 'Share/detail',
+      query: {
+        id: row.targetId,
+        state: row.state,
+        source: 'home'
+      }
+    })
+  } else if (row.targetState == '90' && row.targetId) {
+    router.push({
+      name: 'Phase/detail',
+      query: {
+        projectId: row.targetId,
+        source: 'home'
+      }
+    })
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 8ef469e..b577673 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -33,7 +33,7 @@
                     </el-icon>
                     <span>您有{{ todoList?.length || 0 }}条待办需要处理</span>
                   </div>
-                  <div class="todo-more">
+                  <div class="todo-more" @click="handleTodoList(1)">
                     <span>查看更多</span>
                     <el-icon color="#1F63E6" size="18">
                       <ArrowRight/>
@@ -77,7 +77,7 @@
                     </el-icon>
                     <span>您有{{ todoList.length }}条待办需要处理</span>
                   </div>
-                  <div class="todo-more">
+                  <div class="todo-more" @click="handleTodoList(2)">
                     <span>查看更多</span>
                     <el-icon color="#1F63E6" size="18">
                       <ArrowRight/>
@@ -295,7 +295,7 @@ import {useAuthStore} from '@/stores/userstore.js'
 import * as echarts from 'echarts'
 import {toThousands} from "@/utils/changePrice.js";
 import {ElNotification} from "element-plus";
-import {getHomeTaskInfo, getDoneTaskInfo,getHomeStatistics, getSpecialFundChart} from "@/api/home";
+import {getHomeTaskInfo, getDoneTaskInfo, getHomeStatistics, getSpecialFundChart} from "@/api/home";
 import {getResearchFundChart} from "@/api/research-fund";
 import {getArticle} from "@/api/article";
 
@@ -333,7 +333,7 @@ const taskTabList = ref([
     color: '#DCCEFA',
     textColor: '#8600C5',
     icon: 'home2.png',
-    num:0,
+    num: 0,
     type: 'approved'
   },
   {
@@ -520,6 +520,17 @@ onMounted(async () => {
   helpDocList.value = await getArticleList(2)
   problemList.value = await getArticleList(3)
 })
+const handleTodoList = (type) => {
+  if (type == 1) {
+    router.push({
+      path: '/todolist',
+    })
+  } else if (type == 2){
+    router.push({
+      path: '/donelist',
+    })
+  }
+}
 const handleGoToArticleDetail = (row) => {
   router.push({
     name: 'Article/detail',
@@ -557,10 +568,10 @@ const initMoneyCharts = () => {
 const getTaskStatistics = () => {
   getHomeStatistics().then(res => {
     if (res.code === 1000) {
-      taskTabList.value[0].num = res.data.stayInitiation||0
-      taskTabList.value[1].num = res.data.approvedProject||0
-      taskTabList.value[2].num = res.data.implementation||0
-      taskTabList.value[3].num = res.data.acceptanceCheck||0
+      taskTabList.value[0].num = res.data.stayInitiation || 0
+      taskTabList.value[1].num = res.data.approvedProject || 0
+      taskTabList.value[2].num = res.data.implementation || 0
+      taskTabList.value[3].num = res.data.acceptanceCheck || 0
     } else {
       ElNotification({
         title: '提示',
diff --git a/src/views/todoList/index.vue b/src/views/todoList/index.vue
new file mode 100644
index 0000000..556887b
--- /dev/null
+++ b/src/views/todoList/index.vue
@@ -0,0 +1,144 @@
+<template>
+  <fvTable ref="tableIns" :tableConfig="tableConfig" style="margin-top: 15px"></fvTable>
+</template>
+
+<script setup lang="jsx">
+const router = useRouter()
+const tableIns = ref()
+const tableConfig = reactive({
+  columns: [
+    {
+      prop: 'index',
+      type: 'index',
+      label: '序号',
+      align: 'center',
+      width:60,
+      index: index => {
+        return (tableIns.value.getQuery().pageNum - 1) * tableIns.value.getQuery().pageSize + index + 1
+      }
+    },
+    {
+      prop: 'targetName',
+      label: '名称',
+      align: 'center'
+    },
+    {
+      prop: 'initiatorName',
+      label: '发起人',
+      align: 'center'
+    },
+    {
+      prop: 'targetState',
+      label: '流程类型',
+      align: 'center',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        if (row.targetState !== null || row.targetState !== undefined) {
+          return (<Tag dictType={'todo_type'} value={row.targetState}/>)
+        } else {
+          return '--'
+        }
+      }
+    },
+    {
+      prop: 'taskName',
+      label: '当前节点',
+      align: 'center'
+    },
+    {
+      prop: 'submitTime',
+      label: '提交时间',
+      align: 'center'
+    },
+    {
+      prop: 'oper',
+      label: '操作',
+      align: 'center',
+      fixed: 'right',
+      width: 150,
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        let btn = []
+          btn.push({label: '查看', func: () => handleView(row), type: 'primary'})
+        return (
+            <div style={{width: '100%'}}>
+              {
+                btn.map(item => (
+                    <el-button
+                        type={item.type}
+                        onClick={() => item.func()}
+                        link
+                    >
+                      {item.label}
+                    </el-button>
+                ))
+              }
+            </div>
+        )
+      }
+    }
+  ],
+  api: '/workflow/mosr/process/task',
+})
+
+const handleView = (row) => {
+  if (row.targetState == '00' && row.targetId) {
+    router.push({
+      name: 'Requirement/detail',
+      query: {
+        id: row.targetId,
+        source: 'home'
+      }
+    })
+  } else if (row.targetState == '10' && row.targetId) {
+    router.push({
+      name: 'Summary/detail',
+      query: {
+        projectId: row.targetId,
+        state: row.state,
+        source: 'home'
+      }
+    })
+  } else if (row.targetState == '20' || row.targetState == '40' || row.targetState == '50') {
+    router.push({
+      name: 'Implementation/detail',
+      query: {
+        projectId: row.targetId,
+        state: row.state,
+        step: row.targetState,
+        source: 'home'
+      }
+    })
+  } else if (row.targetState == '70' && row.targetId) {
+    router.push({
+      name: 'Fund/detail',
+      query: {
+        id: row.targetId,
+        state: row.state,
+        source: 'home'
+      }
+    })
+  } else if (row.targetState == '80' && row.targetId) {
+    router.push({
+      name: 'Share/detail',
+      query: {
+        id: row.targetId,
+        state: row.state,
+        source: 'home'
+      }
+    })
+  } else if (row.targetState == '90' && row.targetId) {
+    router.push({
+      name: 'Phase/detail',
+      query: {
+        projectId: row.targetId,
+        source: 'home'
+      }
+    })
+  }
+}
+</script>
+
+<style scoped>
+
+</style>