From c19920d096e0d53b08653a1b6427341e64004fa3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 08 十月 2024 10:28:44 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/page/sta/StaList.jsx | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/zy-acs-flow/src/page/sta/StaList.jsx b/zy-acs-flow/src/page/sta/StaList.jsx
index 10b751d..d400d0d 100644
--- a/zy-acs-flow/src/page/sta/StaList.jsx
+++ b/zy-acs-flow/src/page/sta/StaList.jsx
@@ -40,7 +40,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 }) => ({
@@ -64,15 +64,15 @@
<TextInput source="uuid" label="table.field.sta.uuid" />,
<ReferenceInput source="zoneId" label="table.field.sta.zoneId" reference="zone">
- <AutocompleteInput label="table.field.sta.zoneId" optionText="name" />
+ <AutocompleteInput label="table.field.sta.zoneId" optionText="name" filterToQuery={(val) => ({ name: val })} />
</ReferenceInput>,
<TextInput source="staNo" label="table.field.sta.staNo" />,
<TextInput source="name" label="table.field.sta.name" />,
<ReferenceInput source="staType" label="table.field.sta.staType" reference="staType">
- <AutocompleteInput label="table.field.sta.staType" optionText="name" />
+ <AutocompleteInput label="table.field.sta.staType" optionText="name" filterToQuery={(val) => ({ name: val })} />
</ReferenceInput>,
<ReferenceInput source="code" label="table.field.sta.code" reference="code">
- <AutocompleteInput label="table.field.sta.code" optionText="uuid" />
+ <AutocompleteInput label="table.field.sta.code" optionText="data" filterToQuery={(val) => ({ data: val })} />
</ReferenceInput>,
<NumberInput source="offset" label="table.field.sta.offset" />,
<TextInput source="autoing" label="table.field.sta.autoing" />,
@@ -81,7 +81,7 @@
<TextInput source="outEnable" label="table.field.sta.outEnable" />,
<TextInput source="zpallet" label="table.field.sta.zpallet" />,
<ReferenceInput source="staSts" label="table.field.sta.staSts" reference="staSts">
- <AutocompleteInput label="table.field.sta.staSts" optionText="name" />
+ <AutocompleteInput label="table.field.sta.staSts" optionText="name" filterToQuery={(val) => ({ name: val })} />
</ReferenceInput>,
<TextInput label="common.field.memo" source="memo" />,
@@ -124,7 +124,7 @@
<MyExportButton />
</TopToolbar>
)}
- perPage={25}
+ perPage={DEFAULT_PAGE_SIZE}
>
<StyledDatagrid
preferenceKey='sta'
@@ -132,20 +132,20 @@
rowClick={(id, resource, record) => false}
expand={() => <StaPanel />}
expandSingle={true}
- omit={['id', 'createTime', 'memo']}
+ omit={['id', 'uuid', 'offset', 'updateBy', 'createTime', 'createBy', 'memo']}
>
<NumberField source="id" />
<TextField source="uuid" label="table.field.sta.uuid" />
+ <TextField source="staNo" label="table.field.sta.staNo" />
<ReferenceField source="zoneId" label="table.field.sta.zoneId" reference="zone" link={false} sortable={false}>
<TextField source="name" />
</ReferenceField>
- <TextField source="staNo" label="table.field.sta.staNo" />
<TextField source="name" label="table.field.sta.name" />
<ReferenceField source="staType" label="table.field.sta.staType" reference="staType" link={false} sortable={false}>
<TextField source="name" />
</ReferenceField>
<ReferenceField source="code" label="table.field.sta.code" reference="code" link={false} sortable={false}>
- <TextField source="uuid" />
+ <TextField source="data" />
</ReferenceField>
<NumberField source="offset" label="table.field.sta.offset" />
<TextField source="autoing" label="table.field.sta.autoing" />
@@ -157,7 +157,13 @@
<TextField source="name" />
</ReferenceField>
+ <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
+ <TextField source="nickname" />
+ </ReferenceField>
<DateField source="updateTime" label="common.field.updateTime" showTime />
+ <ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}>
+ <TextField source="nickname" />
+ </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} />
--
Gitblit v1.9.1