From e7dcf3d8570b6a9b2967ba0b90e982322b9cfaf7 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 11 七月 2025 17:10:23 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/locItem/LocItemList.jsx | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/rsf-admin/src/page/locItem/LocItemList.jsx b/rsf-admin/src/page/locItem/LocItemList.jsx
index 8cce6c2..49f35cc 100644
--- a/rsf-admin/src/page/locItem/LocItemList.jsx
+++ b/rsf-admin/src/page/locItem/LocItemList.jsx
@@ -61,6 +61,11 @@
display: 'block',
width: 'auto',
},
+ '& .MuiTableCell-root': {
+ whiteSpace: 'nowrap',
+ overflow: 'visible',
+ textOverflow: 'unset'
+ }
}));
@@ -107,7 +112,7 @@
source="useStatus"
optionValue="value"
parse={v => v}
- alwaysOn
+
/>,
<TextInput source="code" label="table.field.loc.code" />,
<AutocompleteInput
@@ -161,6 +166,7 @@
title={"menu.locItem"}
empty={false}
filters={filters}
+ filter={{ useStatus: 'F' }}
sort={{ field: "create_time", order: "desc" }}
actions={(
<TopToolbar>
@@ -176,7 +182,7 @@
align="left"
bulkActionButtons={false}
rowClick={() => false}
- omit={['id', 'createTime', 'createBy', 'memo', 'updateTime', 'updateBy']}
+ omit={['id', 'createTime', 'createBy$', 'memo', 'updateTime', 'updateBy','statusBool','length','width','height']}
>
<NumberField source="id" />
<NumberField source="warehouseId$" label="table.field.loc.warehouseId" />
--
Gitblit v1.9.1