From 2f4a09b26aed48b0a06366238948606b35595acd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=A6=8D?= <1455167345@qq.com>
Date: Sat, 15 Jun 2024 11:41:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BB=BB=E5=8A=A1=E5=82=AC?=
 =?UTF-8?q?=E5=8A=9E=E9=99=90=E5=88=B6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/demo/workflow/task/myTask.vue | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/views/demo/workflow/task/myTask.vue b/src/views/demo/workflow/task/myTask.vue
index 921c2f6b..2d35770f 100644
--- a/src/views/demo/workflow/task/myTask.vue
+++ b/src/views/demo/workflow/task/myTask.vue
@@ -138,7 +138,7 @@
     var query = {
       id: record.id,
     };
-    if (record.isStart == 1 && record.isCancel == 0) {
+    if (record.isFinished == 1 || record.isAgain == 1) {
       return createMessage.warning('重新提交和结束的流程不能催办');
     }
     const data = await urge(query);
@@ -154,6 +154,15 @@
       taskId: record.id,
       id: record.processId,
     };
+    // isFinished 1 结束
+    // isAgain 1 重新提交
+    // isStart 1表示开始处理过了 0 还没人处理过
+    // isCancel 1 是否允许撤销 1 允许 0 不允许
+    if (record.isFinished == 1 || record.isAgain == 1) {
+      return createMessage.warning('重新提交和结束的流程不能撤销');
+    } else if (record.isStart != 0 && record.isCancel != 1) {
+      return createMessage.warning('不能撤销');
+    }
     if (record.isStart == 0) {
       const data = await revoke({
         id: record.id,