From 088ee0537ac3d3792c895d3d09d284e49b8d683e Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期二, 17 六月 2025 22:46:12 +0800
Subject: [PATCH] update

---
 src/views/flow/todolist.vue |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/views/flow/todolist.vue b/src/views/flow/todolist.vue
index 4776245..acafd38 100644
--- a/src/views/flow/todolist.vue
+++ b/src/views/flow/todolist.vue
@@ -28,7 +28,7 @@
 <script>
 import { getList, approve,getAssignee } from '@/api/flow/todolist';
 import { mapGetters } from 'vuex';
-
+import dayjs from 'dayjs';
 export default {
     data() {
         return {
@@ -132,7 +132,7 @@
                     },
                     {
                         label: '浠诲姟鍚嶇О',
-                        prop: 'taskName',
+                        prop: 'processDefinitionName',
                         width: 100,
                     },
                     {
@@ -183,7 +183,7 @@
                     },
                     {
                         label: '褰撳墠鑺傜偣',
-                        prop: '',
+                        prop: 'taskName',
                     },
 
                 ],
@@ -276,8 +276,8 @@
             params.createTimeEnd = params?.processCreateTime?.[1] || '';
             console.log(params);
             data = {
-                createTimeBegin: params.createTimeBegin,
-                createTimeEnd: params.createTimeEnd,
+                createTimeBegin: dayjs(params.createTimeBegin).isValid() ? dayjs(params.createTimeBegin).format('YYYY-MM-DD') : '',
+                createTimeEnd: dayjs(params.createTimeEnd).isValid() ? dayjs(params.createTimeEnd).format('YYYY-MM-DD') : '',
                 keyword: params.keyword || ''
             }
             this.onLoad(this.page, data);
@@ -303,9 +303,14 @@
                 // category: params.category ? flowCategory(params.category) : null,
                 mode: this.mode,
             };
-            delete query.processCreateTime; // 鍒犻櫎涓嶅繀瑕佺殑鏌ヨ鏉′欢
+            try {
+                delete query.processCreateTime; // 鍒犻櫎涓嶅繀瑕佺殑鏌ヨ鏉′欢
+            } catch (error) {
+                console.error('鏃ユ湡鏍煎紡鍖栭敊璇�', error);
+            }
+            
             this.loading = true;
-            getList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {
+            getList(page.currentPage, page.pageSize, Object.assign(query, params)).then(res => {
                 const data = res.data.data;
                 this.page.total = data.total;
                 this.data = data.records;

--
Gitblit v1.9.3