From 35c422aa74e47a2ee4bea49e6799fefac1b63713 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 21 三月 2025 13:39:47 +0800
Subject: [PATCH] Merge branch 'front' into devlop
---
rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx b/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
index ba9be18..3140810 100644
--- a/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
+++ b/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
@@ -186,7 +186,7 @@
<TextField key="purchaseUnit" source="purchaseUnit" label="table.field.matnr.purUnit" />,
<TextField key="stockUnit" source="stockUnit" label="table.field.matnr.stockUnit" />,
<TextField key="stockLeval$" source="stockLeval$" label="table.field.matnr.stockLevel" sortable={false} />,
- <TextField key="isLabelMange$" source="isLabelMange$" label="table.field.matnr.isLabelMange" sortable={false} />,
+ <TextField key="flagLabelMange$" source="flagLabelMange$" label="table.field.matnr.isLabelMange" sortable={false} />,
<NumberField key="safeQty" source="safeQty" label="table.field.matnr.safeQty" />,
<NumberField key="minQty" source="minQty" label="table.field.matnr.minQty" />,
<NumberField key="maxQty" source="maxQty" label="table.field.matnr.maxQty" />,
@@ -205,7 +205,7 @@
<BooleanField key="statusBool" source="statusBool" label="common.field.status" sortable={false} />,
<TextField key="memo" source="memo" label="common.field.memo" sortable={false} />,
]
- const fields = data.map(el => <TextField key={el.fields} source={el.fields} label={el.fieldsAlise} />)
+ const fields = data.map(el => <TextField key={el.fields} source={`extendFields.[${el.fields}]`} label={el.fieldsAlise} />)
const opt = <WrapperField key="opt" cellClassName="opt" label="common.field.opt">
<EditButton sx={{ padding: '1px', fontSize: '.75rem' }} />
<EnableButton />
@@ -246,7 +246,7 @@
omit={['id', 'shipperId', 'platCode', 'spec', 'model', 'weight', 'color', 'describle'
, 'nromNum', 'unit', 'purchaseUnit', 'stockUnit', 'stockLeval', 'isLabelMange', 'safeQty'
, 'minQty', 'maxQty', 'stagn', 'valid', 'validWarn', 'flagCheck', 'updateTime', 'updateBy'
- , 'createTime', 'createBy', 'memo', 'rglarId', 'groupId', 'stockLevel', 'isLabelMange']}
+ , 'createTime', 'createBy', 'memo', 'rglarId', 'groupId', 'stockLevel']}
>
{columns.map((column) => column)}
</StyledDatagrid>}
--
Gitblit v1.9.1