新增已撤回状态

src/utils/enum/task.ts

@@ -18,6 +18,8 @@ export enum TASK_PROCESS_STATUS {
   POSTPONED = '7',
   /** 已闭环 */
   CLOSED_LOOP = '8',
+  /** 已撤回 */
+  CANCELED = '9',
 }
 
 /** 任务状态颜色映射 */
@@ -90,6 +92,7 @@ export const TASK_PROCESS_STATUS_OBJ: any = {
   [TASK_PROCESS_STATUS.CLOSED]: '已关闭',
   [TASK_PROCESS_STATUS.POSTPONED]: '已延期',
   [TASK_PROCESS_STATUS.CLOSED_LOOP]: '已闭环',
+  [TASK_PROCESS_STATUS.CANCELED]: '已撤回',
 };
 
 export const TASK_PROCESS_STATUS_OPTIONS = (
@@ -188,6 +191,7 @@ export const disposeDisabledExeStatus = (
   ) {
     return true;
   }
+  // 上传试验相关文件后，任务状态就会 自动 变成已闭环，已完成就不允许再改了
   if (status === TASK_PROCESS_STATUS.COMPLETED) {
     return true;
   }
@@ -201,6 +205,7 @@ export const disposeDisabledExeStatus = (
         TASK_PROCESS_STATUS.NO_STARTED,
         TASK_PROCESS_STATUS.CLOSED,
         TASK_PROCESS_STATUS.COMPLETED,
+        TASK_PROCESS_STATUS.CANCELED,
       ].includes(option.value);
     } else {
       return [TASK_PROCESS_STATUS.NO_STARTED, TASK_PROCESS_STATUS.CLOSED].includes(option.value);
@@ -211,6 +216,7 @@ export const disposeDisabledExeStatus = (
       TASK_PROCESS_STATUS.PAUSED,
       TASK_PROCESS_STATUS.CLOSED,
       TASK_PROCESS_STATUS.COMPLETED,
+      TASK_PROCESS_STATUS.CANCELED,
     ].includes(option.value);
   }
   if (status === TASK_PROCESS_STATUS.PAUSED) {
@@ -219,4 +225,10 @@ export const disposeDisabledExeStatus = (
   if (status === TASK_PROCESS_STATUS.REJECTED) {
     return true;
   }
+  if (status === TASK_PROCESS_STATUS.CANCELED) {
+    return true;
+  }
+  if (status === TASK_PROCESS_STATUS.CLOSED_LOOP) {
+    return true;
+  }
 };

src/views/task/simulationTask/executeTask/index.vue

@@ -296,8 +296,9 @@ const actionList = ref<any>([
     },
     hide: (row: any) => {
       return (
-        row.exeStatus === TASK_PROCESS_STATUS.COMPLETED ||
+        row.exeStatus === TASK_PROCESS_STATUS.REJECTED ||
-        row.exeStatus === TASK_PROCESS_STATUS.REJECTED
+        row.exeStatus === TASK_PROCESS_STATUS.CLOSED_LOOP ||
+        row.exeStatus === TASK_PROCESS_STATUS.CANCELED
       );
     },
   },