From 523d8cf68615134c7780f74933e70a14edb60f01 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期五, 05 九月 2025 17:00:39 +0800
Subject: [PATCH] wcs联调功能优化

---
 rsf-admin/src/page/basicInfo/warehouse/WarehouseList.jsx |   54 ++++++++++++++++++++++++++++++------------------------
 1 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/rsf-admin/src/page/basicInfo/warehouse/WarehouseList.jsx b/rsf-admin/src/page/basicInfo/warehouse/WarehouseList.jsx
index 691d9b3..f16724d 100644
--- a/rsf-admin/src/page/basicInfo/warehouse/WarehouseList.jsx
+++ b/rsf-admin/src/page/basicInfo/warehouse/WarehouseList.jsx
@@ -44,24 +44,33 @@
 import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
 import * as Common from '@/utils/common';
 
-const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
-    '& .css-1vooibu-MuiSvgIcon-root': {
-        height: '.9em'
-    },
-    '& .RaDatagrid-row': {
-        cursor: 'auto'
-    },
-    '& .column-name': {
-    },
-    '& .opt': {
-        width: 200
-    },
-}));
+// const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
+//     '& .css-1vooibu-MuiSvgIcon-root': {
+//         height: '.9em'
+//     },
+//     '& .RaDatagrid-row': {
+//         cursor: 'auto'
+//     },
+//     '& .column-name': {
+//     },
+//     '& .opt': {
+//         width: 200
+//     },       
+//     '& .RaDatagrid-cell': {
+//         whiteSpace: 'nowrap',
+//         overflow: 'visible',
+//         textOverflow: 'unset',
+//         maxWidth: 'none'
+//     },
+//     '& .MuiTableCell-root': {
+//         whiteSpace: 'nowrap',
+//         overflow: 'visible',
+//         textOverflow: 'unset'
+//     }
+// }));
 
 const filters = [
     <SearchInput source="condition" alwaysOn />,
-    <DateInput label='common.time.after' source="timeStart" alwaysOn />,
-    <DateInput label='common.time.before' source="timeEnd" alwaysOn />,
 
     <TextInput source="name" label="table.field.warehouse.name" />,
     <TextInput source="code" label="table.field.warehouse.code" />,
@@ -100,7 +109,7 @@
                         theme.transitions.create(['all'], {
                             duration: theme.transitions.duration.enteringScreen,
                         }),
-                    marginRight: !!drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
+                    marginRight: drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
                 }}
                 title={"menu.warehouse"}
                 empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
@@ -114,15 +123,13 @@
                         <MyExportButton />
                     </TopToolbar>
                 )}
-                perPage={DEFAULT_PAGE_SIZE}
+                perPage={DEFAULT_PAGE_SIZE}                
             >
-                <StyledDatagrid
+                <DatagridConfigurable
                     preferenceKey='warehouse'
                     bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
-                    rowClick={(id, resource, record) => false}
-                    expand={() => <WarehousePanel />}
-                    expandSingle={true}
-                    omit={['id', 'createTime', 'createBy', 'memo']}
+                    rowClick={(id, resource, record) => false} 
+                    omit={['id', 'createTime', 'createBy', 'memo', 'longitude', 'latgitude', 'length', 'width', 'height']}
                 >
                     <NumberField source="id" />
                     <TextField source="factory" label="table.field.warehouse.factory" />
@@ -143,13 +150,12 @@
                         <TextField source="nickname" />
                     </ReferenceField>
                     <DateField source="createTime" label="common.field.createTime" showTime />
-                    <BooleanField source="statusBool" label="common.field.status" sortable={false} />
                     <TextField source="memo" label="common.field.memo" sortable={false} />
                     <WrapperField cellClassName="opt" label="common.field.opt">
                         <EditButton sx={{ padding: '1px', fontSize: '.75rem' }} />
                         <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
                     </WrapperField>
-                </StyledDatagrid>
+                </DatagridConfigurable>
             </List>
             <WarehouseCreate
                 open={createDialog}

--
Gitblit v1.9.1