From 78120f498fb7e34c504b139fd4e8e4c318c336c3 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 02 八月 2025 09:55:17 +0800
Subject: [PATCH] 库位明细详情报错修改
---
rsf-admin/src/page/task/TaskList.jsx | 78 +++++++++++++++++++++-----------------
1 files changed, 43 insertions(+), 35 deletions(-)
diff --git a/rsf-admin/src/page/task/TaskList.jsx b/rsf-admin/src/page/task/TaskList.jsx
index 982d91b..4fa167a 100644
--- a/rsf-admin/src/page/task/TaskList.jsx
+++ b/rsf-admin/src/page/task/TaskList.jsx
@@ -29,16 +29,12 @@
} from 'react-admin';
import { Box, Typography, Card, Stack, Drawer } from '@mui/material';
import { styled } from '@mui/material/styles';
-import TaskCreate from "./TaskCreate";
-import TaskPanel from "./TaskPanel";
-import EmptyData from "../components/EmptyData";
-import MyCreateButton from "../components/MyCreateButton";
-import MyExportButton from '../components/MyExportButton';
import SwapVertIcon from '@mui/icons-material/SwapVert';
import AlignVerticalTopIcon from '@mui/icons-material/AlignVerticalTop';
import TaskAltIcon from '@mui/icons-material/TaskAlt';
import CancelIcon from '@mui/icons-material/Cancel';
import PageDrawer from "../components/PageDrawer";
+import TaskPanel from "./TaskPanel";
import MyField from "../components/MyField";
import ConfirmButton from "../components/ConfirmButton";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
@@ -58,13 +54,28 @@
'& .opt': {
width: 248
},
+ '& .MuiTableCell-root': {
+ whiteSpace: 'nowrap',
+ overflow: 'visible',
+ textOverflow: 'unset'
+ }
+
}));
const TaskList = (props) => {
const translate = useTranslate();
+ const refresh = useRefresh();
const [drawerVal, setDrawerVal] = useState(false);
const dict = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_warehouse_type')) || [];
+
+ // useEffect(() => {
+ // const interval = setInterval(() => {
+ // refresh();
+ // }, 5000); // 姣�5绉掑埛鏂颁竴娆�
+
+ // return () => clearInterval(interval); // 娓呴櫎瀹氭椂鍣�
+ // }, [refresh])
const filters = [
<SearchInput source="condition" alwaysOn />,
@@ -98,11 +109,10 @@
/>,
]
-
-
return (
<Box display="flex">
<List
+ queryOptions={{ refetchInterval: 5000 }}
sx={{
flexGrow: 1,
transition: (theme) =>
@@ -114,7 +124,7 @@
title={"menu.task"}
empty={false}
filters={filters}
- sort={{ field: "create_time", order: "desc" }}
+ sort={{ field: "sort", order: "desc" }}
actions={(
<TopToolbar>
<FilterButton />
@@ -125,17 +135,11 @@
>
<StyledDatagrid
preferenceKey='task'
- bulkActionButtons={
- <>
- <BulkResortButton />
- <BulkCancelButton />
- <BulkDeleteButton mutationMode={OPERATE_MODE} />
- </>
- }
+ bulkActionButtons={false}
rowClick={false}
- expand={false}
+ expand={<TaskPanel />}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo', 'robotCode', 'exceStatus', 'expDesc', 'expCode', 'status', 'sort']}
+ omit={['id', 'createTime', 'createBy$', 'memo', 'robotCode', 'exceStatus', 'expDesc', 'expCode', 'status','warehType$']}
>
<NumberField source="id" />
<TextField source="taskCode" label="table.field.task.taskCode" />
@@ -156,7 +160,6 @@
<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" onClick={(e) => e.stopPropagation()} >
<EditButton label="toolbar.detail" />
@@ -164,6 +167,7 @@
<CancelButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
<CheckButton />
<PickButton />
+ <SetTopButton />
</WrapperField>
</StyledDatagrid>
</List>
@@ -179,7 +183,10 @@
export default TaskList;
-
+/**
+ * 鐩樼偣
+ * @returns te
+ */
const CheckButton = () => {
const record = useRecordContext();
const notify = useNotify();
@@ -195,7 +202,7 @@
}
}
- return (record?.taskStatus == 198 && record?.taskType == 107 ? <ConfirmButton label={"toolbar.check"} startIcon={<GradingOutlinedIcon />} onConfirm={checkClick} /> : <></>)
+ return (record?.taskStatus == 199 && record?.taskType == 107 ? <ConfirmButton label={"toolbar.check"} startIcon={<GradingOutlinedIcon />} onConfirm={checkClick} /> : <></>)
}
/**
@@ -245,7 +252,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)) || (record?.taskType == 11 && record?.taskStatus == 101) ? (<ConfirmButton label={"toolbar.complete"} color="secondary" startIcon={<TaskAltIcon />} onConfirm={clickComplete} />) : (<></>)
)
}
@@ -257,13 +264,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);
@@ -273,12 +278,12 @@
}
}
return (
- record.taskStatus === 1 ?
- <Button
- onClick={clickCancel}
- label="toolbar.cancel">
- <CancelIcon />
- </Button>
+ (record.taskStatus == 1 || record.taskStatus == 101) && (record.taskType == 1 || record.taskType == 101 || record.taskType == 10 || record.taskType == 107 || record.taskType == 103 || record.taskType == 11) ?
+ <ConfirmButton
+ onConfirm={clickCancel}
+ startIcon={<CancelIcon />}
+ label={"toolbar.cancel"}>
+ </ConfirmButton>
:
<></>
)
@@ -306,11 +311,14 @@
}
}
return (
- <Button
- onClick={clickTop}
- label="toolbar.top">
- <AlignVerticalTopIcon />
- </Button>
+ (record.taskStatus == 1 || record.taskStatus == 101) && (record.taskType == 1 || record.taskType == 101 || record.taskType == 10 || record.taskType == 103 || record.taskType == 11) ?
+ <Button
+ onClick={clickTop}
+ label="toolbar.top">
+ <AlignVerticalTopIcon />
+ </Button>
+ :
+ <></>
)
}
--
Gitblit v1.9.1