From c0a87b9244e1521c76b8a0dc70b922f6fc3e30a1 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 17 七月 2025 16:35:23 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/warehouseAreas/WarehouseAreasList.jsx | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/rsf-admin/src/page/warehouseAreas/WarehouseAreasList.jsx b/rsf-admin/src/page/warehouseAreas/WarehouseAreasList.jsx
index cf5d60c..2ab6e3b 100644
--- a/rsf-admin/src/page/warehouseAreas/WarehouseAreasList.jsx
+++ b/rsf-admin/src/page/warehouseAreas/WarehouseAreasList.jsx
@@ -59,6 +59,11 @@
'& .opt': {
width: 200
},
+ '& .MuiTableCell-root': {
+ whiteSpace: 'nowrap',
+ overflow: 'visible',
+ textOverflow: 'unset'
+ }
}));
const filters = [
@@ -141,24 +146,28 @@
</TopToolbar>
)}
perPage={DEFAULT_PAGE_SIZE}
- >
- <StyledDatagrid
+ >
+
+
+
+ <StyledDatagrid
preferenceKey='warehouseAreas'
bulkActionButtons={
<>
- <WareButton />
+ {/* <WareButton />
<MixButton />
- <StatusButton />
+ <StatusButton /> */}
<BulkDeleteButton mutationMode={OPERATE_MODE} />
</>
}
rowClick={(id, resource, record) => false}
- omit={['id', 'createTime', 'createBy', 'memo']}
+ omit={['id', 'createTime', 'createBy', 'memo','statusBool','flagMix$','flagLabelMange$','shipperId$','supplierId']}
>
<NumberField source="id" />
{/* <TextField source="uuid" label="table.field.warehouseAreas.uuid" /> */}
- <TextField source="name" label="table.field.warehouseAreas.name" />
<TextField source="code" label="table.field.warehouseAreas.code" />
+ <TextField source="name" label="table.field.warehouseAreas.name" />
+
<TextField source="type$" label="table.field.warehouseAreas.type"/>
{/* <ReferenceField source="shipperId" label="table.field.warehouseAreas.shipperId" reference="shipper" link={false} sortable={false}>
<TextField source="name" />
@@ -184,6 +193,7 @@
<DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
</WrapperField>
</StyledDatagrid>
+
</List>
<WarehouseAreasCreate
open={createDialog}
--
Gitblit v1.9.1