From c458dd9c84a66ba50cb83adaa3967823ea9effd8 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期三, 11 六月 2025 11:26:23 +0800 Subject: [PATCH] 出库单明细搜索报错问题修复 --- rsf-admin/src/page/task/TaskList.jsx | 22 ++++++++++------------ 1 files changed, 10 insertions(+), 12 deletions(-) diff --git a/rsf-admin/src/page/task/TaskList.jsx b/rsf-admin/src/page/task/TaskList.jsx index 52dd7e2..6fc9e5b 100644 --- a/rsf-admin/src/page/task/TaskList.jsx +++ b/rsf-admin/src/page/task/TaskList.jsx @@ -255,7 +255,7 @@ } } return ( - ((record?.taskStatus < 98) || (record?.taskType >= 101 && record?.taskStatus < 198)) || (record?.taskType == 11 && record?.taskStatus == 101) ? (<ConfirmButton label={"toolbar.complete"} color="secondary" startIcon={<TaskAltIcon />} onConfirm={clickComplete} />) : (<></>) + ((record?.taskStatus < 98) || (record?.taskType >= 101 && record?.taskStatus < 198)) || (record?.taskType == 11 && record?.taskStatus == 101) ? (<ConfirmButton label={"toolbar.complete"} color="secondary" startIcon={<TaskAltIcon />} onConfirm={clickComplete} />) : (<></>) ) } @@ -267,13 +267,11 @@ const record = useRecordContext(); const notify = useNotify(); const refresh = useRefresh(); - const clickCancel = (event) => { - event.stopPropagation(); + const clickCancel = () => { cancleTask(record) }; //鍙栨秷浠诲姟 const cancleTask = async (row) => { - console.log(row); const { data: { code, data, msg } } = await request.post(`/task/remove/` + row.id); if (code === 200) { notify(msg); @@ -284,11 +282,11 @@ } return ( (record.taskStatus == 1 || record.taskStatus == 101) && (record.taskType == 1 || record.taskType == 101 || record.taskType == 10 || record.taskType == 103 || record.taskType == 11) ? - <Button - onClick={clickCancel} - label="toolbar.cancel"> - <CancelIcon /> - </Button> + <ConfirmButton + onConfirm={clickCancel} + startIcon={<CancelIcon />} + label={"toolbar.cancel"}> + </ConfirmButton> : <></> ) @@ -313,7 +311,7 @@ refresh(); } else { notify(msg); - } + } } return ( (record.taskStatus == 1 || record.taskStatus == 101) && (record.taskType == 1 || record.taskType == 101 || record.taskType == 10 || record.taskType == 103 || record.taskType == 11) ? @@ -322,8 +320,8 @@ label="toolbar.top"> <AlignVerticalTopIcon /> </Button> - : - <></> + : + <></> ) } -- Gitblit v1.9.1