#
luxiaotao1123
2024-09-26 648e001c230a4b381c6d7cddcca07afd818c7570
#
2个文件已修改
23 ■■■■■ 已修改文件
zy-acs-flow/src/page/action/ActionList.jsx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-flow/src/page/segment/SegmentList.jsx 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-flow/src/page/action/ActionList.jsx
@@ -160,7 +160,7 @@
                        <TextField source="seqNum" />
                    </ReferenceField>
                    {/* <TextField source="seqNum" label="table.field.action.seqNum" /> */}
                    <NumberField source="priority" label="table.field.action.priority" sortable={false} />
                    <NumberField source="priority" label="table.field.action.priority" sortable={false} sx={{ fontWeight: 'bold' }} />
                    {/* <TextField source="name" label="table.field.action.name" /> */}
                    <ReferenceField source="actionType" label="table.field.action.actionType" reference="actionType" link={false} sortable={false}>
                        <TextField source="name" />
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>