From eab76cd34bff799686f68e6b70f86c9001e4913f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 23 五月 2025 09:41:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-admin/src/page/basicInfo/locAreaMatRela/LocAreaMatRelaList.jsx | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/locAreaMatRela/LocAreaMatRelaList.jsx b/rsf-admin/src/page/basicInfo/locAreaMatRela/LocAreaMatRelaList.jsx
index dcb16d5..2af0ab4 100644
--- a/rsf-admin/src/page/basicInfo/locAreaMatRela/LocAreaMatRelaList.jsx
+++ b/rsf-admin/src/page/basicInfo/locAreaMatRela/LocAreaMatRelaList.jsx
@@ -115,17 +115,15 @@
preferenceKey='locAreaMatRela'
bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
rowClick={(id, resource, record) => false}
- expand={() => <LocAreaMatRelaPanel />}
- expandSingle={true}
omit={['id', 'createTime', 'createBy', 'memo']}
>
<NumberField source="id" />
- <NumberField source="areaId" label="table.field.locAreaMatRela.areaId" />
+ <NumberField source="areaId$" label="table.field.locAreaMatRela.areaId" />
<TextField source="code" label="table.field.locAreaMatRela.code" />
- <NumberField source="matnrId" label="table.field.locAreaMatRela.matnrId" />
- <NumberField source="groupId" label="table.field.locAreaMatRela.groupId" />
- <NumberField source="locTypeId" label="table.field.locAreaMatRela.locTypeId" />
- <NumberField source="locId" label="table.field.locAreaMatRela.locId" />
+ <NumberField source="matnrId$" label="table.field.locAreaMatRela.matnrId" />
+ <NumberField source="groupId$" label="table.field.locAreaMatRela.groupId" />
+ <NumberField source="locTypeId$" label="table.field.locAreaMatRela.locTypeId" />
+ <NumberField source="locId$" label="table.field.locAreaMatRela.locId" />
<ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
<TextField source="nickname" />
--
Gitblit v1.9.1