From af5081bc0d0668d526a204076557a171097ddb8d Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 05 二月 2026 14:02:59 +0800
Subject: [PATCH] Merge branch 'refs/heads/rcs_master' into ctu_conveyor
---
zy-acs-flow/src/page/sta/StaList.jsx | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/zy-acs-flow/src/page/sta/StaList.jsx b/zy-acs-flow/src/page/sta/StaList.jsx
index baf38c5..6d91a9a 100644
--- a/zy-acs-flow/src/page/sta/StaList.jsx
+++ b/zy-acs-flow/src/page/sta/StaList.jsx
@@ -30,6 +30,7 @@
ReferenceArrayInput,
AutocompleteInput,
DeleteButton,
+ FunctionField,
} from 'react-admin';
import { Box, Typography, Card, Stack } from '@mui/material';
import { styled } from '@mui/material/styles';
@@ -43,6 +44,7 @@
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import * as Common from '@/utils/common';
import rowSx from "./rowSx";
+import { getCompDirectLabel } from "../loc/compDirect";
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -134,7 +136,7 @@
expand={() => <StaPanel />}
expandSingle={true}
rowSx={rowSx(drawerVal || null)}
- omit={['id', 'uuid', 'name', 'offset', 'zpallet', 'depth'
+ omit={['id', 'uuid', 'name', 'offset', 'zpallet', 'depth', 'capacity'
, 'updateTime', 'updateBy', 'createTime', 'createBy', 'memo']}
>
<NumberField source="id" />
@@ -158,11 +160,16 @@
<NumberField source="rsvInCnt" label="table.field.sta.rsvInCnt" />
<NumberField source="rsvOutCnt" label="table.field.sta.rsvOutCnt" />
<NumberField source="offset" label="table.field.sta.offset" />
- <NumberField source="height" label="table.field.sta.height" />
+ <NumberField source="height" label="table.field.sta.height" sortable={false} />
<NumberField source="depth" label="table.field.sta.depth" />
- <NumberField source="angle" label="table.field.sta.angle" />
- <NumberField source="inboundWait" label="table.field.sta.inboundWait" />
- <NumberField source="outboundWait" label="table.field.sta.outboundWait" />
+ <NumberField source="angle" label="table.field.sta.angle" sortable={false} />
+ <FunctionField
+ label="table.field.sta.actDir"
+ render={(record) => getCompDirectLabel(translate, record?.actDir)}
+ sortable={false}
+ />
+ <NumberField source="inboundWait" label="table.field.sta.inboundWait" sortable={false} />
+ <NumberField source="outboundWait" label="table.field.sta.outboundWait" sortable={false} />
{/* <TextField source="autoing" label="table.field.sta.autoing" />
<TextField source="loading" label="table.field.sta.loading" />
<TextField source="inEnable" label="table.field.sta.inEnable" />
--
Gitblit v1.9.1