From c4379ec6f6b634db8ce1c90d53902d224b44a604 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 12 十二月 2023 14:40:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/views/flow/manager.vue |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/flow/manager.vue b/Source/UBCS-WEB/src/views/flow/manager.vue
index 7bfc622..e228670 100644
--- a/Source/UBCS-WEB/src/views/flow/manager.vue
+++ b/Source/UBCS-WEB/src/views/flow/manager.vue
@@ -26,7 +26,7 @@
                    size="small"
                    icon="el-icon-refresh"
                    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"
@@ -205,7 +205,7 @@
         return {
           state:this.vaildData(this.permission.flow_manager.flow_manager_state, false),
           image:this.vaildData(this.permission.flow_manager.flow_manager_image, false),
-          delBtn: this.vaildData(this.permission.flow_manager.flow_manager_remove, false),
+          delBtn: this.vaildData(this.permission.flow_manager.flow_manager_delete, false),
         };
       },
       ids() {
@@ -292,15 +292,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.10.0