From 2acbcdae0923b28be1dd4b7f6315eee64126dc01 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期一, 26 五月 2025 13:01:23 +0800 Subject: [PATCH] 任务取消按钮显示优化 --- rsf-admin/src/page/task/TaskList.jsx | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rsf-admin/src/page/task/TaskList.jsx b/rsf-admin/src/page/task/TaskList.jsx index 3792b7a..84f1b66 100644 --- a/rsf-admin/src/page/task/TaskList.jsx +++ b/rsf-admin/src/page/task/TaskList.jsx @@ -218,7 +218,7 @@ } return ( - record?.taskStatus == 198 && record?.taskType == 103 ? <ConfirmButton label={"toolbar.pick"} startIcon={<ColorizeOutlinedIcon />} onConfirm={pickClick} /> : <></> + record?.taskStatus == 199 && record?.taskType == 103 ? <ConfirmButton label={"toolbar.pick"} startIcon={<ColorizeOutlinedIcon />} onConfirm={pickClick} /> : <></> ) } @@ -245,7 +245,7 @@ } } return ( - ((record?.taskStatus < 98) || (record?.taskType >= 101 && record?.taskStatus < 199)) ? (<ConfirmButton label={"toolbar.complete"} color="secondary" startIcon={<TaskAltIcon />} onConfirm={clickComplete} />) : (<></>) + ((record?.taskStatus < 98) || (record?.taskType >= 101 && record?.taskStatus < 198)) ? (<ConfirmButton label={"toolbar.complete"} color="secondary" startIcon={<TaskAltIcon />} onConfirm={clickComplete} />) : (<></>) ) } @@ -273,7 +273,7 @@ } } return ( - record.taskStatus === 1 ? + (record.taskStatus == 1 || record.taskStatus < 101) && (record.taskType == 1 || record.taskType == 101 || record.taskType == 10 || record.taskType == 104) ? <Button onClick={clickCancel} label="toolbar.cancel"> -- Gitblit v1.9.1