From b5f9a120401311bb4cdedda17618ed5464d185c9 Mon Sep 17 00:00:00 2001
From: 李喆(开发组) <lzhe@yxqiche.com>
Date: 星期二, 05 八月 2025 10:35:50 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdmweb
---
src/views/flow/todolist.vue | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/views/flow/todolist.vue b/src/views/flow/todolist.vue
index a246d90..e34e26f 100644
--- a/src/views/flow/todolist.vue
+++ b/src/views/flow/todolist.vue
@@ -9,8 +9,7 @@
</el-button>
</template>
<template #menu="scope">
- <el-button type="primary" text size="default" v-if="permission.flow_model_update"
- @click.stop="handleAction(scope.row, scope.index)">瀹℃壒
+ <el-button type="primary" text size="default" @click.stop="handleAction(scope.row, scope.index)">瀹℃壒
</el-button>
</template>
</avue-crud>
@@ -44,6 +43,7 @@
},
data() {
return {
+
applist: [],
assigneeData: [],
row: {},
@@ -115,6 +115,7 @@
query: {},
loading: true,
option: {
+ rowKey: "taskId",
addBtn: false,
editBtn: false,
delBtn: false,
@@ -151,15 +152,15 @@
],
},
{
- label: '浠诲姟鍚嶇О',
+ label: '娴佺▼鍚嶇О',
prop: 'processDefinitionName',
width: 100,
- },
+ },/*
{
label: '娴佺▼绫诲瀷',
width: 100,
prop: 'categoryName',
- },
+ },*/
{
label: '鏈哄簥',
@@ -365,6 +366,11 @@
processInstanceId: this.row.processInstanceId,
// programIds: this.row.taskDefinitionKey === 'programmingTask' ? this.applist.map(v => v.id).join(',') : '',
}).then(res => {
+ if(res.data.code !== 200) {
+ this.$message.error(res.data.msg);
+ done();
+ return;
+ }
this.$message.success('瀹℃壒鎴愬姛');
this.approveBox = false;
this.onLoad(this.page, this.query);
--
Gitblit v1.9.3