#

luxiaotao1123

2024-09-26 341cbb162fe4a3ab112486bd52e81b8167cbc048

#

 zy-acs-flow/src/i18n/en.js

@@ -496,7 +496,7 @@
                avoAgv: "avoid agv",
                avoCode: "avoid code",
                avoSeg: "avoid seg",
                cycleAvo: "cycle avoid",
                cycleAvo: "cycle",
                cycleCode: "cycle code",
                startTime: "start time",
                notifyTime: "notify time",

 zy-acs-flow/src/page/jam/JamList.jsx

@@ -172,21 +172,28 @@
                    preferenceKey='jam'
                    bulkActionButtons={false}
                    rowClick={(id, resource, record) => false}
                    expand={() => <JamPanel />}
                    expandSingle={true}
                    // expand={() => <JamPanel />}
                    // expandSingle={true}
                    omit={['id', 'uuid', 'cycleCode', 'updateBy', 'updateTime', 'createTime', 'createBy', 'statusBool', 'memo']}
                >
                    <NumberField source="id" />
                    <TextField source="uuid" label="table.field.jam.uuid" />
                    {/* <TextField source="name" label="table.field.jam.name" /> */}
                    <ReferenceField source="jamSeg" label="table.field.jam.jamSeg" reference="segment" link={false} sortable={false}>
                        <FunctionField render={(record) => {
                            return <>{record.groupId} - {record.serial}</>
                        }} />
                    </ReferenceField>
                    <ReferenceField source="jamAgv" label="table.field.jam.jamAgv" reference="agv" link={false} sortable={false} >
                        <TextField source="uuid" sx={{ fontWeight: 'bold' }} />
                    </ReferenceField>
                    <ReferenceField source="jamCode" label="table.field.jam.jamCode" reference="code" link={false} sortable={false}>
                        <TextField source="data" />
                    </ReferenceField>
                    <ReferenceField source="jamSeg" label="table.field.jam.jamSeg" reference="segment" link={false} sortable={false}>
                        <TextField source="id" />
                    <ReferenceField source="avoSeg" label="table.field.jam.avoSeg" reference="segment" link={false} sortable={false}>
                        <FunctionField render={(record) => {
                            return <>{record.groupId} - {record.serial}</>
                        }} />
                    </ReferenceField>
                    <ReferenceField source="avoAgv" label="table.field.jam.avoAgv" reference="agv" link={false} sortable={false}>
                        <TextField source="uuid" sx={{ fontWeight: 'bold' }} />
@@ -194,10 +201,7 @@
                    <ReferenceField source="avoCode" label="table.field.jam.avoCode" reference="code" link={false} sortable={false}>
                        <TextField source="data" />
                    </ReferenceField>
                    <ReferenceField source="avoSeg" label="table.field.jam.avoSeg" reference="segment" link={false} sortable={false}>
                        <TextField source="id" />
                    </ReferenceField>
                    <BooleanField source="cycleAvoBool" label="table.field.jam.cycleAvo" />
                    <BooleanField source="cycleAvoBool" label="table.field.jam.cycleAvo" sortable={false} />
                    <ReferenceField source="cycleCode" label="table.field.jam.cycleCode" reference="code" link={false} sortable={false}>
                        <TextField source="data" />
                    </ReferenceField>