From 648e001c230a4b381c6d7cddcca07afd818c7570 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 26 九月 2024 11:05:39 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/page/segment/SegmentList.jsx | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/zy-acs-flow/src/page/segment/SegmentList.jsx b/zy-acs-flow/src/page/segment/SegmentList.jsx
index cbda7cf..eca6837 100644
--- a/zy-acs-flow/src/page/segment/SegmentList.jsx
+++ b/zy-acs-flow/src/page/segment/SegmentList.jsx
@@ -202,7 +202,7 @@
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 +211,23 @@
<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="endNode" label="table.field.segment.endNode" reference="code" link={false} sortable={false}>
- <TextField source="data" />
+ <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" />
<NumberField source="backpack" label="table.field.segment.backpack" />
- <TextField source="state" label="table.field.segment.state" />
-
+ <ReferenceField source="endNode" label="table.field.segment.endNode" reference="code" link={false} sortable={false}>
+ <TextField source="data" />
+ </ReferenceField>
+ <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" />
<ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
<TextField source="nickname" />
</ReferenceField>
--
Gitblit v1.9.1