From 91af68093dc3a35e6fc4e584348e61076a6bcdb3 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期五, 06 三月 2026 17:12:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz
---
rsf-admin/src/page/basStationArea/BasStationAreaCreate.jsx | 110 +++++++++++++++---------------------------------------
1 files changed, 31 insertions(+), 79 deletions(-)
diff --git a/rsf-admin/src/page/basStationArea/BasStationAreaCreate.jsx b/rsf-admin/src/page/basStationArea/BasStationAreaCreate.jsx
index ce98977..1d9be34 100644
--- a/rsf-admin/src/page/basStationArea/BasStationAreaCreate.jsx
+++ b/rsf-admin/src/page/basStationArea/BasStationAreaCreate.jsx
@@ -17,6 +17,7 @@
useNotify,
Form,
useCreateController,
+ SelectArrayInput,
} from 'react-admin';
import {
Dialog,
@@ -30,6 +31,8 @@
import DialogCloseButton from "../components/DialogCloseButton";
import StatusSelectInput from "../components/StatusSelectInput";
import MemoInput from "../components/MemoInput";
+import DictionarySelect from "../components/DictionarySelect";
+import DictionaryArraySelect from "../components/DictionaryArraySelect";
const BasStationAreaCreate = (props) => {
const { open, setOpen } = props;
@@ -57,7 +60,10 @@
<CreateBase
record={{}}
transform={(data) => {
- return data;
+ return {
+ ...data,
+ containerTypes: Array.isArray(data.containerTypes) ? data.containerTypes.map(Number) : data.containerTypes
+ };
}}
mutationOptions={{ onSuccess: handleSuccess, onError: handleError }}
>
@@ -84,13 +90,7 @@
</DialogTitle>
<DialogContent sx={{ mt: 2 }}>
<Grid container rowSpacing={2} columnSpacing={2}>
- <Grid item xs={6} display="flex" gap={1}>
- <NumberInput
- label="table.field.basStationArea.type"
- source="type"
- autoFocus
- />
- </Grid>
+
<Grid item xs={6} display="flex" gap={1}>
<TextInput
label="table.field.basStationArea.stationAreaName"
@@ -99,74 +99,22 @@
/>
</Grid>
<Grid item xs={6} display="flex" gap={1}>
- <NumberInput
- label="table.field.basStationArea.inAble"
- source="inAble"
- />
+ <ReferenceArrayInput source="crossZoneArea" reference="warehouseAreas" sort={{ field: 'sort', order: 'ASC' }}>
+ <SelectArrayInput
+ label="table.field.basStation.crossZoneArea"
+ optionText="name"
+ optionValue="id"
+ fullWidth
+ />
+ </ReferenceArrayInput>
</Grid>
<Grid item xs={6} display="flex" gap={1}>
- <NumberInput
- label="table.field.basStationArea.outAble"
- source="outAble"
- />
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
- <TextInput
- label="table.field.basStationArea.useStatus"
- source="useStatus"
- parse={v => v}
- />
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
- <NumberInput
- label="table.field.basStationArea.area"
- source="area"
- />
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
- <NumberInput
- label="table.field.basStationArea.isCrossZone"
- source="isCrossZone"
- />
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
- <TextInput
- label="table.field.basStationArea.crossZoneArea"
- source="crossZoneArea"
- parse={v => v}
- />
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
- <NumberInput
- label="table.field.basStationArea.isWcs"
- source="isWcs"
- />
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
- <TextInput
- label="table.field.basStationArea.wcsData"
- source="wcsData"
- parse={v => v}
- />
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
- <TextInput
- label="table.field.basStationArea.containerType"
- source="containerType"
- parse={v => v}
- />
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
- <TextInput
- label="table.field.basStationArea.barcode"
- source="barcode"
- parse={v => v}
- />
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
- <NumberInput
- label="table.field.basStationArea.autoTransfer"
- source="autoTransfer"
+ <DictionaryArraySelect
+ label={translate("table.field.basStation.containerType")}
+ name="containerType"
+ size="small"
+ validate={[required()]}
+ dictTypeCode="sys_container_type"
/>
</Grid>
<Grid item xs={6} display="flex" gap={1}>
@@ -177,11 +125,15 @@
/>
</Grid>
<Grid item xs={6} display="flex" gap={1}>
- <TextInput
- label="table.field.basStationArea.stationAlias"
- source="stationAlias"
- parse={v => v}
- />
+
+ <ReferenceArrayInput source="stationAlias" reference="basStation">
+ <SelectArrayInput
+ label="table.field.basStationArea.stationAlias"
+ optionText="stationName"
+ optionValue="id"
+ fullWidth
+ />
+ </ReferenceArrayInput>
</Grid>
<Grid item xs={6} display="flex" gap={1}>
--
Gitblit v1.9.1