From 50c33b34f9e6ae19c003d305e4c0b86cea062bec Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 03 七月 2025 16:30:26 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/basicInfo/basStation/BasStationCreate.jsx | 98 ++++++++++++++++++++++++++-----------------------
1 files changed, 52 insertions(+), 46 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/basStation/BasStationCreate.jsx b/rsf-admin/src/page/basicInfo/basStation/BasStationCreate.jsx
index fa8921b..0993b27 100644
--- a/rsf-admin/src/page/basicInfo/basStation/BasStationCreate.jsx
+++ b/rsf-admin/src/page/basicInfo/basStation/BasStationCreate.jsx
@@ -32,6 +32,7 @@
import StatusSelectInput from "../../components/StatusSelectInput";
import MemoInput from "../../components/MemoInput";
import DictionarySelect from "../../components/DictionarySelect";
+import DictionaryArraySelect from "../../components/DictionaryArraySelect";
const BasStationCreate = (props) => {
const { open, setOpen } = props;
@@ -92,6 +93,7 @@
source="stationName"
parse={v => v}
autoFocus
+ validate={[required()]}
/>
</Grid>
<Grid item xs={6} display="flex" gap={1}>
@@ -102,6 +104,7 @@
{ id: 0, name: '鍚�' },
{ id: 1, name: '鏄�' },
]}
+ validate={[required()]}
/>
</Grid>
<Grid item xs={6} display="flex" gap={1}>
@@ -112,6 +115,7 @@
{ id: 0, name: '鍚�' },
{ id: 1, name: '鏄�' },
]}
+ validate={[required()]}
/>
</Grid>
<Grid item xs={6} display="flex" gap={1}>
@@ -125,65 +129,67 @@
</Grid>
<Grid item xs={6} display="flex" gap={1}>
<ReferenceInput source="area" reference="warehouseAreas">
- <SelectInput
+ <SelectInput
label="table.field.basStation.area"
optionText="name"
optionValue="id"
- fullWidth
- validate={[required()]}
+ fullWidth
+ validate={[required()]}
/>
</ReferenceInput>
</Grid>
<Grid item xs={6} display="flex" gap={1}>
- <SelectInput
- label="table.field.basStation.isCrossZone"
- source="isCrossZone"
- choices={[
- { id: 0, name: '鍚�' },
- { id: 1, name: '鏄�' },
- ]}
- validate={[required()]}
- />
+ <SelectInput
+ label="table.field.basStation.isCrossZone"
+ source="isCrossZone"
+ choices={[
+ { id: 0, name: '鍚�' },
+ { id: 1, name: '鏄�' },
+ ]}
+ validate={[required()]}
+ />
</Grid>
<Grid item xs={6} display="flex" gap={1}>
- <ReferenceArrayInput source="areaIds" reference="warehouseAreas">
- <SelectArrayInput
- label="table.field.basStation.crossZoneArea"
- optionText="name"
- optionValue="id"
- fullWidth
- />
- </ReferenceArrayInput>
+ <ReferenceArrayInput source="areaIds" reference="warehouseAreas">
+ <SelectArrayInput
+ label="table.field.basStation.crossZoneArea"
+ optionText="name"
+ optionValue="id"
+ fullWidth
+ validate={[required()]}
+ />
+ </ReferenceArrayInput>
</Grid>
<Grid item xs={6} display="flex" gap={1}>
- <SelectInput
- label="table.field.basStation.isWcs"
- source="isWcs"
- choices={[
- { id: 0, name: '鍚�' },
- { id: 1, name: '鏄�' },
- ]}
- validate={[required()]}
- />
- </Grid>
+ <SelectInput
+ label="table.field.basStation.isWcs"
+ source="isWcs"
+ choices={[
+ { id: 0, name: '鍚�' },
+ { id: 1, name: '鏄�' },
+ ]}
+ validate={[required()]}
+ />
+ </Grid>
<Grid item xs={6} display="flex" gap={1}>
- <DictionarySelect
- label={translate("table.field.basStation.containerType")}
- name="containerType"
- size="small"
- validate={[required()]}
- dictTypeCode="sys_container_type"
- />
- </Grid>
+ <DictionaryArraySelect
+ label={translate("table.field.basStation.containerType")}
+ name="containerTypes"
+ size="small"
+ validate={[required()]}
+ dictTypeCode="sys_container_type"
+ />
+ </Grid>
<Grid item xs={6} display="flex" gap={1}>
- <SelectInput
- label="table.field.basStation.autoTransfer"
- source="autoTransfer"
- choices={[
- { id: 0, name: '鍚�' },
- { id: 1, name: '鏄�' },
- ]}
- />
+ <SelectInput
+ label="table.field.basStation.autoTransfer"
+ source="autoTransfer"
+ choices={[
+ { id: 0, name: '鍚�' },
+ { id: 1, name: '鏄�' },
+ ]}
+ validate={[required()]}
+ />
</Grid>
<Grid item xs={12} display="flex" gap={1}>
--
Gitblit v1.9.1