From 07abda4b184fd201d23a3ba40cb188c2b78e71fa Mon Sep 17 00:00:00 2001
From: lzhe <181968431@qq.com>
Date: 星期日, 10 八月 2025 15:53:20 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdmweb
---
src/views/flow/donelist.vue | 46 ++++++++++++++++++++++++++--------------------
1 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/src/views/flow/donelist.vue b/src/views/flow/donelist.vue
index 0cb4854..dc1c27c 100644
--- a/src/views/flow/donelist.vue
+++ b/src/views/flow/donelist.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2025-08-10 14:23:00
* @LastEditors: gaoshp
- * @LastEditTime: 2025-08-10 14:48:40
+ * @LastEditTime: 2025-08-10 15:46:14
* @FilePath: /mdmweb/src/views/flow/donelist.vue
-->
<template>
@@ -13,7 +13,7 @@
</basic-container>
</template>
<script>
-import { getList} from '@/api/flow/todolist';
+import { getDoneList} from '@/api/flow/todolist';
import { mapGetters } from 'vuex';
export default {
data() {
@@ -32,6 +32,7 @@
index: true,
selection: false,
// viewBtn: true,
+ menu: false,
menuWidth: 100,
column: [
{
@@ -102,15 +103,31 @@
// hide: true,
},
{
- label: '涓婁竴姝ョ敤鎴�',
+ label: '寮�濮嬫椂闂�',
width: 200,
- prop: '',
- formatter: (val, value, label) => {
- return `${val?.variables?.approveUserNickName || ''}`;
- },
+ prop: 'createTime',
+ type: 'datetime',
+ format: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'YYYY-MM-DD HH:mm:ss',
+ search: false,
+ searchRange: true,
+ searchSpan: 8,
+ // hide: true,
},
{
- label: '褰撳墠鑺傜偣',
+ label: '缁撴潫鏃堕棿',
+ width: 200,
+ prop: 'endTime',
+ type: 'datetime',
+ format: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'YYYY-MM-DD HH:mm:ss',
+ search: false,
+ searchRange: true,
+ searchSpan: 8,
+ // hide: true,
+ },
+ {
+ label: '浠诲姟鍚嶇О',
width: 200,
prop: 'taskName',
},
@@ -119,17 +136,6 @@
width: 200,
prop: 'file',
},
- {
- label: '鍒拌揪鏃堕棿',
- width: 200,
- prop: 'createTime',
- },
- {
- label: '鍒拌揪鎻忚堪',
- width: 200,
- prop: 'comment',
- },
-
],
},
page: {
@@ -191,7 +197,7 @@
}
this.loading = true;
- getList(page.currentPage, page.pageSize, Object.assign(query, params)).then(res => {
+ getDoneList(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