#

vincentlu

昨天 c70ea186cf38ae0cef07d5d712b5261416c968d3

#

 zy-acs-flow/src/page/sta/StaCreate.jsx

@@ -30,6 +30,7 @@
import DialogCloseButton from "../components/DialogCloseButton";
import StatusSelectInput from "../components/StatusSelectInput";
import MemoInput from "../components/MemoInput";
import { compDirectChoices } from "../loc/compDirect";

const StaCreate = (props) => {
    const { open, setOpen } = props;
@@ -152,7 +153,7 @@
                                        />
                                    </ReferenceInput>
                                </Grid>
                                <Grid item xs={4} display="flex" gap={1}>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <NumberInput
                                        label="table.field.sta.capacity"
                                        source="capacity"
@@ -166,7 +167,7 @@
                                        validate={required()}
                                    />
                                </Grid> */}
                                <Grid item xs={4} display="flex" gap={1}>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <NumberInput
                                        label="table.field.sta.height"
                                        source="height"
@@ -181,18 +182,20 @@
                                        validate={[required(), greaterThanZero]}
                                    />
                                </Grid> */}
                                <Grid item xs={4} display="flex" gap={1}>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <NumberInput
                                        label="table.field.sta.angle"
                                        source="angle"
                                        validate={[required(), greaterThanZero]}
                                    />
                                </Grid>
                                <Grid item xs={4} display="flex" gap={1}>
                                    <NumberInput
                                <Grid item xs={6} display="flex" gap={1}>
                                    <SelectInput
                                        label="table.field.sta.actDir"
                                        source="actDir"
                                        validate={greaterThanZero}
                                        choices={compDirectChoices}
                                        translateChoice
                                        validate={[required(), greaterThanZero]}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>

 zy-acs-flow/src/page/sta/StaEdit.jsx

@@ -28,6 +28,7 @@
import CustomerTopToolBar from "../components/EditTopToolBar";
import MemoInput from "../components/MemoInput";
import StatusSelectInput from "../components/StatusSelectInput";
import { compDirectChoices } from "../loc/compDirect";

const FormToolbar = () => {
    const { getValues } = useFormContext();
@@ -136,27 +137,10 @@
                                validate={[required(), greaterThanZero]}
                            />
                            <NumberInput
                                label="table.field.sta.angle"
                                source="angle"
                                validate={[required(), greaterThanZero]}
                            />
                            <NumberInput
                                label="table.field.sta.actDir"
                                source="actDir"
                                validate={greaterThanZero}
                            />
                            {/* <NumberInput
                                label="table.field.sta.offset"
                                source="offset"
                                validate={required()}
                            /> */}
                            <NumberInput
                                label="table.field.sta.height"
                                source="height"
                                validate={[required(), greaterThanZero]}
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            {/* <NumberInput
                                label="table.field.sta.depth"
                                source="depth"
@@ -166,6 +150,25 @@
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <NumberInput
                                label="table.field.sta.angle"
                                source="angle"
                                validate={[required(), greaterThanZero]}
                            />
                            <SelectInput
                                label="table.field.sta.actDir"
                                source="actDir"
                                choices={compDirectChoices}
                                translateChoice
                                validate={[required(), greaterThanZero]}
                            />
                            {/* <NumberInput
                                label="table.field.sta.offset"
                                source="offset"
                                validate={required()}
                            /> */}
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <NumberInput
                                label="table.field.sta.inboundWait"
                                source="inboundWait"
                                validate={greaterThanZero}

 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': {
@@ -161,7 +163,10 @@
                    <NumberField source="height" label="table.field.sta.height" />
                    <NumberField source="depth" label="table.field.sta.depth" />
                    <NumberField source="angle" label="table.field.sta.angle" />
                    <NumberField source="actDir" label="table.field.sta.actDir" />
                    <FunctionField
                        label="table.field.sta.actDir"
                        render={(record) => getCompDirectLabel(translate, record?.actDir)}
                    />
                    <NumberField source="inboundWait" label="table.field.sta.inboundWait" />
                    <NumberField source="outboundWait" label="table.field.sta.outboundWait" />
                    {/* <TextField source="autoing" label="table.field.sta.autoing" />

 zy-acs-flow/src/page/sta/StaPanel.jsx

@@ -26,6 +26,7 @@
} from 'react-admin';
import { format } from 'date-fns';
import * as Common from '@/utils/common'
import { getCompDirectLabel } from "../loc/compDirect";

const STATUS_FIELDS = [
    { key: 'autoing', labelKey: 'table.field.sta.autoing' },
@@ -42,7 +43,10 @@
    { labelKey: 'table.field.sta.rsvInCnt', valueKey: 'rsvInCnt' },
    { labelKey: 'table.field.sta.rsvOutCnt', valueKey: 'rsvOutCnt' },
    { labelKey: 'table.field.sta.angle', valueKey: 'angle' },
    { labelKey: 'table.field.sta.actDir', valueKey: 'actDir' },
    {
        labelKey: 'table.field.sta.actDir',
        getValue: (record, translate) => getCompDirectLabel(translate, record?.actDir),
    },
    // { labelKey: 'table.field.sta.offset', valueKey: 'offset' },
    { labelKey: 'table.field.sta.height', valueKey: 'height' },
    { labelKey: 'table.field.sta.depth', valueKey: 'depth' },
@@ -150,11 +154,11 @@
                    <Box height={12}>&nbsp;</Box>

                    <Grid container spacing={2}>
                        {INFO_FIELDS.map(({ labelKey, valueKey }) => (
                        {INFO_FIELDS.map(({ labelKey, valueKey, getValue }) => (
                            <Grid item xs={12} sm={6} md={4} key={labelKey}>
                                <InfoItem
                                    labelKey={labelKey}
                                    value={getRecordValue(record, valueKey)}
                                    value={getValue ? getValue(record, translate) : getRecordValue(record, valueKey)}
                                />
                            </Grid>
                        ))}