From 843d5b6dd50567dadcc56257f074840e80d757aa Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 20 五月 2025 18:42:18 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/basicInfo/locArea/LocAreaList.jsx | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/locArea/LocAreaList.jsx b/rsf-admin/src/page/basicInfo/locArea/LocAreaList.jsx
index d249f05..faacd4e 100644
--- a/rsf-admin/src/page/basicInfo/locArea/LocAreaList.jsx
+++ b/rsf-admin/src/page/basicInfo/locArea/LocAreaList.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.locArea.name" />,
<TextInput source="code" label="table.field.locArea.code" />,
@@ -117,17 +115,15 @@
preferenceKey='locArea'
bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
rowClick={(id, resource, record) => false}
- expand={() => <LocAreaPanel />}
- expandSingle={true}
omit={['id', 'createTime', 'createBy', 'memo']}
>
<NumberField source="id" />
<TextField source="name" label="table.field.locArea.name" />
<TextField source="code" label="table.field.locArea.code" />
- <NumberField source="areaId" label="table.field.locArea.areaId" />
- <ReferenceField source="locId" label="table.field.locArea.locId" reference="loc" link={false} sortable={false}>
+ <NumberField source="areaId$" label="table.field.locArea.areaId" />
+ {/* <ReferenceField source="locId" label="table.field.locArea.locId" reference="loc" link={false} sortable={false}>
<TextField source="warehouseId" />
- </ReferenceField>
+ </ReferenceField> */}
<ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
<TextField source="nickname" />
--
Gitblit v1.9.1