From d20c04c88f55e1581bb2054d99483aba95f04fee Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 13 三月 2025 13:17:51 +0800
Subject: [PATCH] Merge branch 'front' into devlop
---
rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx b/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
index 5f4ddcd..e2e4c63 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 }) => ({
@@ -76,7 +76,7 @@
<ReferenceInput source="rglarId" label="table.field.matnr.rglarId" reference="rglarId">
<AutocompleteInput label="table.field.matnr.rglarId" optionText="code" filterToQuery={(val) => ({ code: val })} />
</ReferenceInput>,
- <TextInput source="erpCode" label="table.field.matnr.erpCode" />,
+ <TextInput source="platCode" label="table.field.matnr.platCode" />,
<TextInput source="spec" label="table.field.matnr.spec" />,
<TextInput source="model" label="table.field.matnr.model" />,
<NumberInput source="weight" label="table.field.matnr.weight" />,
@@ -143,7 +143,7 @@
rowClick={(id, resource, record) => false}
expand={() => <MatnrPanel />}
expandSingle={true}
- omit={['id','shipperId','erpCode','spec','model','weight','color','size','describle'
+ omit={['id','shipperId','platCode','spec','model','weight','color','size','describle'
,'nromNum','unit','purchaseUnit','stockUnit','stockLeval','isLabelMange','safeQty'
,'minQty','maxQty','stagn','valid','validWarn','flagCheck','updateTime', 'updateBy'
, 'createTime', 'createBy', 'memo']}
@@ -151,16 +151,16 @@
<NumberField source="id" />
<TextField source="name" label="table.field.matnr.name" />
<TextField source="code" label="table.field.matnr.code" />
- <ReferenceField source="shipperId$" label="table.field.matnr.shipperId" reference="shipper" link={false} sortable={false}>
+ <ReferenceField source="shipperId" label="table.field.matnr.shipperId" reference="shipper" link={false} sortable={false}>
<TextField source="name" />
</ReferenceField>
- <ReferenceField source="groupId$" label="table.field.matnr.groupId" reference="matnrGroup" link={false} sortable={false}>
+ <ReferenceField source="groupId" label="table.field.matnr.groupId" reference="matnrGroup" link={false} sortable={false}>
+ <TextField source="name" />
+ </ReferenceField>
+ <ReferenceField source="rglarId" label="table.field.matnr.rglarId" reference="batchRegular" link={false} sortable={false}>
<TextField source="code" />
</ReferenceField>
- <ReferenceField source="rglarId$" label="table.field.matnr.rglarId" reference="batchRegular" link={false} sortable={false}>
- <TextField source="code" />
- </ReferenceField>
- <TextField source="erpCode" label="table.field.matnr.erpCode" />
+ <TextField source="platCode" label="table.field.matnr.platCode" />
<TextField source="spec" label="table.field.matnr.spec" />
<TextField source="model" label="table.field.matnr.model" />
<NumberField source="weight" label="table.field.matnr.weight" />
@@ -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