Merge branch 'sprint/182_liumengyi_fixbug' into 'kanban'

* FIx bug #18489,#18478,#18466. See merge request easycorp/zentaopms!1420
2022-01-17 00:57:03 +00:00
parent e177702c23 cdba989f91
commit 66515d7ed8
8 changed files with 29 additions and 33 deletions
@@ -3045,6 +3045,7 @@ class executionModel extends model
        if($action == 'suspend')  return $execution->status == 'wait' or $execution->status == 'doing';
        if($action == 'putoff')   return $execution->status == 'wait' or $execution->status == 'doing';
        if($action == 'activate') return $execution->status == 'suspended' or $execution->status == 'closed';
+        if($action == 'delete')   return $execution->status == 'wait' or $execution->status == 'doing';

        return true;
    }