From 6d6a1b26fcdad0ae743a6e99c8f321969bd2345f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 12 五月 2025 16:26:16 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

---
 rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx b/rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx
index 2d234a2..daf37a0 100644
--- a/rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx
+++ b/rsf-admin/src/page/basicInfo/warehouse/WarehouseCreate.jsx
@@ -124,7 +124,7 @@
                                         source="longitude"
                                         parse={v => v}
                                     />
-                                     <TextInput
+                                    <TextInput
                                         label="table.field.warehouse.latgitude"
                                         source="latgitude"
                                         parse={v => v}
@@ -135,7 +135,7 @@
                                         label="table.field.warehouse.length"
                                         source="length"
                                     />
-                                     <NumberInput
+                                    <NumberInput
                                         label="table.field.warehouse.width"
                                         source="width"
                                     />
@@ -148,10 +148,19 @@
                                 <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%'}>
+                                <Grid item xs={6} display="flex" gap={1}>
+                                    <TextInput
+                                        label="common.field.memo"
+                                        source="memo"
+                                        parse={v => v}
+                                        fullWidth
+                                        multiline
+                                        minRows={2}
+                                        autoFocus
+                                    />
+                                    {/* <Stack direction="column" spacing={1} width={'100%'}>
                                         <MemoInput />
-                                    </Stack>
+                                    </Stack> */}
                                 </Grid>
                             </Grid>
                         </DialogContent>

--
Gitblit v1.9.1