From 1bc33546a044cbc84dd9595c19dbcd9a4e309fc9 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期六, 10 一月 2026 14:06:10 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/page/sta/StaList.jsx | 49 ++++++++++++++++++++++++++-----------------------
1 files changed, 26 insertions(+), 23 deletions(-)
diff --git a/zy-acs-flow/src/page/sta/StaList.jsx b/zy-acs-flow/src/page/sta/StaList.jsx
index 3830532..d5475ac 100644
--- a/zy-acs-flow/src/page/sta/StaList.jsx
+++ b/zy-acs-flow/src/page/sta/StaList.jsx
@@ -49,7 +49,7 @@
height: '.9em'
},
'& .RaDatagrid-row': {
- cursor: 'auto'
+ cursor: 'pointer'
},
'& .column-name': {
},
@@ -63,25 +63,25 @@
<TextInput source="staNo" label="table.field.sta.staNo" alwaysOn resettable />,
// <DateInput label='common.time.after' source="timeStart" alwaysOn />,
// <DateInput label='common.time.before' source="timeEnd" alwaysOn />,
- <TextInput source="uuid" label="table.field.sta.uuid" />,
+ // <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" filterToQuery={(val) => ({ name: val })} />
</ReferenceInput>,
<ReferenceInput source="code" label="table.field.sta.code" reference="code" alwaysOn>
<AutocompleteInput label="table.field.sta.code" optionText="data" filterToQuery={(val) => ({ data: val })} />
</ReferenceInput>,
- <TextInput source="name" label="table.field.sta.name" />,
- <ReferenceInput source="staType" label="table.field.sta.staType" reference="staType">
+ // <TextInput source="name" label="table.field.sta.name" />,
+ <ReferenceInput source="staType" label="table.field.sta.staType" reference="staType" alwaysOn>
<AutocompleteInput label="table.field.sta.staType" optionText="name" filterToQuery={(val) => ({ name: val })} />
</ReferenceInput>,
- <NumberInput source="offset" label="table.field.sta.offset" />,
- <TextInput source="autoing" label="table.field.sta.autoing" />,
- <TextInput source="loading" label="table.field.sta.loading" />,
- <TextInput source="inEnable" label="table.field.sta.inEnable" />,
- <TextInput source="outEnable" label="table.field.sta.outEnable" />,
- <ReferenceInput source="staSts" label="table.field.sta.staSts" reference="staSts" alwaysOn>
- <AutocompleteInput label="table.field.sta.staSts" optionText="name" filterToQuery={(val) => ({ name: val })} />
- </ReferenceInput>,
+ // <NumberInput source="offset" label="table.field.sta.offset" />,
+ // <TextInput source="autoing" label="table.field.sta.autoing" />,
+ // <TextInput source="loading" label="table.field.sta.loading" />,
+ // <TextInput source="inEnable" label="table.field.sta.inEnable" />,
+ // <TextInput source="outEnable" label="table.field.sta.outEnable" />,
+ // <ReferenceInput source="staSts" label="table.field.sta.staSts" reference="staSts" alwaysOn>
+ // <AutocompleteInput label="table.field.sta.staSts" optionText="name" filterToQuery={(val) => ({ name: val })} />
+ // </ReferenceInput>,
<TextInput label="common.field.memo" source="memo" />,
<SelectInput
@@ -114,7 +114,7 @@
title={"menu.sta"}
empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
filters={filters}
- sort={{ field: "create_time", order: "desc" }}
+ sort={{ field: "staNo", order: "asc" }}
actions={(
<TopToolbar>
<FilterButton />
@@ -127,31 +127,37 @@
>
<StyledDatagrid
preferenceKey='sta'
- bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
- rowClick={(id, resource, record) => false}
+ // bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
+ bulkActionButtons={false}
+ // rowClick={(id, resource, record) => false}
+ rowClick="expand"
expand={() => <StaPanel />}
expandSingle={true}
rowSx={rowSx(drawerVal || null)}
- omit={['id', 'uuid', 'name', 'zpallet', 'updateBy', 'createTime', 'createBy', 'statusBool', 'memo']}
+ omit={['id', 'uuid', 'name', 'zpallet', 'updateBy', 'createTime', 'createBy', 'memo']}
>
<NumberField source="id" />
+ <ReferenceField source="zoneId" label="table.field.sta.zoneId" reference="zone" link={false} sortable={false}>
+ <TextField source="name" />
+ </ReferenceField>
<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}>
+ <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="data" />
</ReferenceField>
- <ReferenceField source="staSts" label="table.field.sta.staSts" reference="staSts" link={false} sortable={false}>
+ {/* <ReferenceField source="staSts" label="table.field.sta.staSts" reference="staSts" link={false} sortable={false}>
<TextField source="name" />
- </ReferenceField>
+ </ReferenceField> */}
<TextField source="name" label="table.field.sta.name" />
<NumberField source="capacity" label="table.field.sta.capacity" />
- <NumberField source="occCnt" label="table.field.sta.occCnt" />
+ {/* <NumberField source="occCnt" label="table.field.sta.occCnt" /> */}
<NumberField source="rsvInCnt" label="table.field.sta.rsvInCnt" />
<NumberField source="rsvOutCnt" label="table.field.sta.rsvOutCnt" />
<NumberField source="offset" label="table.field.sta.offset" />
+ <NumberField source="angle" label="table.field.sta.angle" />
{/* <TextField source="autoing" label="table.field.sta.autoing" />
<TextField source="loading" label="table.field.sta.loading" />
<TextField source="inEnable" label="table.field.sta.inEnable" />
@@ -161,9 +167,6 @@
<TextField source="nickname" />
</ReferenceField>
<DateField source="updateTime" label="common.field.updateTime" showTime />
- <ReferenceField source="staType" label="table.field.sta.staType" reference="staType" link={false} sortable={false}>
- <TextField source="name" />
- </ReferenceField>
<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">
--
Gitblit v1.9.1