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/funcSta/FuncStaList.jsx | 57 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 42 insertions(+), 15 deletions(-)
diff --git a/zy-acs-flow/src/page/funcSta/FuncStaList.jsx b/zy-acs-flow/src/page/funcSta/FuncStaList.jsx
index eedc4ca..8471244 100644
--- a/zy-acs-flow/src/page/funcSta/FuncStaList.jsx
+++ b/zy-acs-flow/src/page/funcSta/FuncStaList.jsx
@@ -30,6 +30,7 @@
ReferenceArrayInput,
AutocompleteInput,
DeleteButton,
+ FunctionField,
} from 'react-admin';
import { Box, Typography, Card, Stack } from '@mui/material';
import { styled } from '@mui/material/styles';
@@ -40,7 +41,7 @@
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';
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
@@ -57,6 +58,16 @@
},
}));
+const typeMap = {
+ CHARGE: 'page.funcSta.enums.type.charge',
+ STANDBY: 'page.funcSta.enums.type.standby',
+};
+
+const stateMap = {
+ IDLE: 'page.funcSta.enums.state.idle',
+ OCCUPIED: 'page.funcSta.enums.state.occupied',
+};
+
const filters = [
<SearchInput source="condition" alwaysOn />,
<DateInput label='common.time.after' source="timeStart" alwaysOn />,
@@ -66,17 +77,34 @@
<ReferenceInput source="zoneId" label="table.field.funcSta.zoneId" reference="zone">
<AutocompleteInput label="table.field.funcSta.zoneId" optionText="name" filterToQuery={(val) => ({ name: val })} />
</ReferenceInput>,
- <ReferenceInput source="agvId" label="table.field.funcSta.agvId" reference="agv">
- <AutocompleteInput label="table.field.funcSta.agvId" optionText="uuid" filterToQuery={(val) => ({ uuid: val })} />
- </ReferenceInput>,
+ // <ReferenceInput source="agvId" label="table.field.funcSta.agvId" reference="agv" alwaysOn>
+ // <AutocompleteInput label="table.field.funcSta.agvId" optionText="uuid" filterToQuery={(val) => ({ uuid: val })} />
+ // </ReferenceInput>,
<TextInput source="name" label="table.field.funcSta.name" />,
- <TextInput source="type" label="table.field.funcSta.type" />,
+ <SelectInput
+ source="type"
+ label="table.field.funcSta.type"
+ choices={[
+ { id: 'CHARGE', name: 'page.funcSta.enums.type.charge' },
+ { id: 'STANDBY', name: 'page.funcSta.enums.type.standby' },
+ ]}
+ alwaysOn
+ resettable
+ />,
+ <SelectInput
+ source="state"
+ label="table.field.funcSta.state"
+ choices={[
+ { id: 'IDLE', name: 'page.funcSta.enums.state.idle' },
+ { id: 'OCCUPIED', name: 'page.funcSta.enums.state.occupied' },
+ ]}
+ alwaysOn
+ resettable
+ />,
<ReferenceInput source="code" label="table.field.funcSta.code" reference="code">
<AutocompleteInput label="table.field.funcSta.code" optionText="data" filterToQuery={(val) => ({ data: val })} />
</ReferenceInput>,
<TextInput source="angle" label="table.field.funcSta.angle" />,
- <TextInput source="state" label="table.field.funcSta.state" />,
-
<TextInput label="common.field.memo" source="memo" />,
<SelectInput
label="common.field.status"
@@ -117,7 +145,7 @@
<MyExportButton />
</TopToolbar>
)}
- perPage={25}
+ perPage={DEFAULT_PAGE_SIZE}
>
<StyledDatagrid
preferenceKey='funcSta'
@@ -128,21 +156,20 @@
omit={['id', 'createTime', 'createBy', 'memo']}
>
<NumberField source="id" />
- <TextField source="uuid" label="table.field.funcSta.uuid" />
<ReferenceField source="zoneId" label="table.field.funcSta.zoneId" reference="zone" link={false} sortable={false}>
<TextField source="name" />
</ReferenceField>
- <ReferenceField source="agvId" label="table.field.funcSta.agvId" reference="agv" link={false} sortable={false}>
- <TextField source="uuid" />
- </ReferenceField>
<TextField source="name" label="table.field.funcSta.name" />
- <TextField source="type" label="table.field.funcSta.type" />
+ <TextField source="uuid" label="table.field.funcSta.uuid" />
+ {/* <ReferenceField source="agvId" label="table.field.funcSta.agvId" reference="agv" link={false} sortable={false}>
+ <TextField source="uuid" />
+ </ReferenceField> */}
+ <FunctionField source="type" label="table.field.funcSta.type" render={record => translate(typeMap[record.type]) || record.type} />
+ <FunctionField source="state" label="table.field.funcSta.state" render={record => translate(stateMap[record.state]) || record.state} />
<ReferenceField source="code" label="table.field.funcSta.code" reference="code" link={false} sortable={false}>
<TextField source="data" />
</ReferenceField>
<TextField source="angle" label="table.field.funcSta.angle" />
- <TextField source="state" label="table.field.funcSta.state" />
-
<ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
<TextField source="nickname" />
</ReferenceField>
--
Gitblit v1.9.1