From 8eaee61fbbdea1eaa294b0f1a7d9f2a10da9ade9 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 10 三月 2025 17:06:37 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.97.1.152:5880/r/wms-master into dev
---
rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx b/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
index 9cf7280..5480867 100644
--- a/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
+++ b/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
@@ -43,7 +43,7 @@
import MyField from "@/page/components/MyField";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import * as Common from '@/utils/common';
-import ImportButton from "@/page/components/ImportButton";
+import ImportButton from "../../components/ImportButton";
import MatListAside from './MatnrListAside';
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
@@ -155,7 +155,7 @@
<TextField source="name" />
</ReferenceField>
<ReferenceField source="groupId" label="table.field.matnr.groupId" reference="matnrGroup" link={false} sortable={false}>
- <TextField source="code" />
+ <TextField source="name" />
</ReferenceField>
<ReferenceField source="rglarId" label="table.field.matnr.rglarId" reference="batchRegular" link={false} sortable={false}>
<TextField source="code" />
@@ -228,7 +228,9 @@
<FilterButton />
<MyCreateButton onClick={() => { setCreateDialog(true) }} />
<SelectColumnsButton preferenceKey='matnr' />
- <ImportButton />
+ <MatnrList.Context.Provider value={'matnr'}>
+ <ImportButton />
+ </MatnrList.Context.Provider>
<MyExportButton />
</TopToolbar>
)}
@@ -251,4 +253,6 @@
)
}
+MatnrList.Context = React.createContext()
+
export default MatnrList;
\ No newline at end of file
--
Gitblit v1.9.1