From 736532c157a3c55af3525e6abfdbed64754deea7 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 25 二月 2026 13:15:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz
---
rsf-admin/src/page/basicInfo/basStation/BasStationCreate.jsx | 143 ++++++++++++++++++++++++-----------------------
1 files changed, 72 insertions(+), 71 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/basStation/BasStationCreate.jsx b/rsf-admin/src/page/basicInfo/basStation/BasStationCreate.jsx
index 2062d7d..5534a72 100644
--- a/rsf-admin/src/page/basicInfo/basStation/BasStationCreate.jsx
+++ b/rsf-admin/src/page/basicInfo/basStation/BasStationCreate.jsx
@@ -35,7 +35,7 @@
import DictionaryArraySelect from "../../components/DictionaryArraySelect";
const BasStationCreate = (props) => {
- const { open, setOpen } = props;
+ const { open, setOpen , copyRecord = null, onClose} = props;
const translate = useTranslate();
const notify = useNotify();
@@ -43,6 +43,7 @@
const handleClose = (event, reason) => {
if (reason !== "backdropClick") {
setOpen(false);
+ if (typeof onClose === 'function') {onClose();}
}
};
@@ -58,7 +59,8 @@
return (
<>
<CreateBase
- record={{}}
+ key={open ? (copyRecord ? 'copy' : 'new') : 'closed'}
+ record={copyRecord || {}}
transform={(data) => {
return data;
}}
@@ -110,10 +112,72 @@
label="table.field.basStation.type"
source="type"
choices={[
- { id: 0, name: '鍏夌數' },
- { id: 1, name: '鏃犲厜鐢�' },
+ { id: 0, name: '鏅鸿兘绔欑偣' },
+ { id: 1, name: '鏅�氱珯鐐�' },
]}
validate={[required()]}
+ />
+ </Grid>
+ <Grid item xs={6} display="flex" gap={1}>
+ <DictionarySelect
+ label={translate("table.field.basStation.useStatus")}
+ name="useStatus"
+ size="small"
+ // validate={[required()]}
+ dictTypeCode="sys_sta_use_stas"
+ />
+ </Grid>
+ {/* <Grid item xs={6} display="flex" gap={1}>
+ <ReferenceInput source="area" reference="warehouseAreas" sort={{ field: 'sort', order: 'ASC' }}>
+ <SelectInput
+ label="table.field.basStation.area"
+ optionText="name"
+ optionValue="id"
+ 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()]}
+ />
+ </Grid> */}
+ <Grid item xs={6} display="flex" gap={1}>
+ <ReferenceArrayInput source="areaIds" reference="warehouseAreas" sort={{ field: 'sort', order: 'ASC' }}>
+ <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> */}
+ <Grid item xs={6} display="flex" gap={1}>
+ <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}>
@@ -138,69 +202,7 @@
validate={[required()]}
/>
</Grid>
- <Grid item xs={6} display="flex" gap={1}>
- <DictionarySelect
- label={translate("table.field.basStation.useStatus")}
- name="useStatus"
- size="small"
- validate={[required()]}
- dictTypeCode="sys_sta_use_stas"
- />
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
- <ReferenceInput source="area" reference="warehouseAreas" sort={{ field: 'sort', order: 'ASC' }}>
- <SelectInput
- label="table.field.basStation.area"
- optionText="name"
- optionValue="id"
- 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()]}
- />
- </Grid>
- <Grid item xs={6} display="flex" gap={1}>
- <ReferenceArrayInput source="areaIds" reference="warehouseAreas" sort={{ field: 'sort', order: 'ASC' }}>
- <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>
- <Grid item xs={6} display="flex" gap={1}>
- <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}>
+ {/* <Grid item xs={6} display="flex" gap={1}>
<SelectInput
label="table.field.basStation.autoTransfer"
source="autoTransfer"
@@ -210,13 +212,12 @@
]}
validate={[required()]}
/>
- </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 }}>
--
Gitblit v1.9.1