From 7f70cb15d035f0c233b9e62b9e43aa985317c908 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 04 十一月 2024 10:22:45 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/page/bus/BusList.jsx | 92 +++++++++++++++++++++++++++++++++------------
1 files changed, 67 insertions(+), 25 deletions(-)
diff --git a/zy-acs-flow/src/page/bus/BusList.jsx b/zy-acs-flow/src/page/bus/BusList.jsx
index 66f853e..d411899 100644
--- a/zy-acs-flow/src/page/bus/BusList.jsx
+++ b/zy-acs-flow/src/page/bus/BusList.jsx
@@ -30,8 +30,12 @@
ReferenceArrayInput,
AutocompleteInput,
DeleteButton,
+ FunctionField,
+ Pagination,
+ useNotify,
+ useRefresh,
} from 'react-admin';
-import { Box, Typography, Card, Stack } from '@mui/material';
+import { Box, Typography, Button, Chip } from '@mui/material';
import { styled } from '@mui/material/styles';
import BusCreate from "./BusCreate";
import BusPanel from "./BusPanel";
@@ -40,9 +44,13 @@
import MyExportButton from '../components/MyExportButton';
import PageDrawer from "../components/PageDrawer";
import MyField from "../components/MyField";
-import { PAGE_DRAWER_WIDTH, OPERATE_MODE } from '@/config/setting';
+import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import * as Common from '@/utils/common';
import BusListAside from "./BusListAside";
+import { getBusStsColor } from '@/utils/color-util';
+import CancelIcon from '@mui/icons-material/Cancel';
+import request from '@/utils/request';
+import ConfirmButton from "../components/ConfirmButton";
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -57,6 +65,9 @@
'& .column-tasksNum': {
maxWidth: '8em',
},
+ '& .column-tasksNumTotal': {
+ maxWidth: '8em',
+ },
'& .column-memo': {
maxWidth: '12em',
overflow: 'hidden',
@@ -64,24 +75,20 @@
whiteSpace: 'nowrap',
},
'& .opt': {
- width: 200
+ width: 120
},
}));
const filters = [
// <SearchInput source="condition" alwaysOn />,
- <DateInput label='common.time.after' source="timeStart" alwaysOn />,
- <DateInput label='common.time.before' source="timeEnd" alwaysOn />,
-
- // <TextInput source="uuid" label="table.field.bus.uuid" />,
<TextInput source="busNo" label="table.field.bus.busNo" alwaysOn resettable />,
- <DateInput source="startTime" label="table.field.bus.startTime" />,
- <DateInput source="endTime" label="table.field.bus.endTime" />,
+ // <DateInput source="startTime" label="table.field.bus.startTime" />,
+ // <DateInput source="endTime" label="table.field.bus.endTime" />,
<ReferenceInput source="busSts" label="table.field.bus.busSts" reference="busSts" alwaysOn>
<AutocompleteInput label="table.field.bus.busSts" optionText="name" filterToQuery={(val) => ({ name: val })} />
</ReferenceInput>,
- <TextInput source="phase" label="table.field.bus.phase" />,
-
+ <DateInput label='common.time.after' source="timeStart" alwaysOn />,
+ <DateInput label='common.time.before' source="timeEnd" alwaysOn />,
<TextInput label="common.field.memo" source="memo" />,
<SelectInput
label="common.field.status"
@@ -95,9 +102,22 @@
const BusList = () => {
const translate = useTranslate();
-
+ const notify = useNotify();
+ const refresh = useRefresh();
const [createDialog, setCreateDialog] = useState(false);
const [drawerVal, setDrawerVal] = useState(false);
+
+ const onCancel = (busId) => {
+ request.get("/bus/cancel/" + busId).then(res => {
+ const { code, msg, data } = res.data;
+ if (code === 200) {
+ notify(msg || 'common.response.success', { type: 'success', messageArgs: { _: msg } });
+ refresh();
+ } else {
+ notify(msg || 'common.response.fail', { type: 'error', messageArgs: { _: msg } });
+ }
+ })
+ }
return (
<Box display="flex">
@@ -122,13 +142,14 @@
<MyExportButton />
</TopToolbar>
)}
- perPage={25}
- aside={<BusListAside />}
+ pagination={<Pagination rowsPerPageOptions={[10, 20, 50, 100]} />}
+ perPage={20}
+ // aside={<BusListAside />}
>
<StyledDatagrid
preferenceKey='bus'
- bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
- rowClick={(id, resource, record) => false}
+ bulkActionButtons={false}
+ rowClick={'expand'}
expand={() => <BusPanel />}
expandSingle={true}
omit={['id', 'uuid', 'phase', 'updateBy', 'updateTime', 'createTime', 'createBy']}
@@ -136,12 +157,22 @@
<NumberField source="id" />
<TextField source="uuid" label="table.field.bus.uuid" />
<TextField source="busNo" label="table.field.bus.busNo" />
- <ReferenceField source="busSts" label="table.field.bus.busSts" reference="busSts" link={false} sortable={false}>
- <TextField source="name" />
+ <ReferenceField source="busSts" label="table.field.bus.busSts" reference="busSts" link={false} sortable={true}>
+ <FunctionField render={record => (
+ <Chip
+ label={record.name}
+ variant="outlined"
+ size="small"
+ color={getBusStsColor(record.name)}
+ sx={{ fontSize: '0.75rem' }}
+ />
+ )} />
+ {/* <TextField source="name" /> */}
</ReferenceField>
- <NumberField source="tasksNum" label="table.field.bus.tasksNum" sortable={false} />
+ <NumberField source="tasksNum" label="table.field.bus.tasksNum" sortable={false} sx={{ fontWeight: 'bold' }} />
+ <NumberField source="tasksNumTotal" label="table.field.bus.tasksNumTotal" sortable={false} sx={{ fontWeight: 'bold' }} />
<DateField source="startTime" label="table.field.bus.startTime" showTime />
- <DateField source="endTime" label="table.field.bus.endTime" showTime />
+ <DateField source="endTime" label="table.field.bus.endTime" showTime emptyText="-" />
<TextField source="phase" label="table.field.bus.phase" sortable={false} />
<ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
@@ -153,11 +184,22 @@
</ReferenceField>
<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">
- <EditButton sx={{ padding: '1px', fontSize: '.75rem' }} />
- <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
- </WrapperField>
+ <TextField source="memo" label="common.field.memo" sortable={false} emptyText="-" />
+ <FunctionField label="common.field.opt" cellClassName="opt" render={record => (
+ (record.busSts === 15) && (
+ <ConfirmButton
+ label="ra.action.cancel"
+ size="small"
+ color="error"
+ startIcon={<CancelIcon />}
+ sx={{ padding: '1px', fontSize: '.75rem' }}
+ data={record.busNo}
+ onConfirm={() => {
+ onCancel(record.id);
+ }}
+ />
+ )
+ )} />
</StyledDatagrid>
</List>
<BusCreate
--
Gitblit v1.9.1