From 986aa62ed00bee39363bab41b4eeb8259d446efd Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期四, 16 一月 2025 18:20:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/wel/components/UndoTaskPortlet.vue | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/views/wel/components/UndoTaskPortlet.vue b/Source/plt-web/plt-web-ui/src/views/wel/components/UndoTaskPortlet.vue
index c0d691a..aa3fdad 100644
--- a/Source/plt-web/plt-web-ui/src/views/wel/components/UndoTaskPortlet.vue
+++ b/Source/plt-web/plt-web-ui/src/views/wel/components/UndoTaskPortlet.vue
@@ -1,5 +1,5 @@
<template>
- <basic-container title="寰呭姙娴佺▼浠诲姟">
+ <div>
<avue-crud ref="crud" :data="todoData" :option="todoOption" :page.sync="page"
:table-loading="loading"
@on-load="onLoad"
@@ -12,12 +12,17 @@
</el-button>
</template>
</avue-crud>
- </basic-container>
+ </div>
</template>
<script>
export default {
name: "UndoTaskPortlet",
+ props:{
+ height: {
+ type: Number
+ }
+ },
data(){
return {
loading: false,
@@ -30,7 +35,7 @@
todoData: [],
// 浠ｅ姙娴佺▼浠诲姟option
todoOption: {
- height: 500,
+ height: 'auto',
addBtn: false,
header: false,
align: 'center',
@@ -86,12 +91,12 @@
},
methods: {
onLoad(page, params = {}) {
- this.loading = true;
+ //this.loading = true;
const query = {
...this.query,
category: (params.category) ? flowCategory(params.category) : null
};
- todoList(page.currentPage, page.pageSize, Object.assign(params, query)).then(res => {
+ /*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;
@@ -100,6 +105,8 @@
this.$message.error(error);
this.loading = false;
})
+
+ */
},
cellHandle(row, column, cell, event) {
if (column.property == 'taskName') {
--
Gitblit v1.9.3