From 2dbe2c8b830a3b006b1536c7dac48b5f8c24e00d Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 28 四月 2025 16:53:07 +0800
Subject: [PATCH] #wms端生成任务优化
---
rsf-admin/src/page/task/TaskList.jsx | 45 +++++++++++++++++++++++++++++----------------
1 files changed, 29 insertions(+), 16 deletions(-)
diff --git a/rsf-admin/src/page/task/TaskList.jsx b/rsf-admin/src/page/task/TaskList.jsx
index 7528252..8f310bf 100644
--- a/rsf-admin/src/page/task/TaskList.jsx
+++ b/rsf-admin/src/page/task/TaskList.jsx
@@ -23,10 +23,9 @@
DateInput,
SelectInput,
NumberInput,
-
Button,
} from 'react-admin';
-import { Box, Typography, Card, Stack } from '@mui/material';
+import { Box, Typography, Card, Stack, Drawer } from '@mui/material';
import { styled } from '@mui/material/styles';
import TaskCreate from "./TaskCreate";
import TaskPanel from "./TaskPanel";
@@ -52,7 +51,7 @@
'& .column-name': {
},
'& .opt': {
- width: 200
+ width: 248
},
}));
@@ -87,7 +86,7 @@
/>,
]
-const TaskList = () => {
+const TaskList = (props) => {
const translate = useTranslate();
const [drawerVal, setDrawerVal] = useState(false);
return (
@@ -122,10 +121,10 @@
<BulkDeleteButton mutationMode={OPERATE_MODE} />
</>
}
- rowClick={false}
- expand={() => <TaskPanel/>}
+ rowClick={'edit'}
+ expand={false}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo', 'robotCode', 'exceStatus', 'expDesc', 'expCode', 'sort']}
+ omit={['id', 'createTime', 'createBy', 'memo', 'robotCode', 'exceStatus', 'expDesc', 'expCode', 'status', 'sort']}
>
<NumberField source="id" />
<TextField source="taskCode" label="table.field.task.taskCode" />
@@ -141,11 +140,11 @@
<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} />
+ {/* <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">
<DoneButton sx={{ padding: '1px', fontSize: '.75rem' }} ></DoneButton>
@@ -165,17 +164,31 @@
}
export default TaskList;
+
+
/**
* 瀹屾垚鎿嶄綔
* @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}
@@ -197,7 +210,7 @@
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) {
@@ -235,7 +248,7 @@
} else {
notify(msg);
}
- }
+ }
return (
<Button
onClick={clickTop}
--
Gitblit v1.9.1