#

luxiaotao1123

2024-09-18 93c52c55d3278b5af311c4b0e699b95cc0bd5a1e

#

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

@@ -420,16 +420,16 @@
                startTime: "start time",
                endTime: "end time",
                errTime: "err time",
                oriSta: "origin station",
                oriLoc: "origin location",
                oriCode: "origin code",
                destSta: "destination station",
                destLoc: "destination location",
                destCode: "destination code",
                oriSta: "ori sta",
                oriLoc: "ori loc",
                oriCode: "ori code",
                destSta: "dest sta",
                destLoc: "dest loc",
                destCode: "dest code",
                emptyMk: "empty mk",
                zpallet: "zpallet",
                phase: "phase",
                errDesc: "error desc",
                errDesc: "error",
            },
        }
    }

 zy-acs-flow/src/page/task/TaskList.jsx

@@ -50,7 +50,11 @@
    '& .RaDatagrid-row': {
        cursor: 'auto'
    },
    '& .column-name': {
    '& .column-busId': {
        maxWidth: '8em',
        overflow: 'hidden',
        textOverflow: 'ellipsis',
        whiteSpace: 'nowrap',
    },
    '& .opt': {
        width: 200
@@ -153,25 +157,26 @@
                    rowClick={(id, resource, record) => false}
                    expand={() => <TaskPanel />}
                    expandSingle={true}
                    omit={['id', 'createTime', 'createBy', 'memo']}
                    omit={['id', 'uuid', 'startTime', 'endTime', 'errTime', 'emptyMk', 'zpallet',
                        'updateTime', 'updateBy', 'createTime', 'createBy', 'statusBool', 'memo']}
                >
                    <NumberField source="id" />
                    <TextField source="uuid" label="table.field.task.uuid" />
                    <TextField source="seqNum" label="table.field.task.seqNum" />
                    <ReferenceField source="busId" label="table.field.task.busId" reference="bus" link={false} sortable={false}>
                        <TextField source="seqNum" />
                    </ReferenceField>
                    <TextField source="seqNum" label="table.field.task.seqNum" />
                    <NumberField source="priority" label="table.field.task.priority" />
                    <TextField source="name" label="table.field.task.name" />
                    <ReferenceField source="taskSts" label="table.field.task.taskSts" reference="taskSts" link={false} sortable={false}>
                        <TextField source="name" />
                    </ReferenceField>
                    <ReferenceField source="taskType" label="table.field.task.taskType" reference="taskType" link={false} sortable={false}>
                        <TextField source="name" />
                    </ReferenceField>
                    <ReferenceField source="agvId" label="table.field.task.agvId" reference="agv" link={false} sortable={false}>
                        <TextField source="uuid" />
                    </ReferenceField>
                    {/* <TextField source="name" label="table.field.task.name" /> */}
                    <ReferenceField source="taskType" label="table.field.task.taskType" reference="taskType" link={false} sortable={false}>
                        <TextField source="name" />
                    </ReferenceField>
                    <ReferenceField source="taskSts" label="table.field.task.taskSts" reference="taskSts" link={false} sortable={false}>
                        <TextField source="name" />
                    </ReferenceField>
                    <NumberField source="priority" label="table.field.task.priority" />
                    <DateField source="ioTime" label="table.field.task.ioTime" showTime />
                    <DateField source="startTime" label="table.field.task.startTime" showTime />
                    <DateField source="endTime" label="table.field.task.endTime" showTime />
@@ -196,7 +201,6 @@
                    </ReferenceField>
                    <TextField source="emptyMk" label="table.field.task.emptyMk" />
                    <TextField source="zpallet" label="table.field.task.zpallet" />
                    <TextField source="phase" label="table.field.task.phase" />
                    <TextField source="errDesc" label="table.field.task.errDesc" />

                    <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>