From 6cce1cce50dd3362e1a95727431f0482290c5d26 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 28 七月 2023 16:19:55 +0800
Subject: [PATCH] 修改首页待办流程

---
 Source/UBCS-WEB/src/api/system/user.js  |   12 ------------
 Source/UBCS-WEB/src/views/wel/index.vue |   12 ++++++++----
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/Source/UBCS-WEB/src/api/system/user.js b/Source/UBCS-WEB/src/api/system/user.js
index f0e5d18..c539aec 100644
--- a/Source/UBCS-WEB/src/api/system/user.js
+++ b/Source/UBCS-WEB/src/api/system/user.js
@@ -160,15 +160,3 @@
   })
 }
 
-// 棣栭〉浠e姙娴佺▼浠诲姟鏌ヨ
-export const getUndoTaskList =(current, size, params) => {
-  return request({
-    url: '/api/ubcs-flow/work/send-list',
-    method: 'get',
-    params:{
-      ...params,
-      current,
-      size
-    }
-  })
-}
diff --git a/Source/UBCS-WEB/src/views/wel/index.vue b/Source/UBCS-WEB/src/views/wel/index.vue
index 234ae9e..f760b5d 100644
--- a/Source/UBCS-WEB/src/views/wel/index.vue
+++ b/Source/UBCS-WEB/src/views/wel/index.vue
@@ -114,12 +114,13 @@
 
 <script>
   import {mapGetters} from "vuex";
-  import  {getUndoTaskList,check,updatePassword} from "@/api/system/user"
+  import  {check,updatePassword} from "@/api/system/user"
   import md5 from "js-md5";
   import {removeToken} from "@/util/auth";
   import Statistic from './Statistic.vue';
   import {validatenull} from "@/util/validate";
   import {flowCategory,flowRoute} from "@/util/flow";
+  import {todoList} from "@/api/work/work";
 
   export default {
     name: "wel",
@@ -261,7 +262,11 @@
       },
       onLoad(page, params = {}) {
         this.loading = true;
-        getUndoTaskList(page.currentPage, page.pageSize, Object.assign(params)).then(res => {
+        const query = {
+          ...this.query,
+          category: (params.category) ? flowCategory(params.category) : null
+        };
+        todoList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {
           const data = res.data.data;
           this.page.total = data.total;
           this.todoData = data.records;
@@ -277,8 +282,7 @@
         }
       },
       gotodo(row, index) {
-        //this.$router.push({ path: `/work/process/${flowRoute(this.flowRoutes, row.category)}/handle/${row.taskId}/${row.processInstanceId}/${row.businessId}` });
-        this.$router.push({ path: `/work/todo` });
+        this.$router.push({ path: `/work/process/${flowRoute(this.flowRoutes, row.category)}/handle/${row.taskId}/${row.processInstanceId}/${row.businessId}` });
       }
     }
   };

--
Gitblit v1.9.3