From 7b95cabfa7e2fda784269e712081d916013fda87 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 08 四月 2025 18:31:50 +0800
Subject: [PATCH] 任务列表优化显示
---
rsf-admin/src/page/task/TaskPanel.jsx | 131 ++++++++++++++++++++++++++++++-------------
1 files changed, 92 insertions(+), 39 deletions(-)
diff --git a/rsf-admin/src/page/task/TaskPanel.jsx b/rsf-admin/src/page/task/TaskPanel.jsx
index 853c1a3..bac8c60 100644
--- a/rsf-admin/src/page/task/TaskPanel.jsx
+++ b/rsf-admin/src/page/task/TaskPanel.jsx
@@ -1,47 +1,107 @@
import React, { useState, useRef, useEffect, useMemo } from "react";
-import { Box, Card, CardContent, Grid, Typography, Tooltip } from '@mui/material';
+import { Box, Card, CardContent, Grid, Typography, Tooltip, Pagination } from '@mui/material';
import {
- useTranslate,
+ List,
+ DatagridConfigurable,
+ SearchInput,
+ TopToolbar,
+ SelectColumnsButton,
+ EditButton,
+ FilterButton,
+ CreateButton,
+ ExportButton,
+ BulkDeleteButton,
+ useDataProvider,
+ WrapperField,
+ useGetList,
useRecordContext,
+ useTranslate,
+ useNotify,
+ useListContext,
+ FunctionField,
+ TextField,
+ NumberField,
+ DateField,
+ BooleanField,
+ ReferenceField,
+ TextInput,
+ DateTimeInput,
+ DateInput,
+ SelectInput,
+ NumberInput,
+ ReferenceInput,
+ ReferenceArrayInput,
+ AutocompleteInput,
+ DeleteButton,
+ useList,
+ ReferenceManyField,
} from 'react-admin';
-import PanelTypography from "../components/PanelTypography";
-import * as Common from '@/utils/common'
+import { styled } from '@mui/material/styles';
+import PageDrawer from "../components/PageDrawer";
+import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
+import * as Common from '@/utils/common';
+
+const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
+ '& .css-1vooibu-MuiSvgIcon-root': {
+ height: '.9em'
+ },
+ '& .RaDatagrid-row': {
+ cursor: 'auto'
+ },
+ '& .column-name': {
+ },
+ '& .opt': {
+ width: 200
+ },
+}));
+
+const filters = [
+ <SearchInput source="condition" alwaysOn />,
+ <DateInput label='common.time.after' source="timeStart" />,
+ <DateInput label='common.time.before' source="timeEnd" />,
+ <NumberInput source="taskId" label="table.field.taskItem.taskId" />,
+ <NumberInput source="orderId" label="table.field.taskItem.orderId" />,
+ <NumberInput source="orderType" label="table.field.taskItem.orderType" />,
+ <NumberInput source="orderItemId" label="table.field.taskItem.orderItemId" />,
+ <NumberInput source="matnrId" label="table.field.taskItem.matnrId" />,
+ <TextInput source="maktx" label="table.field.taskItem.maktx" />,
+ <TextInput source="matnrCode" label="table.field.taskItem.matnrCode" />,
+ <TextInput source="unit" label="table.field.taskItem.unit" />,
+ <NumberInput source="anfme" label="table.field.taskItem.anfme" />,
+ <TextInput source="batch" label="table.field.taskItem.batch" />,
+ <TextInput source="spec" label="table.field.taskItem.spec" />,
+ <TextInput source="model" label="table.field.taskItem.model" />,
+ <TextInput label="common.field.memo" source="memo" />,
+ <SelectInput
+ label="common.field.status"
+ source="status"
+ choices={[
+ { id: '1', name: 'common.enums.statusTrue' },
+ { id: '0', name: 'common.enums.statusFalse' },
+ ]}
+ resettable
+ />,
+]
const TaskPanel = () => {
- const record = useRecordContext();
- if (!record) return null;
const translate = useTranslate();
+ const [createDialog, setCreateDialog] = useState(false);
+ const [drawerVal, setDrawerVal] = useState(false);
+ // const { data, isPending, error } = useGetList('taskItem', { pagination: { page: 1, perPage: 10 } });
+ // const listContext = useList({
+ // data,
+ // isPending,
+ // perPage: 10,
+ // sort: {field: 'create_time', order: 'DESC'}
+ // })
return (
<>
<Box display="flex">
- <List
- sx={{
- flexGrow: 1,
- transition: (theme) =>
- theme.transitions.create(['all'], {
- duration: theme.transitions.duration.enteringScreen,
- }),
- marginRight: !!drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
- }}
- title={"menu.taskItem"}
- empty={false}
- filters={filters}
- sort={{ field: "create_time", order: "desc" }}
- actions={(
- <TopToolbar>
- <FilterButton />
- {/* <MyCreateButton onClick={() => { setCreateDialog(true) }} /> */}
- <SelectColumnsButton preferenceKey='taskItem' />
- {/* <MyExportButton /> */}
- </TopToolbar>
- )}
- perPage={DEFAULT_PAGE_SIZE}
- >
+ <ReferenceManyField pagination={<Pagination />} reference="taskItem" target="task_id">
<StyledDatagrid
preferenceKey='taskItem'
- // bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
+ bulkActionButtons={false}
rowClick={(id, resource, record) => false}
- // expand={() => <TaskItemPanel />}
expandSingle={true}
omit={['id', 'createTime', 'createBy', 'memo', 'taskId', 'orderId', 'orderItemId', 'matnrId']}
>
@@ -58,7 +118,6 @@
<TextField source="batch" label="table.field.taskItem.batch" />
<TextField source="spec" label="table.field.taskItem.spec" />
<TextField source="model" label="table.field.taskItem.model" />
-
<ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
<TextField source="nickname" />
</ReferenceField>
@@ -70,13 +129,7 @@
<BooleanField source="statusBool" label="common.field.status" sortable={false} />
<TextField source="memo" label="common.field.memo" sortable={false} />
</StyledDatagrid>
- </List>
- <PageDrawer
- title='TaskItem Detail'
- drawerVal={drawerVal}
- setDrawerVal={setDrawerVal}
- >
- </PageDrawer>
+ </ReferenceManyField>
</Box>
</>
);
--
Gitblit v1.9.1