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/loc/LocList.jsx |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/zy-acs-flow/src/page/loc/LocList.jsx b/zy-acs-flow/src/page/loc/LocList.jsx
index eaf3fcd..30c4a43 100644
--- a/zy-acs-flow/src/page/loc/LocList.jsx
+++ b/zy-acs-flow/src/page/loc/LocList.jsx
@@ -41,10 +41,11 @@
 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 RepartitionIcon from '@mui/icons-material/Repartition';
+import CorporateFareIcon from '@mui/icons-material/CorporateFare';
 import LocInit from "./LocInit";
+import rowSx from "./rowSx";
 
 const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
     '& .css-1vooibu-MuiSvgIcon-root': {
@@ -62,22 +63,21 @@
 }));
 
 const filters = [
-    <SearchInput source="condition" alwaysOn />,
+    <TextInput source="locNo" label="table.field.loc.locNo" alwaysOn />,
+    <ReferenceInput source="locSts" label="table.field.loc.locSts" reference="locSts" alwaysOn>
+        <AutocompleteInput label="table.field.loc.locSts" optionText="name" filterToQuery={(val) => ({ name: val })} />
+    </ReferenceInput>,
     <DateInput label='common.time.after' source="timeStart" alwaysOn />,
     <DateInput label='common.time.before' source="timeEnd" alwaysOn />,
-
     <TextInput source="uuid" label="table.field.loc.uuid" />,
     <ReferenceInput source="zoneId" label="table.field.loc.zoneId" reference="zone">
         <AutocompleteInput label="table.field.loc.zoneId" optionText="name" filterToQuery={(val) => ({ name: val })} />
     </ReferenceInput>,
-    <TextInput source="locNo" label="table.field.loc.locNo" alwaysOn />,
     <TextInput source="name" label="table.field.loc.name" />,
     <ReferenceInput source="code" label="table.field.loc.code" reference="code" alwaysOn>
         <AutocompleteInput label="table.field.loc.code" optionText="data" filterToQuery={(val) => ({ data: val })} />
     </ReferenceInput>,
-    <ReferenceInput source="locSts" label="table.field.loc.locSts" reference="locSts" alwaysOn>
-        <AutocompleteInput label="table.field.loc.locSts" optionText="name" filterToQuery={(val) => ({ name: val })} />
-    </ReferenceInput>,
+    <SearchInput source="condition" alwaysOn />,
     <NumberInput source="offset" label="table.field.loc.offset" />,
     <NumberInput source="row" label="table.field.loc.row" alwaysOn />,
     <NumberInput source="bay" label="table.field.loc.bay" alwaysOn />,
@@ -126,13 +126,13 @@
                         <FilterButton />
                         <Button label='page.loc.init' onClick={(event) => {
                             setInitDialog(true);
-                        }}><RepartitionIcon /></Button>
+                        }}><CorporateFareIcon /></Button>
                         <MyCreateButton onClick={() => { setCreateDialog(true) }} />
                         <SelectColumnsButton preferenceKey='loc' />
                         <MyExportButton />
                     </TopToolbar>
                 )}
-                perPage={25}
+                perPage={DEFAULT_PAGE_SIZE}
             >
                 <StyledDatagrid
                     preferenceKey='loc'
@@ -141,6 +141,7 @@
                     expand={() => <LocPanel />}
                     expandSingle={true}
                     omit={['id', 'locType', 'uuid', 'statusBool', 'updateBy', 'createTime', 'createBy', 'memo']}
+                    rowSx={rowSx(drawerVal || null)}
                 >
                     <NumberField source="id" />
                     <TextField source="locNo" label="table.field.loc.locNo" />

--
Gitblit v1.9.1