From 668590b860e572990b357747f39810e955823caf Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 19 五月 2025 20:16:53 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/basicInfo/loc/LocList.jsx | 30 ++++++++++++++----------------
1 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/loc/LocList.jsx b/rsf-admin/src/page/basicInfo/loc/LocList.jsx
index 1d2618a..ef686d0 100644
--- a/rsf-admin/src/page/basicInfo/loc/LocList.jsx
+++ b/rsf-admin/src/page/basicInfo/loc/LocList.jsx
@@ -47,9 +47,7 @@
import BatchModal from './BatchModal';
import SubzoneModal from './SubzoneModal';
import PageDrawer from "../../components/PageDrawer";
-import MyField from "../../components/MyField";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
-import * as Common from '@/utils/common';
import DashboardIcon from '@mui/icons-material/Dashboard';
import EditIcon from '@mui/icons-material/Edit';
import request from '@/utils/request';
@@ -68,20 +66,20 @@
'& .column-name': {
},
'& .opt': {
- width: 200
+ width: 180
},
- '& .RaDatagrid-headerCell': {
- textAlign: 'left'
- },
- '& .RaDatagrid-rowCell': {
- textAlign: 'left'
- },
+ // '& .RaDatagrid-headerCell': {
+ // textAlign: 'left'
+ // },
+ // '& .RaDatagrid-rowCell': {
+ // textAlign: 'left'
+ // },
'& .type .MuiTypography-root': {
whiteSpace: 'nowrap',
overflow: 'hidden',
textOverflow: 'ellipsis',
display: 'block',
- width: '200px',
+ width: 'auto',
},
}));
@@ -142,7 +140,6 @@
const translate = useTranslate();
const notify = useNotify();
const refresh = useRefresh();
-
const [createDialog, setCreateDialog] = useState(false);
const [drawerVal, setDrawerVal] = useState(false);
const [initDialog, setInitDialog] = useState(false);
@@ -251,6 +248,10 @@
</WrapperField>
</StyledDatagrid>
+ <InitModal
+ open={initDialog}
+ setOpen={setInitDialog}
+ />
</List>
<LocCreate
open={createDialog}
@@ -262,11 +263,8 @@
setDrawerVal={setDrawerVal}
>
</PageDrawer>
-
- <InitModal
- open={initDialog}
- setOpen={setInitDialog}
- />
+
+
</Box>
)
}
--
Gitblit v1.9.1