From 1aebdca4fee83fc0153efcdfe72db6fee606e6ba Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期二, 27 一月 2026 09:43:53 +0800
Subject: [PATCH] lsh#
---
rsf-admin/src/page/task/TaskPanel.jsx | 211 +++++++++++++++++++++-------------------------------
1 files changed, 85 insertions(+), 126 deletions(-)
diff --git a/rsf-admin/src/page/task/TaskPanel.jsx b/rsf-admin/src/page/task/TaskPanel.jsx
index 24270ed..007d807 100644
--- a/rsf-admin/src/page/task/TaskPanel.jsx
+++ b/rsf-admin/src/page/task/TaskPanel.jsx
@@ -1,139 +1,98 @@
import React, { useState, useRef, useEffect, useMemo } from "react";
-import { Box, Card, CardContent, Grid, Typography, Tooltip } from '@mui/material';
+import { Box } from '@mui/material';
import {
- useTranslate,
+ List,
+ DataTable,
useRecordContext,
+ useTranslate,
+ TextField,
+ NumberField,
+ DateField,
+ BooleanField,
+ ReferenceField,
} from 'react-admin';
-import PanelTypography from "../components/PanelTypography";
-import * as Common from '@/utils/common'
+
+import PageDrawer from "../components/PageDrawer";
+import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
+import * as Common from '@/utils/common';
+
+
const TaskPanel = () => {
const record = useRecordContext();
- if (!record) return null;
const translate = useTranslate();
+ const [createDialog, setCreateDialog] = useState(false);
+ const [drawerVal, setDrawerVal] = useState(false);
return (
<>
- <Card sx={{ width: { xs: 300, sm: 500, md: 600, lg: 800 }, margin: 'auto' }}>
- <CardContent>
- <Grid container spacing={2}>
- <Grid item xs={12} sx={{ display: 'flex', justifyContent: 'space-between' }}>
- <Typography variant="h6" gutterBottom align="left" sx={{
- maxWidth: { xs: '100px', sm: '180px', md: '260px', lg: '360px' },
- whiteSpace: 'nowrap',
- overflow: 'hidden',
- textOverflow: 'ellipsis',
- }}>
- {Common.camelToPascalWithSpaces(translate('table.field.task.id'))}: {record.id}
- </Typography>
- {/* inherit, primary, secondary, textPrimary, textSecondary, error */}
- <Typography variant="h6" gutterBottom align="right" >
- ID: {record.id}
- </Typography>
- </Grid>
- </Grid>
- <Grid container spacing={2}>
- <Grid item xs={12} container alignContent="flex-end">
- <Typography variant="caption" color="textSecondary" sx={{ wordWrap: 'break-word', wordBreak: 'break-all' }}>
- {Common.camelToPascalWithSpaces(translate('common.field.memo'))}:{record.memo}
- </Typography>
- </Grid>
- </Grid>
- <Box height={20}> </Box>
- <Grid container spacing={2}>
- <Grid item xs={6}>
- <PanelTypography
- title="table.field.task.taskCode"
- property={record.taskCode}
- />
- </Grid>
- <Grid item xs={6}>
- <PanelTypography
- title="table.field.task.taskStatus"
- property={record.taskStatus}
- />
- </Grid>
- <Grid item xs={6}>
- <PanelTypography
- title="table.field.task.taskType"
- property={record.taskType}
- />
- </Grid>
- <Grid item xs={6}>
- <PanelTypography
- title="table.field.task.orgLoc"
- property={record.orgLoc}
- />
- </Grid>
- <Grid item xs={6}>
- <PanelTypography
- title="table.field.task.orgSite"
- property={record.orgSite}
- />
- </Grid>
- <Grid item xs={6}>
- <PanelTypography
- title="table.field.task.targLoc"
- property={record.targLoc}
- />
- </Grid>
- <Grid item xs={6}>
- <PanelTypography
- title="table.field.task.targSite"
- property={record.targSite}
- />
- </Grid>
- <Grid item xs={6}>
- <PanelTypography
- title="table.field.task.barcode"
- property={record.barcode}
- />
- </Grid>
- <Grid item xs={6}>
- <PanelTypography
- title="table.field.task.robotCode"
- property={record.robotCode}
- />
- </Grid>
- <Grid item xs={6}>
- <PanelTypography
- title="table.field.task.exceStatus"
- property={record.exceStatus}
- />
- </Grid>
- <Grid item xs={6}>
- <PanelTypography
- title="table.field.task.expDesc"
- property={record.expDesc}
- />
- </Grid>
- <Grid item xs={6}>
- <PanelTypography
- title="table.field.task.sort"
- property={record.sort}
- />
- </Grid>
- <Grid item xs={6}>
- <PanelTypography
- title="table.field.task.expCode"
- property={record.expCode}
- />
- </Grid>
- <Grid item xs={6}>
- <PanelTypography
- title="table.field.task.startTime"
- property={record.startTime$}
- />
- </Grid>
- <Grid item xs={6}>
- <PanelTypography
- title="table.field.task.endTime"
- property={record.endTime$}
- />
- </Grid>
-
- </Grid>
- </CardContent>
- </Card >
+ <Box display="flex">
+ <List resource="taskItem"
+ sx={{
+ flexGrow: 1,
+ transition: (theme) =>
+ theme.transitions.create(['all'], {
+ duration: theme.transitions.duration.enteringScreen,
+ }),
+ marginRight: !!drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
+ }}
+ filter={{ taskId: record.id }}
+ // title={"menu.taskItem"}
+ pagination={false}
+ empty={false}
+ actions={false}
+ >
+ <DataTable
+ bulkActionButtons={false}
+ rowClick={false}
+ expandSingle
+ >
+ {/* <NumberField source="id" /> */}
+ {/* <NumberField source="taskId" label="table.field.taskItem.taskId" /> */}
+ {/* <NumberField source="orderId" label="table.field.taskItem.orderId" /> */}
+ <DataTable.Col source="orderType$" label="table.field.taskItem.orderType">
+ <NumberField source="orderType$" label="table.field.taskItem.orderType" />
+ </DataTable.Col>
+ {/* <TextField source="sourceCode" label="table.field.taskItem.sourceCode" /> */}
+ {/* <NumberField source="orderItemId" label="table.field.taskItem.orderItemId" /> */}
+ <DataTable.Col source="wkType$" label="table.field.taskItem.wkType">
+ <NumberField source="wkType$" label="table.field.taskItem.wkType" />
+ </DataTable.Col>
+ <DataTable.Col source="platWorkCode" label="table.field.asnOrderItem.platWorkCode">
+ <TextField source="platWorkCode" label="table.field.asnOrderItem.platWorkCode" />
+ </DataTable.Col>
+ <DataTable.Col source="platItemId" label="table.field.asnOrderItemLog.platItemId">
+ <TextField source="platItemId" label="table.field.asnOrderItemLog.platItemId" />
+ </DataTable.Col>
+ {/* <NumberField source="matnrId" label="table.field.taskItem.matnrId" /> */}
+ <DataTable.Col source="matnrCode" label="table.field.taskItem.matnrCode">
+ <TextField source="matnrCode" label="table.field.taskItem.matnrCode" />
+ </DataTable.Col>
+ <DataTable.Col source="maktx" label="table.field.taskItem.maktx">
+ <TextField source="maktx" label="table.field.taskItem.maktx" />
+ </DataTable.Col>
+ <DataTable.Col source="batch" label="table.field.taskItem.batch">
+ <TextField source="batch" label="table.field.taskItem.batch" />
+ </DataTable.Col>
+ <DataTable.Col source="unit" label="table.field.taskItem.unit">
+ <TextField source="unit" label="table.field.taskItem.unit" />
+ </DataTable.Col>
+ <DataTable.Col source="anfme" label="table.field.taskItem.anfme">
+ <NumberField source="anfme" label="table.field.taskItem.anfme" />
+ </DataTable.Col>
+ {/* <TextField source="spec" label="table.field.taskItem.spec" />
+ <TextField source="model" label="table.field.taskItem.model" /> */}
+ <DataTable.Col source="updateBy$" label="common.field.updateBy">
+ <TextField source="updateBy$" label="common.field.updateBy" />
+ </DataTable.Col>
+ {/* <TextField source="createBy$" label="common.field.createBy"/> */}
+ <DataTable.Col source="updateTime" label="common.field.updateTime">
+ <DateField source="updateTime" label="common.field.updateTime" showTime />
+ </DataTable.Col>
+ {/* <DateField source="createTime" label="common.field.createTime" showTime /> */}
+ {/* <TextField source="memo" label="common.field.memo" sortable={false} /> */}
+ </DataTable>
+ </List>
+ </Box>
</>
);
};
--
Gitblit v1.9.1