From c3db115095084be321594058fb545578c4d4f32b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 25 十二月 2024 15:04:52 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/page/segment/SegmentList.jsx | 45 +++++++++++++++++++++++++--------------------
1 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/zy-acs-flow/src/page/segment/SegmentList.jsx b/zy-acs-flow/src/page/segment/SegmentList.jsx
index cbda7cf..d1d49af 100644
--- a/zy-acs-flow/src/page/segment/SegmentList.jsx
+++ b/zy-acs-flow/src/page/segment/SegmentList.jsx
@@ -58,23 +58,24 @@
}));
const filters = [
- <SearchInput source="condition" alwaysOn />,
+ // <SearchInput source="condition" alwaysOn />,
+ <TextInput source="groupId" label="table.field.segment.groupId" alwaysOn/>,
+ <ReferenceInput source="agvId" label="table.field.segment.agvId" reference="agv" alwaysOn>
+ <AutocompleteInput label="table.field.segment.agvId" optionText="uuid" filterToQuery={(val) => ({ uuid: val })} />
+ </ReferenceInput>,
+ <ReferenceInput source="taskId" label="table.field.segment.taskId" reference="task" alwaysOn>
+ <AutocompleteInput label="table.field.segment.taskId" optionText="seqNum" filterToQuery={(val) => ({ seqNum: val })} />
+ </ReferenceInput>,
+ <TextInput source="posType" label="table.field.segment.posType" alwaysOn resettable />,
<DateInput label='common.time.after' source="timeStart" alwaysOn />,
<DateInput label='common.time.before' source="timeEnd" alwaysOn />,
<TextInput source="uuid" label="table.field.segment.uuid" />,
- <TextInput source="groupId" label="table.field.segment.groupId" />,
<NumberInput source="travelId" label="table.field.segment.travelId" />,
- <ReferenceInput source="taskId" label="table.field.segment.taskId" reference="task">
- <AutocompleteInput label="table.field.segment.taskId" optionText="seqNum" filterToQuery={(val) => ({ seqNum: val })} />
- </ReferenceInput>,
- <ReferenceInput source="agvId" label="table.field.segment.agvId" reference="agv">
- <AutocompleteInput label="table.field.segment.agvId" optionText="uuid" filterToQuery={(val) => ({ uuid: val })} />
- </ReferenceInput>,
<ReferenceInput source="endNode" label="table.field.segment.endNode" reference="code">
<AutocompleteInput label="table.field.segment.endNode" optionText="data" filterToQuery={(val) => ({ data: val })} />
</ReferenceInput>,
- <TextInput source="posType" label="table.field.segment.posType" />,
+
<NumberInput source="backpack" label="table.field.segment.backpack" />,
<TextInput label="common.field.memo" source="memo" />,
@@ -107,7 +108,7 @@
title={"menu.segment"}
empty={<EmptyData />}
filters={filters}
- sort={{ field: "create_time", order: "desc" }}
+ sort={{ field: "update_time", order: "desc" }}
actions={(
<TopToolbar>
<FilterButton />
@@ -198,11 +199,11 @@
<>
<StyledDatagrid
preferenceKey='segment'
- bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
+ bulkActionButtons={false}
rowClick={(id, resource, record) => false}
expand={() => <SegmentPanel />}
expandSingle={true}
- omit={['id', 'startNode', 'statusBool', 'updateBy', 'createTime', 'createBy', 'memo']}
+ omit={['id', 'uuid', 'startNode', 'statusBool', 'updateBy', 'createTime', 'createBy', 'memo']}
>
<NumberField source="id" />
{/* <TextField source="segDesc" label="table.field.segment.segDesc" /> */}
@@ -211,20 +212,24 @@
<ReferenceField source="travelId" label="table.field.segment.travelId" reference="travel" link={false} sortable={false}>
<TextField source="uuid" />
</ReferenceField>
- <ReferenceField source="taskId" label="table.field.segment.taskId" reference="task" link={false} sortable={false}>
- <TextField source="seqNum" />
- </ReferenceField>
<ReferenceField source="agvId" label="table.field.segment.agvId" reference="agv" link={false} sortable={false}>
<TextField source="uuid" />
</ReferenceField>
- <NumberField source="serial" label="table.field.segment.serial" />
+ <ReferenceField source="taskId" label="table.field.segment.taskId" reference="task" link={false} sortable={false}>
+ <TextField source="seqNum" />
+ </ReferenceField>
+ <TextField source="posType" label="table.field.segment.posType" sortable={false} />
+ <NumberField source="backpack" label="table.field.segment.backpack" sortable={false} />
+ <NumberField source="algoTime" label="table.field.segment.algoTime" sortable={false} />
<ReferenceField source="endNode" label="table.field.segment.endNode" reference="code" link={false} sortable={false}>
<TextField source="data" />
</ReferenceField>
- <TextField source="posType" label="table.field.segment.posType" />
- <NumberField source="backpack" label="table.field.segment.backpack" />
- <TextField source="state" label="table.field.segment.state" />
-
+ <FunctionField label="table.field.segment.state" cellClassName="state" render={record => (
+ <>
+ {translate(tabs.find(item => item.id === record.state)?.name)}
+ </>
+ )} />
+ <NumberField source="serial" label="table.field.segment.serial" sortable={false} />
<ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
<TextField source="nickname" />
</ReferenceField>
--
Gitblit v1.9.1