From 8d7721c95cc004e3af1493b6289ace05658bb967 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 16 一月 2024 21:59:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/flow/manager.vue | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/flow/manager.vue b/Source/UBCS-WEB/src/views/flow/manager.vue
index de3a9e9..0e4db1b 100644
--- a/Source/UBCS-WEB/src/views/flow/manager.vue
+++ b/Source/UBCS-WEB/src/views/flow/manager.vue
@@ -25,8 +25,10 @@
<el-button type="text"
size="small"
icon="el-icon-refresh"
+ :style="{color: scope.row.suspensionState === 1 ? '#67C23A' : '#F56C6C'}"
v-if="permissionList.state"
- @click.stop="handleState(scope.row,scope.index)">鍙樻洿鐘舵��
+ @click.stop="handleDoState(scope.row, scope.index)">
+ {{ scope.row.suspensionState === 1 ? '婵�娲�' : '鎸傝捣' }}
</el-button>
<el-button type="text"
size="small"
@@ -119,7 +121,7 @@
}],
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 20,
columnBtn:false,
tip: false,
searchShow: true,
@@ -292,15 +294,15 @@
this.stateBox = true;
this.selectionId = row.id;
},
- handleDoState() {
- if (!this.flowState) {
- this.$message({
- type: "warn",
- message: "璇峰厛閫夋嫨娴佺▼鐘舵��!"
- });
- return;
- }
- changeState({processId: this.selectionId, state: this.flowState}).then(res => {
+ handleDoState(row) {
+ // if (!this.flowState) {
+ // this.$message({
+ // type: "warn",
+ // message: "璇峰厛閫夋嫨娴佺▼鐘舵��!"
+ // });
+ // return;
+ // }
+ changeState({processId: row.id, state: (row.suspensionState === 1 ? 'suspend' : 'active')}).then(res => {
const data = res.data;
if (data.success) {
this.$message({
--
Gitblit v1.9.3