From 5ddf26e390c8ba6e35dfbf93502c9a46f1bc356c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 19 三月 2025 11:35:52 +0800
Subject: [PATCH] Merge branch 'front' into devlop
---
rsf-admin/src/page/basicInfo/warehouse/WarehouseList.jsx | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/warehouse/WarehouseList.jsx b/rsf-admin/src/page/basicInfo/warehouse/WarehouseList.jsx
index 233fce1..348407c 100644
--- a/rsf-admin/src/page/basicInfo/warehouse/WarehouseList.jsx
+++ b/rsf-admin/src/page/basicInfo/warehouse/WarehouseList.jsx
@@ -60,8 +60,6 @@
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 +98,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) }} />}
@@ -125,9 +123,9 @@
omit={['id', 'createTime', 'createBy', 'memo']}
>
<NumberField source="id" />
- <TextField source="name" label="table.field.warehouse.name" />
- <TextField source="code" label="table.field.warehouse.code" />
<TextField source="factory" label="table.field.warehouse.factory" />
+ <TextField source="name" label="table.field.warehouse.name" />
+ {/* <TextField source="code" label="table.field.warehouse.code" /> */}
<TextField source="address" label="table.field.warehouse.address" />
<TextField source="longitude" label="table.field.warehouse.longitude" />
<TextField source="latgitude" label="table.field.warehouse.latgitude" />
--
Gitblit v1.9.1