From 669fe984048785873c20fbd0ce8abb3cd52c1fce Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期二, 29 四月 2025 15:22:24 +0800 Subject: [PATCH] 新增出库单优化 --- rsf-admin/src/page/task/TaskList.jsx | 39 ++++++++++++++++++++++++++------------- 1 files changed, 26 insertions(+), 13 deletions(-) diff --git a/rsf-admin/src/page/task/TaskList.jsx b/rsf-admin/src/page/task/TaskList.jsx index 7f6cce0..84fd054 100644 --- a/rsf-admin/src/page/task/TaskList.jsx +++ b/rsf-admin/src/page/task/TaskList.jsx @@ -23,7 +23,6 @@ DateInput, SelectInput, NumberInput, - Button, } from 'react-admin'; import { Box, Typography, Card, Stack, Drawer } from '@mui/material'; @@ -87,7 +86,7 @@ />, ] -const TaskList = () => { +const TaskList = (props) => { const translate = useTranslate(); const [drawerVal, setDrawerVal] = useState(false); return ( @@ -141,13 +140,13 @@ <TextField source="expDesc" label="table.field.task.expDesc" /> <NumberField source="sort" label="table.field.task.sort" /> <TextField source="expCode" label="table.field.task.expCode" /> - <TextField source="updateBy$" label="common.field.updateBy"/> - <TextField source="createBy$" label="common.field.createBy"/> + <TextField source="updateBy$" label="common.field.updateBy" /> + <TextField source="createBy$" label="common.field.createBy" /> <DateField source="updateTime" label="common.field.updateTime" showTime /> <DateField source="createTime" label="common.field.createTime" showTime /> {/* <BooleanField source="statusBool" label="common.field.status" sortable={false} /> */} <TextField source="memo" label="common.field.memo" sortable={false} /> - <WrapperField cellClassName="opt" label="common.field.opt"> + <WrapperField cellClassName="opt" label="common.field.opt" onClick={(e) => e.stopPropagation()} > <DoneButton sx={{ padding: '1px', fontSize: '.75rem' }} ></DoneButton> <CancelButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} /> <SetTopButton sx={{ padding: '1px', fontSize: '.75rem' }} ></SetTopButton> @@ -171,13 +170,25 @@ * 瀹屾垚鎿嶄綔 * @returns */ -const DoneButton = () => { +const DoneButton = (props) => { const record = useRecordContext(); - const clickComplete = () => { - completeTask([record]) + const notify = useNotify(); + const refresh = useRefresh(); + const clickComplete = (event) => { + event.stopPropagation(); + completeTask(record) }; //瀹屾垚浠诲姟 - const completeTask = async (row) => { } + const completeTask = async (row) => { + console.log(row.id); + const { data: { code, data, msg } } = await request.post(`task/complete/` + row.id); + if (code === 200) { + notify(msg); + refresh(); + } else { + notify(msg); + } + } return ( <Button onClick={clickComplete} @@ -195,11 +206,12 @@ const record = useRecordContext(); const notify = useNotify(); const refresh = useRefresh(); - const clickCancel = () => { + const clickCancel = (event) => { + event.stopPropagation(); cancleTask(record) }; //鍙栨秷浠诲姟 - const cancleTask = async (row) => { + const cancleTask = async (row) => { console.log(row); const { data: { code, data, msg } } = await request.post(`/task/remove/` + row.id); if (code === 200) { @@ -225,7 +237,8 @@ const record = useRecordContext(); const notify = useNotify(); const refresh = useRefresh(); - const clickTop = () => { + const clickTop = (event) => { + event.stopPropagation(); topTask(record) }; //缃《浠诲姟 @@ -237,7 +250,7 @@ } else { notify(msg); } - } + } return ( <Button onClick={clickTop} -- Gitblit v1.9.1