From 384e2196a02471d972cb4516e70ffc0540729d9c Mon Sep 17 00:00:00 2001
From: lbq <1065079612@qq.com>
Date: 星期六, 07 二月 2026 10:53:15 +0800
Subject: [PATCH] 优化基础信息界面属性
---
rsf-admin/src/page/basicInfo/basContainer/BasContainerCreate.jsx | 5
rsf-admin/src/page/basicInfo/matnr/MatnrCreate.jsx | 144 ++++++++-------
rsf-admin/src/page/basicInfo/matnr/MatnrEdit.jsx | 62 +++---
rsf-admin/src/page/basicInfo/loc/LocCreate.jsx | 16 -
rsf-admin/src/page/warehouseAreas/WarehouseAreasCreate.jsx | 46 ++---
rsf-admin/src/page/warehouseAreas/WarehouseAreasList.jsx | 6
rsf-admin/src/page/system/dicts/dictType/DictTypeCreate.jsx | 4
rsf-admin/src/page/system/dicts/dictType/DictDataCreate.jsx | 12
rsf-admin/src/page/warehouseAreas/WarehouseAreasEdit.jsx | 64 +++---
rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupEdit.jsx | 11
rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx | 50 +----
rsf-admin/src/i18n/zh.js | 2
rsf-admin/src/page/basicInfo/loc/LocEdit.jsx | 54 +++---
rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx | 53 +----
14 files changed, 236 insertions(+), 293 deletions(-)
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 7c26330..293103c 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -533,7 +533,7 @@
matnrGroup: {
name: "鐗╂枡鍒嗙粍鍚嶇О",
code: "鐗╂枡鍒嗙粍缂栫爜",
- parentId: "涓婄骇鏍囪瘑",
+ parentId: "涓婄骇鍚嶇О",
parCode: "涓婄骇缂栫爜",
},
warehouse: {
diff --git a/rsf-admin/src/page/basicInfo/basContainer/BasContainerCreate.jsx b/rsf-admin/src/page/basicInfo/basContainer/BasContainerCreate.jsx
index 7ff3a4a..4c1180e 100644
--- a/rsf-admin/src/page/basicInfo/basContainer/BasContainerCreate.jsx
+++ b/rsf-admin/src/page/basicInfo/basContainer/BasContainerCreate.jsx
@@ -99,6 +99,7 @@
<TextInput
label="table.field.basContainer.codeType"
source="codeType"
+ validate={[required()]}
parse={v => v}
/>
</Grid>
@@ -114,14 +115,14 @@
</ReferenceArrayInput>
</Grid>
- <Grid item xs={6} display="flex" gap={1}>
+ {/* <Grid item xs={6} display="flex" gap={1}>
<StatusSelectInput />
</Grid>
<Grid item xs={12} display="flex" gap={1}>
<Stack direction="column" spacing={1} width={'100%'}>
<MemoInput />
</Stack>
- </Grid>
+ </Grid> */}
</Grid>
</DialogContent>
<DialogActions sx={{ position: 'sticky', bottom: 0, backgroundColor: 'background.paper', zIndex: 1000 }}>
diff --git a/rsf-admin/src/page/basicInfo/loc/LocCreate.jsx b/rsf-admin/src/page/basicInfo/loc/LocCreate.jsx
index daf1326..e545f3a 100644
--- a/rsf-admin/src/page/basicInfo/loc/LocCreate.jsx
+++ b/rsf-admin/src/page/basicInfo/loc/LocCreate.jsx
@@ -199,7 +199,7 @@
parse={v => v}
/>
</Grid> */}
- <Grid item xs={6} display="flex" gap={1}>
+ {/* <Grid item xs={6} display="flex" gap={1}>
<NumberInput
label="table.field.loc.length"
source="length"
@@ -215,7 +215,7 @@
source="height"
validate={required()}
/>
- </Grid>
+ </Grid> */}
<Grid item xs={6} display="flex" gap={1}>
<NumberInput
label="table.field.loc.row"
@@ -233,14 +233,14 @@
validate={required()}
/>
</Grid>
- {/* <Grid item xs={6} display="flex" gap={1}>
+ <Grid item xs={6} display="flex" gap={1}>
<NumberInput
label="table.field.loc.channel"
source="channel"
- validate={required()}
+ // validate={required()}
/>
</Grid>
- <Grid item xs={6} display="flex" gap={1}>
+ {/* <Grid item xs={6} display="flex" gap={1}>
<NumberInput
label="table.field.loc.maxParts"
source="maxParts"
@@ -288,16 +288,14 @@
/>
</ReferenceInput> */}
</Grid>
-
-
- <Grid item xs={6} display="flex" gap={1}>
+ {/* <Grid item xs={6} display="flex" gap={1}>
<StatusSelectInput />
</Grid>
<Grid item xs={12} display="flex" gap={1}>
<Stack direction="column" spacing={1} width={'100%'}>
<MemoInput />
</Stack>
- </Grid>
+ </Grid> */}
</Grid>
</DialogContent>
<DialogActions sx={{ position: 'sticky', bottom: 0, backgroundColor: 'background.paper', zIndex: 1000 }}>
diff --git a/rsf-admin/src/page/basicInfo/loc/LocEdit.jsx b/rsf-admin/src/page/basicInfo/loc/LocEdit.jsx
index 465ac76..aa3668e 100644
--- a/rsf-admin/src/page/basicInfo/loc/LocEdit.jsx
+++ b/rsf-admin/src/page/basicInfo/loc/LocEdit.jsx
@@ -88,7 +88,7 @@
{translate('common.edit.title.main')}
</Typography>
<Grid container rowSpacing={2} columnSpacing={2}>
- <Grid item display="flex" gap={2}>
+ <Grid item xs={12} display="flex" gap={2}>
<ReferenceInput
source="warehouseId"
reference="warehouse"
@@ -120,30 +120,6 @@
parse={v => v}
validate={required()}
/>
- <NumberInput
- label="table.field.loc.length"
- source="length"
- />
-
- <NumberInput
- label="table.field.loc.width"
- source="width"
- />
-
- <NumberInput
- label="table.field.loc.height"
- source="height"
- />
- </Grid>
- <Grid item display="flex" gap={1}>
- <ReferenceArrayInput source="typeIds" reference="locType" >
- <SelectArrayInput label="table.field.loc.type" />
- </ReferenceArrayInput>
- <TextInput
- label="table.field.loc.unit"
- source="unit"
- parse={v => v}
- />
<DictionarySelect
label={translate("table.field.loc.useStatus")}
name="useStatus"
@@ -151,18 +127,42 @@
size="small"
dictTypeCode="sys_loc_use_stas"
/>
+ {/* <NumberInput
+ label="table.field.loc.length"
+ source="length"
+ />
+ <NumberInput
+ label="table.field.loc.width"
+ source="width"
+ />
+ <NumberInput
+ label="table.field.loc.height"
+ source="height"
+ /> */}
+ </Grid>
+ <Grid item xs={12} display="flex" gap={1}>
+ <ReferenceArrayInput source="typeIds" reference="locType" >
+ <SelectArrayInput label="table.field.loc.type" />
+ </ReferenceArrayInput>
+ {/* <TextInput
+ label="table.field.loc.unit"
+ source="unit"
+ parse={v => v}
+ /> */}
+ <NumberInput
+ label="table.field.loc.channel"
+ source="channel"
+ />
<NumberInput
label="table.field.loc.row"
source="row"
validate={required()}
/>
-
<NumberInput
label="table.field.loc.col"
source="col"
validate={required()}
/>
-
<NumberInput
label="table.field.loc.lev"
source="lev"
diff --git a/rsf-admin/src/page/basicInfo/matnr/MatnrCreate.jsx b/rsf-admin/src/page/basicInfo/matnr/MatnrCreate.jsx
index f62588a..fcfc444 100644
--- a/rsf-admin/src/page/basicInfo/matnr/MatnrCreate.jsx
+++ b/rsf-admin/src/page/basicInfo/matnr/MatnrCreate.jsx
@@ -151,7 +151,15 @@
<CustomTabPanel value={value} index={0}>
<Grid container rowSpacing={2} columnSpacing={2}>
<Grid item xs={12} display="flex" gap={1}>
- <Grid item xs={6} display="flex" gap={1}>
+ <Grid item xs={4} display="flex" gap={1}>
+ <TextInput
+ label="table.field.matnr.code"
+ validate={[required()]}
+ source="code"
+ parse={v => v}
+ />
+ </Grid>
+ <Grid item xs={4} display="flex" gap={1}>
<TextInput
label="table.field.matnr.name"
validate={[required()]}
@@ -160,24 +168,7 @@
autoFocus
/>
</Grid>
- <Grid item xs={6} display="flex" gap={1}>
- <TextInput
- label="table.field.matnr.code"
- validate={[required()]}
- source="code"
- parse={v => v}
- />
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
- <ReferenceInput source="shipperId" reference="companys" filter={{ type: 'shipper' }}>
- <AutocompleteInput
- label="table.field.matnr.shipperId"
- optionText="name"
- filterToQuery={(val) => ({ name: val })}
- />
- </ReferenceInput>
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
+ <Grid item xs={4} display="flex" gap={1}>
<TreeSelectInput
label="table.field.matnr.groupId"
resource={'matnrGroup'}
@@ -186,86 +177,95 @@
</Grid>
</Grid>
<Grid item xs={12} display="flex" gap={1}>
- <Grid item xs={6} display="flex" gap={1}>
- <TextInput
- label="table.field.matnr.platCode"
- source="platCode"
- parse={v => v}
- />
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
+ <Grid item xs={4} display="flex" gap={1}>
<TextInput
label="table.field.matnr.spec"
source="spec"
parse={v => v}
/>
</Grid>
- <Grid item xs={6} display="flex" gap={1}>
+ <Grid item xs={4} display="flex" gap={1}>
<TextInput
label="table.field.matnr.model"
source="model"
parse={v => v}
/>
</Grid>
- <Grid item xs={6} display="flex" gap={1}>
- <NumberInput
- label="table.field.matnr.weight"
- source="weight"
- />
- </Grid>
</Grid>
<Grid item xs={12} display="flex" gap={1}>
- <Grid item xs={6} display="flex" gap={1}>
+ <Grid item xs={4} display="flex" gap={1}>
<TextInput
label="table.field.matnr.color"
source="color"
parse={v => v}
/>
</Grid>
- <Grid item xs={6} display="flex" gap={1}>
+ <Grid item xs={4} display="flex" gap={1}>
<TextInput
label="table.field.matnr.size"
source="size"
parse={v => v}
/>
</Grid>
- <Grid item xs={6} display="flex" gap={1}>
+ <Grid item xs={4} display="flex" gap={1}>
+ <NumberInput
+ label="table.field.matnr.weight"
+ source="weight"
+ />
+ </Grid>
+ {/* <Grid item xs={6} display="flex" gap={1}>
<TextInput
label="table.field.matnr.describle"
source="describle"
parse={v => v}
/>
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
+ </Grid> */}
+ {/* <Grid item xs={6} display="flex" gap={1}>
<NumberInput
label="table.field.matnr.nromNum"
source="nromNum"
/>
- </Grid>
+ </Grid> */}
+ {/* <Grid item xs={6} display="flex" gap={1}>
+ <TextInput
+ label="table.field.matnr.platCode"
+ source="platCode"
+ parse={v => v}
+ />
+ </Grid> */}
+ {/* <Grid item xs={6} display="flex" gap={1}>
+ <ReferenceInput source="shipperId" reference="companys" filter={{ type: 'shipper' }}>
+ <AutocompleteInput
+ label="table.field.matnr.shipperId"
+ optionText="name"
+ filterToQuery={(val) => ({ name: val })}
+ />
+ </ReferenceInput>
+ </Grid> */}
</Grid>
<Grid item xs={12} display="flex" gap={1}>
- <Grid item xs={6} display="flex" gap={1}>
+ <Grid item xs={4} display="flex" gap={1}>
<TextInput
label="table.field.matnr.unit"
source="unit"
parse={v => v}
/>
</Grid>
- <Grid item xs={6} display="flex" gap={1}>
+ <Grid item xs={4} display="flex" gap={1}>
<TextInput
label="table.field.matnr.purUnit"
source="purchaseUnit"
parse={v => v}
/>
</Grid>
- <Grid item xs={6} display="flex" gap={1}>
+ {/* <Grid item xs={6} display="flex" gap={1}>
<TextInput
label="table.field.matnr.stockUnit"
source="stockUnit"
parse={v => v}
/>
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
+ </Grid> */}
+ {/* <Grid item xs={6} display="flex" gap={1}>
<SelectInput
label="table.field.matnr.stockLevel"
source="stockLevel"
@@ -275,9 +275,9 @@
{ id: 2, name: 'C' },
]}
/>
- </Grid>
+ </Grid> */}
</Grid>
- <Grid item xs={12} display="flex" gap={1}>
+ {/* <Grid item xs={12} display="flex" gap={1}>
<Grid item xs={6} display="flex" gap={1}>
<SelectInput
label="table.field.matnr.isLabelMange"
@@ -303,30 +303,38 @@
<Grid item xs={6} display="flex" gap={1}>
<StatusSelectInput />
</Grid>
- </Grid>
+ </Grid> */}
<Grid item xs={12} display="flex" gap={1}>
- <Stack direction="column" spacing={1} width={'100%'}>
+ {/* <Stack direction="column" spacing={1} width={'100%'}>
<MemoInput />
- </Stack>
+ </Stack> */}
+ <Grid item xs={12} display="flex" gap={1}>
+ <TextInput
+ label="table.field.matnr.describle"
+ source="describle"
+ parse={v => v}
+ />
+ </Grid>
</Grid>
+
</Grid>
</CustomTabPanel>
<CustomTabPanel value={value} index={1}>
<Grid container rowSpacing={2} columnSpacing={2}>
<Grid item xs={12} display="flex" gap={1}>
- <Grid item xs={6} display="flex" gap={1}>
+ <Grid item xs={4} display="flex" gap={1}>
<NumberInput
label="table.field.matnr.safeQty"
source="safeQty"
/>
</Grid>
- <Grid item xs={6} display="flex" gap={1}>
+ <Grid item xs={4} display="flex" gap={1}>
<NumberInput
label="table.field.matnr.minQty"
source="minQty"
/>
</Grid>
- <Grid item xs={6} display="flex" gap={1}>
+ <Grid item xs={4} display="flex" gap={1}>
<NumberInput
label="table.field.matnr.maxQty"
source="maxQty"
@@ -334,19 +342,19 @@
</Grid>
</Grid>
<Grid item xs={12} display="flex" gap={1}>
- <Grid item xs={6} display="flex" gap={1}>
+ <Grid item xs={4} display="flex" gap={1}>
<NumberInput
label="table.field.matnr.stagn"
source="stagn"
/>
</Grid>
- <Grid item xs={6} display="flex" gap={1}>
+ <Grid item xs={4} display="flex" gap={1}>
<NumberInput
label="table.field.matnr.valid"
source="valid"
/>
</Grid>
- <Grid item xs={6} display="flex" gap={1}>
+ <Grid item xs={4} display="flex" gap={1}>
<NumberInput
label="table.field.matnr.validWarn"
source="validWarn"
@@ -369,17 +377,19 @@
</CustomTabPanel>
<CustomTabPanel value={value} index={2}>
<Grid container rowSpacing={2} columnSpacing={2}>
- <Grid item xs={6} display="flex" gap={1}>
- <ReferenceInput
- source="rglar_id"
- reference="serialRule"
- >
- <AutocompleteInput
- label="table.field.matnr.rglarId"
- optionText="name"
- filterToQuery={(val) => ({ name: val })}
- />
- </ReferenceInput>
+ <Grid item xs={12} display="flex" gap={1}>
+ <Grid item xs={6} display="flex" gap={1}>
+ <ReferenceInput
+ source="rglar_id"
+ reference="serialRule"
+ >
+ <AutocompleteInput
+ label="table.field.matnr.rglarId"
+ optionText="name"
+ filterToQuery={(val) => ({ name: val })}
+ />
+ </ReferenceInput>
+ </Grid>
</Grid>
</Grid>
</CustomTabPanel>
diff --git a/rsf-admin/src/page/basicInfo/matnr/MatnrEdit.jsx b/rsf-admin/src/page/basicInfo/matnr/MatnrEdit.jsx
index 8a1160e..48069ec 100644
--- a/rsf-admin/src/page/basicInfo/matnr/MatnrEdit.jsx
+++ b/rsf-admin/src/page/basicInfo/matnr/MatnrEdit.jsx
@@ -127,15 +127,6 @@
<Grid container rowSpacing={2} columnSpacing={2}>
<Grid item xs={6} display="flex" gap={1}>
<TextInput
- label="table.field.matnr.name"
- source="name"
- parse={v => v}
- required
- autoFocus
- />
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
- <TextInput
label="table.field.matnr.code"
source="code"
required
@@ -143,6 +134,15 @@
/>
</Grid>
<Grid item xs={6} display="flex" gap={1}>
+ <TextInput
+ label="table.field.matnr.name"
+ source="name"
+ parse={v => v}
+ required
+ autoFocus
+ />
+ </Grid>
+ {/* <Grid item xs={6} display="flex" gap={1}>
<ReferenceInput source="shipperId" reference="companys" filter={{ type: 'shipper' }}>
<AutocompleteInput
label="table.field.matnr.shipperId"
@@ -150,7 +150,7 @@
filterToQuery={(val) => ({ name: val })}
/>
</ReferenceInput>
- </Grid>
+ </Grid> */}
<Grid item xs={6} display="flex" gap={1}>
{/* <ReferenceInput
source="groupId"
@@ -172,13 +172,13 @@
/>
</Grid>
- <Grid item xs={6} display="flex" gap={1}>
+ {/* <Grid item xs={6} display="flex" gap={1}>
<TextInput
label="table.field.matnr.platCode"
source="platCode"
parse={v => v}
/>
- </Grid>
+ </Grid> */}
<Grid item xs={6} display="flex" gap={1}>
<TextInput
label="table.field.matnr.spec"
@@ -191,12 +191,6 @@
label="table.field.matnr.model"
source="model"
parse={v => v}
- />
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
- <NumberInput
- label="table.field.matnr.weight"
- source="weight"
/>
</Grid>
<Grid item xs={6} display="flex" gap={1}>
@@ -214,18 +208,17 @@
/>
</Grid>
<Grid item xs={6} display="flex" gap={1}>
- <TextInput
- label="table.field.matnr.describle"
- source="describle"
- parse={v => v}
+ <NumberInput
+ label="table.field.matnr.weight"
+ source="weight"
/>
</Grid>
- <Grid item xs={6} display="flex" gap={1}>
+ {/* <Grid item xs={6} display="flex" gap={1}>
<NumberInput
label="table.field.matnr.nromNum"
source="nromNum"
/>
- </Grid>
+ </Grid> */}
<Grid item xs={6} display="flex" gap={1}>
<TextInput
label="table.field.matnr.unit"
@@ -242,12 +235,19 @@
</Grid>
<Grid item xs={6} display="flex" gap={1}>
<TextInput
+ label="table.field.matnr.describle"
+ source="describle"
+ parse={v => v}
+ />
+ </Grid>
+ {/* <Grid item xs={6} display="flex" gap={1}>
+ <TextInput
label="table.field.matnr.stockUnit"
source="stockUnit"
parse={v => v}
/>
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
+ </Grid> */}
+ {/* <Grid item xs={6} display="flex" gap={1}>
<SelectInput
label="table.field.matnr.stockLevel"
source="stockLevel"
@@ -269,7 +269,7 @@
]}
validate={required()}
/>
- </Grid>
+ </Grid> */}
{dynamicFields.map((item) => {
return (
@@ -288,7 +288,7 @@
</CustomTabPanel>
<CustomTabPanel value={value} index={1}>
<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.matnr.name"
source="name"
@@ -304,7 +304,7 @@
required
parse={v => v}
/>
- </Grid>
+ </Grid> */}
<Grid item xs={6} display="flex" gap={1}>
<NumberInput
label="table.field.matnr.safeQty"
@@ -355,7 +355,7 @@
</CustomTabPanel>
<CustomTabPanel value={value} index={2}>
<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.matnr.name"
source="name"
@@ -371,7 +371,7 @@
required
parse={v => v}
/>
- </Grid>
+ </Grid> */}
<Grid item xs={6} display="flex" gap={1}>
<ReferenceInput
source="rglarId"
diff --git a/rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupEdit.jsx b/rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupEdit.jsx
index c2e5226..dd6b9e7 100644
--- a/rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupEdit.jsx
+++ b/rsf-admin/src/page/basicInfo/matnrGroup/MatnrGroupEdit.jsx
@@ -85,18 +85,19 @@
</Grid>
<Grid item xs={6} display="flex" gap={1}>
<TextInput
- label="table.field.matnrGroup.name"
- source="name"
+ label="table.field.matnrGroup.code"
+ source="code"
parse={v => v}
+ readOnly={!!editRecord}
validate={required()}
/>
</Grid>
<Grid item xs={6} display="flex" gap={1}>
<TextInput
- label="table.field.matnrGroup.code"
- source="code"
+ label="table.field.matnrGroup.name"
+ source="name"
parse={v => v}
- readOnly={!!editRecord}
+ validate={required()}
/>
</Grid>
</Grid>
diff --git a/rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx b/rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx
index 458b4de..993a1e1 100644
--- a/rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx
+++ b/rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx
@@ -86,16 +86,6 @@
<Grid container rowSpacing={2} columnSpacing={2}>
<Grid item xs={6} display="flex" gap={1}>
<TextInput
- label="table.field.warehouse.factory"
- source="factory"
- validate={[required()]}
- parse={v => v}
- autoFocus
- />
-
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
- <TextInput
label="table.field.warehouse.code"
source="code"
validate={[required()]}
@@ -112,6 +102,15 @@
</Grid>
<Grid item xs={6} display="flex" gap={1}>
<TextInput
+ label="table.field.warehouse.factory"
+ source="factory"
+ validate={[required()]}
+ parse={v => v}
+ autoFocus
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <TextInput
label="table.field.warehouse.address"
source="address"
// validate={[required()]}
@@ -119,36 +118,9 @@
/>
</Grid>
{/* <Grid item xs={6} display="flex" gap={1}>
- <TextInput
- label="table.field.warehouse.longitude"
- source="longitude"
- parse={v => v}
- />
- <TextInput
- label="table.field.warehouse.latgitude"
- source="latgitude"
- parse={v => v}
- />
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
- <NumberInput
- label="table.field.warehouse.length"
- source="length"
- />
- <NumberInput
- label="table.field.warehouse.width"
- source="width"
- />
- <NumberInput
- label="table.field.warehouse.height"
- source="height"
- />
- </Grid> */}
-
- <Grid item xs={6} display="flex" gap={1}>
<StatusSelectInput />
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
+ </Grid> */}
+ <Grid item xs={12} display="flex" gap={1}>
<TextInput
label="common.field.memo"
source="memo"
diff --git a/rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx b/rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx
index 57a42ef..a435337 100644
--- a/rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx
+++ b/rsf-admin/src/page/basicInfo/warehouse/WarehouseEdit.jsx
@@ -66,15 +66,6 @@
</Typography>
<Stack direction='row' gap={2}>
<TextInput
- label="table.field.warehouse.factory"
- source="factory"
- validate={[required()]}
- parse={v => v}
- autoFocus
- />
- </Stack>
- <Stack direction='row' gap={2}>
- <TextInput
label="table.field.warehouse.code"
source="code"
validate={[required()]}
@@ -91,42 +82,21 @@
</Stack>
<Stack direction='row' gap={2}>
<TextInput
+ label="table.field.warehouse.factory"
+ source="factory"
+ validate={[required()]}
+ parse={v => v}
+ autoFocus
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <TextInput
label="table.field.warehouse.address"
source="address"
- // validate={[required()]}
parse={v => v}
/>
- </Stack>
+ </Stack>
{/* <Stack direction='row' gap={2}>
- <TextInput
- label="table.field.warehouse.longitude"
- source="longitude"
- parse={v => v}
- />
- <TextInput
- label="table.field.warehouse.latgitude"
- source="latgitude"
- parse={v => v}
- />
- </Stack>
- <Stack direction='row' gap={2}>
-
- </Stack>
- <Stack direction='row' gap={2}>
- <NumberInput
- label="table.field.warehouse.length"
- source="length"
- />
- <NumberInput
- label="table.field.warehouse.width"
- source="width"
- />
- <NumberInput
- label="table.field.warehouse.height"
- source="height"
- />
- </Stack> */}
- <Stack direction='row' gap={2}>
<SelectInput
label="common.field.status"
source="status"
@@ -137,12 +107,11 @@
]}
resettable
/>
- </Stack>
+ </Stack> */}
<Stack direction='row' gap={2}>
<TextInput
label="common.field.memo"
source="memo"
- // validate={[required()]}
parse={v => v}
/>
</Stack>
diff --git a/rsf-admin/src/page/system/dicts/dictType/DictDataCreate.jsx b/rsf-admin/src/page/system/dicts/dictType/DictDataCreate.jsx
index 10ddfcb..51a279f 100644
--- a/rsf-admin/src/page/system/dicts/dictType/DictDataCreate.jsx
+++ b/rsf-admin/src/page/system/dicts/dictType/DictDataCreate.jsx
@@ -121,7 +121,7 @@
parse={v => v}
/>
</Grid>
- <Grid item xs={6} display="flex" gap={1}>
+ {/* <Grid item xs={6} display="flex" gap={1}>
<TextInput
label="table.field.dictData.group"
validate={required()}
@@ -129,7 +129,7 @@
source="group"
parse={v => v}
/>
- </Grid>
+ </Grid> */}
<Grid item xs={6} display="flex" gap={1}>
<NumberInput
label="table.field.dictData.sort"
@@ -144,14 +144,14 @@
/>
</Grid> */}
- <Grid item xs={6} display="flex" gap={1}>
+ {/* <Grid item xs={6} display="flex" gap={1}>
<StatusSelectInput />
- </Grid>
- <Grid item xs={12} display="flex" gap={1}>
+ </Grid> */}
+ {/* <Grid item xs={12} display="flex" gap={1}>
<Stack direction="column" spacing={1} width={'100%'}>
<MemoInput />
</Stack>
- </Grid>
+ </Grid> */}
</Grid>
</DialogContent>
<DialogActions sx={{ position: 'sticky', bottom: 0, backgroundColor: 'background.paper', zIndex: 1000 }}>
diff --git a/rsf-admin/src/page/system/dicts/dictType/DictTypeCreate.jsx b/rsf-admin/src/page/system/dicts/dictType/DictTypeCreate.jsx
index 0a31d6f..1d2a3cd 100644
--- a/rsf-admin/src/page/system/dicts/dictType/DictTypeCreate.jsx
+++ b/rsf-admin/src/page/system/dicts/dictType/DictTypeCreate.jsx
@@ -108,11 +108,11 @@
<Grid item xs={6} display="flex" gap={1}>
<StatusSelectInput />
</Grid>
- <Grid item xs={12} display="flex" gap={1}>
+ {/* <Grid item xs={12} display="flex" gap={1}>
<Stack direction="column" spacing={1} width={'100%'}>
<MemoInput />
</Stack>
- </Grid>
+ </Grid> */}
</Grid>
</DialogContent>
<DialogActions sx={{ position: 'sticky', bottom: 0, backgroundColor: 'background.paper', zIndex: 1000 }}>
diff --git a/rsf-admin/src/page/warehouseAreas/WarehouseAreasCreate.jsx b/rsf-admin/src/page/warehouseAreas/WarehouseAreasCreate.jsx
index 46a4ce7..f8c7147 100644
--- a/rsf-admin/src/page/warehouseAreas/WarehouseAreasCreate.jsx
+++ b/rsf-admin/src/page/warehouseAreas/WarehouseAreasCreate.jsx
@@ -92,17 +92,6 @@
<DialogContent sx={{ mt: 2 }}>
<Grid container rowSpacing={2} columnSpacing={2}>
<Grid item xs={12} display="flex" gap={1}>
- <ReferenceInput
- source="warehouseId"
- reference="warehouse"
- >
- <AutocompleteInput
- label="table.field.warehouseAreas.wareId"
- optionText="name"
- validate={[required()]}
- filterToQuery={(val) => ({ name: val })}
- />
- </ReferenceInput>
<TextInput
label="table.field.warehouseAreas.code"
source="code"
@@ -118,6 +107,17 @@
/>
</Grid>
<Grid item xs={12} display="flex" gap={1}>
+ <ReferenceInput
+ source="warehouseId"
+ reference="warehouse"
+ >
+ <AutocompleteInput
+ label="table.field.warehouseAreas.wareId"
+ optionText="name"
+ validate={[required()]}
+ filterToQuery={(val) => ({ name: val })}
+ />
+ </ReferenceInput>
<AutocompleteInput
choices={dicts}
optionText="label"
@@ -127,20 +127,13 @@
parse={v => v}
validate={[required()]}
/>
- <NumberInput
+ {/* <NumberInput
label="table.field.warehouseAreas.sort"
source="sort"
parse={v => v}
- />
- {/* <SelectInput
- label="table.field.warehouseAreas.flagLabelMange"
- source="flagLabelMange"
- validate={[required()]}
- choices={[
- { id: 0, name: " 鍚�" },
- { id: 1, name: " 鏄�" },
- ]}
- /> */}
+ /> */}
+ </Grid>
+ <Grid item xs={12} display="flex" gap={1}>
<SelectInput
label="table.field.warehouseAreas.flagMix"
source="flagMix"
@@ -150,7 +143,7 @@
{ id: 1, name: "鏄�" },
]}
/>
- <SelectInput
+ <SelectInput
label="table.field.warehouseAreas.flagMinus"
source="flagMinus"
validate={[required()]}
@@ -160,7 +153,7 @@
]}
/>
</Grid>
- <Grid item xs={12} display="flex" gap={1}>
+ {/* <Grid item xs={12} display="flex" gap={1}>
<ReferenceInput source="shipperId" reference="companys" filter={{ type: 'shipper' }}>
<AutocompleteInput
label="table.field.warehouseAreas.shipperId"
@@ -175,10 +168,9 @@
filterToQuery={(val) => ({ name: val })}
/>
</ReferenceInput>
- </Grid>
-
+ </Grid> */}
<Grid item xs={12} display="flex" gap={1}>
- <StatusSelectInput />
+ {/* <StatusSelectInput /> */}
<TextInput
label="common.field.memo"
source="memo"
diff --git a/rsf-admin/src/page/warehouseAreas/WarehouseAreasEdit.jsx b/rsf-admin/src/page/warehouseAreas/WarehouseAreasEdit.jsx
index cc2cdf5..07fc049 100644
--- a/rsf-admin/src/page/warehouseAreas/WarehouseAreasEdit.jsx
+++ b/rsf-admin/src/page/warehouseAreas/WarehouseAreasEdit.jsx
@@ -76,21 +76,6 @@
/>
</Stack> */}
<Stack direction='row' gap={2}>
- <ReferenceInput
- source="warehouseId"
- reference="warehouse"
- autoFocus
- >
- <AutocompleteInput
- label="table.field.warehouseAreas.wareId"
- optionText="name"
- optionValue="id"
- validate={[required()]}
- filterToQuery={(val) => ({ name: val })}
- />
- </ReferenceInput>
- </Stack>
- <Stack direction='row' gap={2}>
<TextInput
label="table.field.warehouseAreas.code"
source="code"
@@ -107,6 +92,21 @@
/>
</Stack>
<Stack direction='row' gap={2}>
+ <ReferenceInput
+ source="warehouseId"
+ reference="warehouse"
+ autoFocus
+ >
+ <AutocompleteInput
+ label="table.field.warehouseAreas.wareId"
+ optionText="name"
+ optionValue="id"
+ validate={[required()]}
+ filterToQuery={(val) => ({ name: val })}
+ />
+ </ReferenceInput>
+ </Stack>
+ <Stack direction='row' gap={2}>
<DictionarySelect
label='table.field.warehouseAreas.type'
name="type"
@@ -114,13 +114,13 @@
alwaysOn
/>
</Stack>
- <Stack direction='row' gap={2}>
+ {/* <Stack direction='row' gap={2}>
<NumberInput
label="table.field.warehouseAreas.sort"
source="sort"
parse={v => v}
/>
- </Stack>
+ </Stack> */}
<Stack direction='row' gap={2}>
<SelectInput
label="table.field.warehouseAreas.flagMix"
@@ -141,6 +141,14 @@
{ id: 0, name: '鍚�' },
{ id: 1, name: '鏄�' },
]}
+ />
+ </Stack>
+ <Stack direction='row' gap={2}>
+ <TextInput
+ label="common.field.memo"
+ source="memo"
+ parse={v => v}
+ multiline
/>
</Stack>
{/* <Stack direction='row' gap={2}>
@@ -195,7 +203,7 @@
{/* {translate('common.edit.title.main')} */}
</Typography>
<Stack direction='row' gap={2}>
- <ReferenceInput
+ {/* <ReferenceInput
source="shipperId"
reference="companys"
filter={{ type: 'shipper' }}
@@ -205,7 +213,7 @@
optionText="name"
filterToQuery={(val) => ({ name: val })}
/>
- </ReferenceInput>
+ </ReferenceInput> */}
{/* <SelectInput
label="table.field.warehouseAreas.flagLabelMange"
source="flagLabelMange"
@@ -216,7 +224,7 @@
]}
/> */}
</Stack>
- <Stack direction='row' gap={2}>
+ {/* <Stack direction='row' gap={2}>
<ReferenceInput
source="supplierId"
reference="companys"
@@ -228,9 +236,9 @@
filterToQuery={(val) => ({ name: val })}
/>
</ReferenceInput>
- </Stack>
- <Stack direction='row' gap={2}>
- {/* <StatusSelectInput /> */}
+ </Stack> */}
+ {/* <Stack direction='row' gap={2}>
+ <StatusSelectInput />
<SelectInput
label="common.field.status"
source="status"
@@ -241,15 +249,7 @@
]}
resettable
/>
- </Stack>
- <Stack direction='row' gap={2}>
- <TextInput
- label="common.field.memo"
- source="memo"
- parse={v => v}
- multiline
- />
- </Stack>
+ </Stack> */}
</Grid>
</Grid>
</SimpleForm>
diff --git a/rsf-admin/src/page/warehouseAreas/WarehouseAreasList.jsx b/rsf-admin/src/page/warehouseAreas/WarehouseAreasList.jsx
index 0533580..a271012 100644
--- a/rsf-admin/src/page/warehouseAreas/WarehouseAreasList.jsx
+++ b/rsf-admin/src/page/warehouseAreas/WarehouseAreasList.jsx
@@ -152,14 +152,14 @@
bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
rowClick={(id, resource, record) => false}
stickyRight={['opt']}
- hiddenColumns={['id', 'updateTime', 'updateBy', 'createTime', 'createBy', 'longitude', 'latgitude', 'length', 'width', 'height']}
+ hiddenColumns={['id', 'updateTime', 'updateBy', 'createTime', 'createBy', 'longitude', 'latgitude', 'length', 'width', 'height', 'shipperId$', 'supplierId', 'sort']}
>
<NumberField source="id" />
+ <NumberField source="sort" label="table.field.warehouseAreas.sort" />
<TextField source="warehouseId$" label="table.field.warehouseAreas.wareId" />
<TextField source="code" label="table.field.warehouseAreas.code" />
<TextField source="name" label="table.field.warehouseAreas.name" />
- <TextField source="type$" label="table.field.warehouseAreas.type" />
- <NumberField source="sort" label="table.field.warehouseAreas.sort" />
+ <TextField source="type$" label="table.field.warehouseAreas.type"/>
<TextField source="shipperId$" label="table.field.warehouseAreas.shipperId" />
<NumberField source="supplierId" label="table.field.warehouseAreas.supplierId" />
<TextField source="flagMix$" label="table.field.warehouseAreas.flagMix" sortable={false} />
--
Gitblit v1.9.1