From d99a433c0d0e433e5cd8d216562a3fba5bd3fdd6 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 22 一月 2026 08:30:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

---
 rsf-admin/src/page/basicInfo/basStation/BasStationCreate.jsx |   27 ++++++++++++++++++++++++---
 1 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/rsf-admin/src/page/basicInfo/basStation/BasStationCreate.jsx b/rsf-admin/src/page/basicInfo/basStation/BasStationCreate.jsx
index b6d60a2..75bd7a8 100644
--- a/rsf-admin/src/page/basicInfo/basStation/BasStationCreate.jsx
+++ b/rsf-admin/src/page/basicInfo/basStation/BasStationCreate.jsx
@@ -32,13 +32,14 @@
 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;
 
     const translate = useTranslate();
     const notify = useNotify();
-
+    const dicts = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_station_type')) || [];
     const handleClose = (event, reason) => {
         if (reason !== "backdropClick") {
             setOpen(false);
@@ -92,6 +93,26 @@
                                         source="stationName"
                                         parse={v => v}
                                         autoFocus
+                                        validate={[required()]}
+                                    />
+                                </Grid>
+                                <Grid item xs={6} display="flex" gap={1}>
+                                    <TextInput
+                                        label="table.field.basStation.stationId"
+                                        source="stationId"
+                                        parse={v => v}
+                                        autoFocus
+                                        validate={[required()]}
+                                    />
+                                </Grid>
+                                <Grid item xs={6} display="flex" gap={1}>
+                                    <SelectInput
+                                        label="table.field.basStation.type"
+                                        source="type"
+                                        choices={[
+                                            { id: 0, name: '鍏夌數' },
+                                            { id: 1, name: '鏃犲厜鐢�' },
+                                        ]}
                                         validate={[required()]}
                                     />
                                 </Grid>
@@ -171,9 +192,9 @@
                                     />
                                 </Grid>
                                 <Grid item xs={6} display="flex" gap={1}>
-                                    <DictionarySelect
+                                    <DictionaryArraySelect
                                         label={translate("table.field.basStation.containerType")}
-                                        name="containerType"
+                                        name="containerTypes"
                                         size="small"
                                         validate={[required()]}
                                         dictTypeCode="sys_container_type"

--
Gitblit v1.9.1