#
luxiaotao1123
2024-09-14 2ac6ad1062319d1bfca94550097ace88d6df4a13
#
2个文件已修改
123 ■■■■ 已修改文件
zy-acs-flow/src/page/loc/LocCreate.jsx 56 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-flow/src/page/loc/LocEdit.jsx 67 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-flow/src/page/loc/LocCreate.jsx
@@ -84,14 +84,14 @@
                        </DialogTitle>
                        <DialogContent>
                            <Grid container rowSpacing={2} columnSpacing={2}>
                                <Grid item xs={6} display="flex" gap={1}>
                                {/* <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.loc.uuid"
                                        source="uuid"
                                        parse={v => v}
                                        autoFocus
                                    />
                                </Grid>
                                </Grid> */}
                                <Grid item xs={6} display="flex" gap={1}>
                                    <ReferenceInput
                                        source="zoneId"
@@ -101,6 +101,7 @@
                                            label="table.field.loc.zoneId"
                                            optionText="name"
                                            filterToQuery={(val) => ({ name: val })}
                                            validate={required()}
                                        />
                                    </ReferenceInput>
                                </Grid>
@@ -109,15 +110,36 @@
                                        label="table.field.loc.locNo"
                                        source="locNo"
                                        parse={v => v}
                                        validate={required()}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                <Grid item xs={12} display="flex" gap={1}>
                                    <Grid item xs={4} display="flex" gap={1}>
                                        <NumberInput
                                            label="table.field.loc.row"
                                            source="row"
                                        />
                                    </Grid>
                                    <Grid item xs={4} display="flex" gap={1}>
                                        <NumberInput
                                            label="table.field.loc.bay"
                                            source="bay"
                                        />
                                    </Grid>
                                    <Grid item xs={4} display="flex" gap={1}>
                                        <NumberInput
                                            label="table.field.loc.lev"
                                            source="lev"
                                        />
                                    </Grid>
                                </Grid>
                                {/* <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.loc.name"
                                        source="name"
                                        parse={v => v}
                                    />
                                </Grid>
                                </Grid> */}
                                <Grid item xs={6} display="flex" gap={1}>
                                    <ReferenceInput
                                        source="code"
@@ -159,37 +181,19 @@
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <NumberInput
                                        label="table.field.loc.row"
                                        source="row"
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <NumberInput
                                        label="table.field.loc.bay"
                                        source="bay"
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <NumberInput
                                        label="table.field.loc.lev"
                                        source="lev"
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.loc.barcode"
                                        source="barcode"
                                        parse={v => v}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                {/* <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.loc.zpallet"
                                        source="zpallet"
                                        parse={v => v}
                                    />
                                </Grid>
                                </Grid> */}
                                <Grid item xs={6} display="flex" gap={1}>
                                    <ReferenceInput
                                        source="locType"
@@ -203,9 +207,9 @@
                                    </ReferenceInput>
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                {/* <Grid item xs={6} display="flex" gap={1}>
                                    <StatusSelectInput />
                                </Grid>
                                </Grid> */}
                                <Grid item xs={12} display="flex" gap={1}>
                                    <Stack direction="column" spacing={1} width={'100%'}>
                                        <MemoInput />
zy-acs-flow/src/page/loc/LocEdit.jsx
@@ -63,14 +63,14 @@
                        <Typography variant="h6" gutterBottom>
                            {translate('common.edit.title.main')}
                        </Typography>
                        <Stack direction='row' gap={2}>
                        {/* <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.loc.uuid"
                                source="uuid"
                                parse={v => v}
                                autoFocus
                            />
                        </Stack>
                        </Stack> */}
                        <Stack direction='row' gap={2}>
                            <ReferenceInput
                                source="zoneId"
@@ -83,8 +83,6 @@
                                    filterToQuery={(val) => ({ name: val })}
                                />
                            </ReferenceInput>
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.loc.locNo"
                                source="locNo"
@@ -92,12 +90,32 @@
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <Stack direction='row' gap={2}>
                                <NumberInput
                                    label="table.field.loc.row"
                                    source="row"
                                />
                            </Stack>
                            <Stack direction='row' gap={2}>
                                <NumberInput
                                    label="table.field.loc.bay"
                                    source="bay"
                                />
                            </Stack>
                            <Stack direction='row' gap={2}>
                                <NumberInput
                                    label="table.field.loc.lev"
                                    source="lev"
                                />
                            </Stack>
                        </Stack>
                        {/* <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.loc.name"
                                source="name"
                                parse={v => v}
                            />
                        </Stack>
                        </Stack> */}
                        <Stack direction='row' gap={2}>
                            <ReferenceInput
                                source="code"
@@ -110,8 +128,6 @@
                                    filterToQuery={(val) => ({ data: val })}
                                />
                            </ReferenceInput>
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <SelectInput
                                label="table.field.loc.compDirect"
                                source="compDirect"
@@ -133,29 +149,9 @@
                                    filterToQuery={(val) => ({ name: val })}
                                />
                            </ReferenceInput>
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <NumberInput
                                label="table.field.loc.offset"
                                source="offset"
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <NumberInput
                                label="table.field.loc.row"
                                source="row"
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <NumberInput
                                label="table.field.loc.bay"
                                source="bay"
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <NumberInput
                                label="table.field.loc.lev"
                                source="lev"
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
@@ -164,8 +160,6 @@
                                source="barcode"
                                parse={v => v}
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.loc.zpallet"
                                source="zpallet"
@@ -173,6 +167,14 @@
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                        </Stack>
                    </Grid>
                    <Grid item xs={12} md={4}>
                        <Typography variant="h6" gutterBottom>
                            {translate('common.edit.title.common')}
                        </Typography>
                            <ReferenceInput
                                source="locType"
                                reference="locType"
@@ -184,13 +186,6 @@
                                    filterToQuery={(val) => ({ name: val })}
                                />
                            </ReferenceInput>
                        </Stack>
                    </Grid>
                    <Grid item xs={12} md={4}>
                        <Typography variant="h6" gutterBottom>
                            {translate('common.edit.title.common')}
                        </Typography>
                        <StatusSelectInput />
                        <Box mt="2em" />
                        <MemoInput />