From 4fcdf08dc85c7cf6ef59ebfc55ec2696ba816bd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AD=8F=E4=BF=9D=E6=9E=97?= Date: Tue, 14 Apr 2026 11:04:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=B2=E6=92=A4=E5=9B=9E?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/enum/task.ts | 12 ++++++++++++ src/views/task/simulationTask/executeTask/index.vue | 5 +++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/utils/enum/task.ts b/src/utils/enum/task.ts index b1292f5d..f5301384 100644 --- a/src/utils/enum/task.ts +++ b/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; + } }; diff --git a/src/views/task/simulationTask/executeTask/index.vue b/src/views/task/simulationTask/executeTask/index.vue index b15d3b4f..659fe6c2 100644 --- a/src/views/task/simulationTask/executeTask/index.vue +++ b/src/views/task/simulationTask/executeTask/index.vue @@ -296,8 +296,9 @@ const actionList = ref([ }, 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 ); }, },