From ebc705fe5482feff811d526b5c6377bab223ea30 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 25 二月 2025 09:20:23 +0800
Subject: [PATCH] #
---
rsf-admin/src/page/loc/LocEdit.jsx | 249 ++++++++++++++++---------------
rsf-admin/src/page/basicInfo/matnr/MatnrCreate.jsx | 32 +--
rsf-admin/src/page/basicInfo/matnr/MatnrEdit.jsx | 11 -
rsf-admin/src/page/loc/LocCreate.jsx | 17 +
rsf-admin/src/page/warehouseAreas/WarehouseAreasCreate.jsx | 7
rsf-admin/src/page/warehouseAreas/WarehouseAreasEdit.jsx | 9
rsf-admin/src/page/loc/LocPanel.jsx | 38 ++--
rsf-admin/src/page/basicInfo/matnr/MatnrPanel.jsx | 52 +++---
rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx | 6
rsf-admin/src/i18n/zh.js | 3
rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx | 2
rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx | 3
rsf-admin/src/page/loc/LocList.jsx | 2
13 files changed, 222 insertions(+), 209 deletions(-)
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index c617d17..baa7750 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -1,4 +1,4 @@
-import { s } from "motion/react-client";
+import { code, s } from "motion/react-client";
import chineseMessages from "./core/chineseMessages";
const customChineseMessages = {
@@ -437,6 +437,7 @@
form: {
matnr: {
name: '鐗╂枡鍚嶇О涓嶈兘涓虹┖',
+ code: '鐗╂枡缂栫爜涓嶈兘涓虹┖',
shipper: '璐т富涓嶈兘涓虹┖',
groupId: '鍒嗙粍涓嶈兘涓虹┖',
}
diff --git a/rsf-admin/src/page/basicInfo/matnr/MatnrCreate.jsx b/rsf-admin/src/page/basicInfo/matnr/MatnrCreate.jsx
index dffba6b..c160dad 100644
--- a/rsf-admin/src/page/basicInfo/matnr/MatnrCreate.jsx
+++ b/rsf-admin/src/page/basicInfo/matnr/MatnrCreate.jsx
@@ -88,19 +88,15 @@
const handleError = async (error) => {
notify(error.message || 'common.response.fail', { type: 'error', messageArgs: { _: error.message } });
};
- const validateForm = (values) => {
- const errors = {};
- if (!values.shipperId) {
- errors.shipperId = translate('form.matnr.shipper');
- }
- if (!values.groupId) {
- errors.groupId = translate('form.matnr.groupId');
- }
- if (!values.name) {
- errors.name = translate('form.matnr.name');
- }
- return errors;
- };
+ // const validateForm = (values) => {
+ // const errors = {};
+ // if (!values.name) errors.name = translate('form.matnr.name');
+ // if (!values.shipperId) errors.shipperId = translate('form.matnr.shipper');
+ // if (!values.groupId) errors.groupId = translate('form.matnr.groupId');
+ // if (!values.code) errors.code = translate('form.matnr.code');
+
+ // return errors;
+ // };
return (
<>
@@ -119,7 +115,7 @@
disableRestoreFocus
maxWidth="md" // 'xs' | 'sm' | 'md' | 'lg' | 'xl'
>
- <Form validate={validateForm}>
+ <Form >
<DialogTitle id="form-dialog-title" sx={{
position: 'sticky',
top: 0,
@@ -152,7 +148,7 @@
<Grid item xs={6} display="flex" gap={1}>
<TextInput
label="table.field.matnr.code"
- required
+ validate={[required()]}
source="code"
parse={v => v}
/>
@@ -177,9 +173,9 @@
>
<AutocompleteInput
label="table.field.matnr.groupId"
- optionText="code"
+ optionText="name"
validate={[required()]}
- filterToQuery={(val) => ({ code: val })}
+ filterToQuery={(val) => ({ name: val })}
/>
</ReferenceInput>
</Grid>
@@ -187,7 +183,7 @@
<TextInput
label="table.field.matnr.erpCode"
source="erpCode"
- required
+ validate={[required()]}
parse={v => v}
/>
</Grid>
diff --git a/rsf-admin/src/page/basicInfo/matnr/MatnrEdit.jsx b/rsf-admin/src/page/basicInfo/matnr/MatnrEdit.jsx
index 9cf4ddd..80446e5 100644
--- a/rsf-admin/src/page/basicInfo/matnr/MatnrEdit.jsx
+++ b/rsf-admin/src/page/basicInfo/matnr/MatnrEdit.jsx
@@ -75,16 +75,6 @@
const handleChange = (event, newValue) => {
setValue(newValue);
};
- const validateForm = (values) => {
- const errors = {};
- if (!values.shipperId) {
- errors.shipperId = translate('form.matnr.shipper');
- }
- if (!values.groupId) {
- errors.groupId = translate('form.matnr.groupId');
- }
- return errors;
- };
return (
<Edit
redirect="list"
@@ -98,7 +88,6 @@
toolbar={<FormToolbar />}
mode="onTouched"
defaultValues={{}}
- validate={validateForm}
// validate={(values) => { }}
>
<Grid container width={{ xs: '20%', xl: '80%' }} rowSpacing={3} columnSpacing={3}>
diff --git a/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx b/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
index 9cf7280..be006b0 100644
--- a/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
+++ b/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
@@ -155,7 +155,7 @@
<TextField source="name" />
</ReferenceField>
<ReferenceField source="groupId" label="table.field.matnr.groupId" reference="matnrGroup" link={false} sortable={false}>
- <TextField source="code" />
+ <TextField source="name" />
</ReferenceField>
<ReferenceField source="rglarId" label="table.field.matnr.rglarId" reference="batchRegular" link={false} sortable={false}>
<TextField source="code" />
diff --git a/rsf-admin/src/page/basicInfo/matnr/MatnrPanel.jsx b/rsf-admin/src/page/basicInfo/matnr/MatnrPanel.jsx
index ebf9a95..2250a02 100644
--- a/rsf-admin/src/page/basicInfo/matnr/MatnrPanel.jsx
+++ b/rsf-admin/src/page/basicInfo/matnr/MatnrPanel.jsx
@@ -13,7 +13,7 @@
const translate = useTranslate();
return (
<>
- <Card sx={{ width: { xs: 300, sm: 500, md: 600, lg: 800 }, margin: 'auto' }}>
+ <Card sx={{ width: { xs: 300, sm: 500, md: 600, lg: 1400 }, margin: 'auto' }}>
<CardContent>
<Grid container spacing={2}>
<Grid item xs={12} sx={{ display: 'flex', justifyContent: 'space-between' }}>
@@ -40,151 +40,151 @@
</Grid>
<Box height={20}> </Box>
<Grid container spacing={2}>
- <Grid item xs={6}>
+ <Grid item xs={3}>
<PanelTypography
title="table.field.matnr.name"
property={record.name}
/>
</Grid>
- <Grid item xs={6}>
+ <Grid item xs={3}>
<PanelTypography
title="table.field.matnr.code"
property={record.code}
/>
</Grid>
- <Grid item xs={6}>
+ <Grid item xs={3}>
<PanelTypography
title="table.field.matnr.shipperId"
property={record.shipperId$}
/>
</Grid>
- <Grid item xs={6}>
+ <Grid item xs={3}>
<PanelTypography
title="table.field.matnr.groupId"
property={record.groupId$}
/>
</Grid>
- <Grid item xs={6}>
+ <Grid item xs={3}>
<PanelTypography
title="table.field.matnr.rglarId"
property={record.rglarId$}
/>
</Grid>
- <Grid item xs={6}>
+ <Grid item xs={3}>
<PanelTypography
title="table.field.matnr.erpCode"
property={record.erpCode}
/>
</Grid>
- <Grid item xs={6}>
+ <Grid item xs={3}>
<PanelTypography
title="table.field.matnr.spec"
property={record.spec}
/>
</Grid>
- <Grid item xs={6}>
+ <Grid item xs={3}>
<PanelTypography
title="table.field.matnr.model"
property={record.model}
/>
</Grid>
- <Grid item xs={6}>
+ <Grid item xs={3}>
<PanelTypography
title="table.field.matnr.weight"
property={record.weight}
/>
</Grid>
- <Grid item xs={6}>
+ <Grid item xs={3}>
<PanelTypography
title="table.field.matnr.color"
property={record.color}
/>
</Grid>
- <Grid item xs={6}>
+ <Grid item xs={3}>
<PanelTypography
title="table.field.matnr.size"
property={record.size}
/>
</Grid>
- <Grid item xs={6}>
+ <Grid item xs={3}>
<PanelTypography
title="table.field.matnr.describle"
property={record.describle}
/>
</Grid>
- <Grid item xs={6}>
+ <Grid item xs={3}>
<PanelTypography
title="table.field.matnr.nromNum"
property={record.nromNum}
/>
</Grid>
- <Grid item xs={6}>
+ <Grid item xs={3}>
<PanelTypography
title="table.field.matnr.unit"
property={record.unit}
/>
</Grid>
- <Grid item xs={6}>
+ <Grid item xs={3}>
<PanelTypography
title="table.field.matnr.purUnit"
property={record.purUnit}
/>
</Grid>
- <Grid item xs={6}>
+ <Grid item xs={3}>
<PanelTypography
title="table.field.matnr.stockUnit"
property={record.stockUnit}
/>
</Grid>
- <Grid item xs={6}>
+ <Grid item xs={3}>
<PanelTypography
title="table.field.matnr.stockLevel"
property={record.stockLevel$}
/>
</Grid>
- <Grid item xs={6}>
+ <Grid item xs={3}>
<PanelTypography
title="table.field.matnr.isLabelMange"
property={record.isLabelMange$}
/>
</Grid>
- <Grid item xs={6}>
+ <Grid item xs={3}>
<PanelTypography
title="table.field.matnr.safeQty"
property={record.safeQty}
/>
</Grid>
- <Grid item xs={6}>
+ <Grid item xs={3}>
<PanelTypography
title="table.field.matnr.minQty"
property={record.minQty}
/>
</Grid>
- <Grid item xs={6}>
+ <Grid item xs={3}>
<PanelTypography
title="table.field.matnr.maxQty"
property={record.maxQty}
/>
</Grid>
- <Grid item xs={6}>
+ <Grid item xs={3}>
<PanelTypography
title="table.field.matnr.stagn"
property={record.stagn}
/>
</Grid>
- <Grid item xs={6}>
+ <Grid item xs={3}>
<PanelTypography
title="table.field.matnr.valid"
property={record.valid}
/>
</Grid>
- <Grid item xs={6}>
+ <Grid item xs={3}>
<PanelTypography
title="table.field.matnr.validWarn"
property={record.validWarn}
/>
</Grid>
- <Grid item xs={6}>
+ <Grid item xs={3}>
<PanelTypography
title="table.field.matnr.flagCheck"
property={record.flagCheck}
diff --git a/rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx b/rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx
index 5b87ef9..4f4eb57 100644
--- a/rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx
+++ b/rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx
@@ -88,7 +88,7 @@
<TextInput
label="table.field.warehouse.name"
source="name"
- required
+ validate={[required()]}
parse={v => v}
autoFocus
/>
@@ -104,7 +104,7 @@
<TextInput
label="table.field.warehouse.factory"
source="factory"
- required
+ validate={[required()]}
parse={v => v}
/>
</Grid>
@@ -112,7 +112,7 @@
<TextInput
label="table.field.warehouse.address"
source="address"
- required
+ validate={[required()]}
parse={v => v}
/>
</Grid>
diff --git a/rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx b/rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx
index 5e83d70..de45085 100644
--- a/rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx
+++ b/rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx
@@ -67,6 +67,7 @@
<TextInput
label="table.field.warehouse.name"
source="name"
+ validate={[required()]}
parse={v => v}
autoFocus
/>
@@ -82,6 +83,7 @@
<TextInput
label="table.field.warehouse.factory"
source="factory"
+ validate={[required()]}
parse={v => v}
/>
</Stack>
@@ -89,6 +91,7 @@
<TextInput
label="table.field.warehouse.address"
source="address"
+ validate={[required()]}
parse={v => v}
/>
</Stack>
diff --git a/rsf-admin/src/page/loc/LocCreate.jsx b/rsf-admin/src/page/loc/LocCreate.jsx
index da401b5..e47f97b 100644
--- a/rsf-admin/src/page/loc/LocCreate.jsx
+++ b/rsf-admin/src/page/loc/LocCreate.jsx
@@ -85,12 +85,17 @@
<DialogContent sx={{ mt: 2 }}>
<Grid container rowSpacing={2} columnSpacing={2}>
<Grid item xs={6} display="flex" gap={1}>
- <NumberInput
- label="table.field.loc.areaId"
+ <ReferenceInput
source="areaId"
- autoFocus
- validate={required()}
- />
+ reference="warehouseAreas"
+ >
+ <AutocompleteInput
+ label="table.field.loc.areaId"
+ optionText="name"
+ validate={[required()]}
+ filterToQuery={(val) => ({ name: val })}
+ />
+ </ReferenceInput>
</Grid>
<Grid item xs={6} display="flex" gap={1}>
<TextInput
@@ -152,7 +157,7 @@
<Grid item xs={6} display="flex" gap={1}>
<NumberInput
label="table.field.loc.row"
- source="row"
+ source="lrow"
validate={required()}
/>
</Grid>
diff --git a/rsf-admin/src/page/loc/LocEdit.jsx b/rsf-admin/src/page/loc/LocEdit.jsx
index 656f0d9..fdfed0f 100644
--- a/rsf-admin/src/page/loc/LocEdit.jsx
+++ b/rsf-admin/src/page/loc/LocEdit.jsx
@@ -59,132 +59,139 @@
// validate={(values) => { }}
>
<Grid container width={{ xs: '100%', xl: '80%' }} rowSpacing={3} columnSpacing={3}>
- <Grid item xs={12} md={8}>
+ <Grid item xs={12} md={10}>
<Typography variant="h6" gutterBottom>
{translate('common.edit.title.main')}
</Typography>
- <Stack direction='row' gap={2}>
- <NumberInput
- label="table.field.loc.areaId"
- source="areaId"
- autoFocus
- validate={required()}
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <TextInput
- label="table.field.loc.code"
- source="code"
- parse={v => v}
- validate={required()}
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <TextInput
- label="table.field.loc.type"
- source="type"
- parse={v => v}
- validate={required()}
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <TextInput
- label="table.field.loc.name"
- source="name"
- parse={v => v}
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <NumberInput
- label="table.field.loc.flagLogic"
- source="flagLogic"
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <TextInput
- label="table.field.loc.fucAtrrs"
- source="fucAtrrs"
- parse={v => v}
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <TextInput
- label="table.field.loc.barcode"
- source="barcode"
- parse={v => v}
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <TextInput
- label="table.field.loc.unit"
- source="unit"
- parse={v => v}
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <TextInput
- label="table.field.loc.size"
- source="size"
- parse={v => v}
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <NumberInput
- label="table.field.loc.row"
- source="row"
- validate={required()}
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <NumberInput
- label="table.field.loc.col"
- source="col"
- validate={required()}
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <NumberInput
- label="table.field.loc.lev"
- source="lev"
- validate={required()}
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <NumberInput
- label="table.field.loc.channel"
- source="channel"
- validate={required()}
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <NumberInput
- label="table.field.loc.maxParts"
- source="maxParts"
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <NumberInput
- label="table.field.loc.maxPack"
- source="maxPack"
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <NumberInput
- label="table.field.loc.flagLabelMange"
- source="flagLabelMange"
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <TextInput
- label="table.field.loc.locAttrs"
- source="locAttrs"
- parse={v => v}
- validate={required()}
- />
- </Stack>
+ <Grid container rowSpacing={2} columnSpacing={2}>
+ <Grid item xs={6} display="flex" gap={1}>
+ <ReferenceInput
+ source="areaId"
+ reference="warehouseAreas"
+ >
+ <AutocompleteInput
+ label="table.field.loc.areaId"
+ optionText="name"
+ validate={[required()]}
+ filterToQuery={(val) => ({ name: val })}
+ />
+ </ReferenceInput>
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <TextInput
+ label="table.field.loc.code"
+ source="code"
+ parse={v => v}
+ validate={required()}
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <TextInput
+ label="table.field.loc.type"
+ source="type"
+ parse={v => v}
+ validate={required()}
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <TextInput
+ label="table.field.loc.name"
+ source="name"
+ parse={v => v}
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <NumberInput
+ label="table.field.loc.flagLogic"
+ source="flagLogic"
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <TextInput
+ label="table.field.loc.fucAtrrs"
+ source="fucAtrrs"
+ parse={v => v}
+ />
+ </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}>
+ <TextInput
+ label="table.field.loc.unit"
+ source="unit"
+ parse={v => v}
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <TextInput
+ label="table.field.loc.size"
+ source="size"
+ parse={v => v}
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <NumberInput
+ label="table.field.loc.row"
+ source="lrow"
+ validate={required()}
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <NumberInput
+ label="table.field.loc.col"
+ source="col"
+ validate={required()}
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <NumberInput
+ label="table.field.loc.lev"
+ source="lev"
+ validate={required()}
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <NumberInput
+ label="table.field.loc.channel"
+ source="channel"
+ validate={required()}
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <NumberInput
+ label="table.field.loc.maxParts"
+ source="maxParts"
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <NumberInput
+ label="table.field.loc.maxPack"
+ source="maxPack"
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <NumberInput
+ label="table.field.loc.flagLabelMange"
+ source="flagLabelMange"
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <TextInput
+ label="table.field.loc.locAttrs"
+ source="locAttrs"
+ parse={v => v}
+ validate={required()}
+ />
+ </Grid>
+ </Grid>
</Grid>
- <Grid item xs={12} md={4}>
+ <Grid item xs={12} md={2}>
<Typography variant="h6" gutterBottom>
{translate('common.edit.title.common')}
</Typography>
diff --git a/rsf-admin/src/page/loc/LocList.jsx b/rsf-admin/src/page/loc/LocList.jsx
index 033585f..2420c35 100644
--- a/rsf-admin/src/page/loc/LocList.jsx
+++ b/rsf-admin/src/page/loc/LocList.jsx
@@ -142,7 +142,7 @@
<TextField source="barcode" label="table.field.loc.barcode" />
<TextField source="unit" label="table.field.loc.unit" />
<TextField source="size" label="table.field.loc.size" />
- <NumberField source="row" label="table.field.loc.row" />
+ <NumberField source="lrow" label="table.field.loc.row" />
<NumberField source="col" label="table.field.loc.col" />
<NumberField source="lev" label="table.field.loc.lev" />
<NumberField source="channel" label="table.field.loc.channel" />
diff --git a/rsf-admin/src/page/loc/LocPanel.jsx b/rsf-admin/src/page/loc/LocPanel.jsx
index 2101641..32166f7 100644
--- a/rsf-admin/src/page/loc/LocPanel.jsx
+++ b/rsf-admin/src/page/loc/LocPanel.jsx
@@ -13,7 +13,7 @@
const translate = useTranslate();
return (
<>
- <Card sx={{ width: { xs: 300, sm: 500, md: 600, lg: 800 }, margin: 'auto' }}>
+ <Card sx={{ width: { xs: 300, sm: 500, md: 600, lg: 1400 }, margin: 'auto' }}>
<CardContent>
<Grid container spacing={2}>
<Grid item xs={12} sx={{ display: 'flex', justifyContent: 'space-between' }}>
@@ -40,103 +40,103 @@
</Grid>
<Box height={20}> </Box>
<Grid container spacing={2}>
- <Grid item xs={6}>
+ <Grid item xs={3}>
<PanelTypography
title="table.field.loc.areaId"
property={record.areaId}
/>
</Grid>
- <Grid item xs={6}>
+ <Grid item xs={3}>
<PanelTypography
title="table.field.loc.code"
property={record.code}
/>
</Grid>
- <Grid item xs={6}>
+ <Grid item xs={3}>
<PanelTypography
title="table.field.loc.type"
property={record.type}
/>
</Grid>
- <Grid item xs={6}>
+ <Grid item xs={3}>
<PanelTypography
title="table.field.loc.name"
property={record.name}
/>
</Grid>
- <Grid item xs={6}>
+ <Grid item xs={3}>
<PanelTypography
title="table.field.loc.flagLogic"
property={record.flagLogic}
/>
</Grid>
- <Grid item xs={6}>
+ <Grid item xs={3}>
<PanelTypography
title="table.field.loc.fucAtrrs"
property={record.fucAtrrs}
/>
</Grid>
- <Grid item xs={6}>
+ <Grid item xs={3}>
<PanelTypography
title="table.field.loc.barcode"
property={record.barcode}
/>
</Grid>
- <Grid item xs={6}>
+ <Grid item xs={3}>
<PanelTypography
title="table.field.loc.unit"
property={record.unit}
/>
</Grid>
- <Grid item xs={6}>
+ <Grid item xs={3}>
<PanelTypography
title="table.field.loc.size"
property={record.size}
/>
</Grid>
- <Grid item xs={6}>
+ <Grid item xs={3}>
<PanelTypography
title="table.field.loc.row"
- property={record.row}
+ property={record.lrow}
/>
</Grid>
- <Grid item xs={6}>
+ <Grid item xs={3}>
<PanelTypography
title="table.field.loc.col"
property={record.col}
/>
</Grid>
- <Grid item xs={6}>
+ <Grid item xs={3}>
<PanelTypography
title="table.field.loc.lev"
property={record.lev}
/>
</Grid>
- <Grid item xs={6}>
+ <Grid item xs={3}>
<PanelTypography
title="table.field.loc.channel"
property={record.channel}
/>
</Grid>
- <Grid item xs={6}>
+ <Grid item xs={3}>
<PanelTypography
title="table.field.loc.maxParts"
property={record.maxParts}
/>
</Grid>
- <Grid item xs={6}>
+ <Grid item xs={3}>
<PanelTypography
title="table.field.loc.maxPack"
property={record.maxPack}
/>
</Grid>
- <Grid item xs={6}>
+ <Grid item xs={3}>
<PanelTypography
title="table.field.loc.flagLabelMange"
property={record.flagLabelMange}
/>
</Grid>
- <Grid item xs={6}>
+ <Grid item xs={3}>
<PanelTypography
title="table.field.loc.locAttrs"
property={record.locAttrs}
diff --git a/rsf-admin/src/page/warehouseAreas/WarehouseAreasCreate.jsx b/rsf-admin/src/page/warehouseAreas/WarehouseAreasCreate.jsx
index 8b57c41..33ac76b 100644
--- a/rsf-admin/src/page/warehouseAreas/WarehouseAreasCreate.jsx
+++ b/rsf-admin/src/page/warehouseAreas/WarehouseAreasCreate.jsx
@@ -89,6 +89,7 @@
label="table.field.warehouseAreas.uuid"
source="uuid"
parse={v => v}
+ validate={[required()]}
autoFocus
/>
</Grid>
@@ -96,6 +97,7 @@
<TextInput
label="table.field.warehouseAreas.name"
source="name"
+ validate={[required()]}
parse={v => v}
/>
</Grid>
@@ -103,6 +105,7 @@
<TextInput
label="table.field.warehouseAreas.code"
source="code"
+ validate={[required()]}
parse={v => v}
/>
</Grid>
@@ -114,6 +117,7 @@
<AutocompleteInput
label="table.field.warehouseAreas.shipperId"
optionText="name"
+ validate={[required()]}
filterToQuery={(val) => ({ name: val })}
/>
</ReferenceInput>
@@ -128,6 +132,7 @@
<SelectInput
label="table.field.warehouseAreas.flagMinus"
source="flagMinus"
+ validate={[required()]}
choices={[
{ id: 0, name: '鍚�' },
{ id: 1, name: '鏄�' },
@@ -138,6 +143,7 @@
<SelectInput
label="table.field.warehouseAreas.flagLabelMange"
source="flagLabelMange"
+ validate={[required()]}
choices={[
{ id: 0, name: ' 鍚�' },
{ id: 1, name: ' 鏄�' },
@@ -148,6 +154,7 @@
<SelectInput
label="table.field.warehouseAreas.flagMix"
source="flagMix"
+ validate={[required()]}
choices={[
{ id: 0, name: '鍚�' },
{ id: 1, name: '鏄�' },
diff --git a/rsf-admin/src/page/warehouseAreas/WarehouseAreasEdit.jsx b/rsf-admin/src/page/warehouseAreas/WarehouseAreasEdit.jsx
index a9a513e..f32806c 100644
--- a/rsf-admin/src/page/warehouseAreas/WarehouseAreasEdit.jsx
+++ b/rsf-admin/src/page/warehouseAreas/WarehouseAreasEdit.jsx
@@ -68,6 +68,7 @@
label="table.field.warehouseAreas.uuid"
source="uuid"
parse={v => v}
+ validate={[required()]}
autoFocus
/>
</Stack>
@@ -75,6 +76,7 @@
<TextInput
label="table.field.warehouseAreas.name"
source="name"
+ validate={[required()]}
parse={v => v}
/>
</Stack>
@@ -82,6 +84,7 @@
<TextInput
label="table.field.warehouseAreas.code"
source="code"
+ validate={[required()]}
parse={v => v}
/>
</Stack>
@@ -94,6 +97,7 @@
<AutocompleteInput
label="table.field.warehouseAreas.shipperId"
optionText="name"
+ validate={[required()]}
filterToQuery={(val) => ({ name: val })}
/>
</ReferenceInput>
@@ -108,6 +112,7 @@
<SelectInput
label="table.field.warehouseAreas.flagMinus"
source="flagMinus"
+ validate={[required()]}
choices={[
{ id: 0, name: '鍚�' },
{ id: 1, name: '鏄�' },
@@ -118,22 +123,22 @@
<SelectInput
label="table.field.warehouseAreas.flagLabelMange"
source="flagLabelMange"
+ validate={[required()]}
choices={[
{ id: 0, name: ' 鍚�' },
{ id: 1, name: ' 鏄�' },
]}
- validate={required()}
/>
</Stack>
<Stack direction='row' gap={2}>
<SelectInput
label="table.field.warehouseAreas.flagMix"
source="flagMix"
+ validate={[required()]}
choices={[
{ id: 0, name: '鍚�' },
{ id: 1, name: '鏄�' },
]}
- validate={required()}
/>
</Stack>
--
Gitblit v1.9.1