From e7dcf3d8570b6a9b2967ba0b90e982322b9cfaf7 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 11 七月 2025 17:10:23 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx b/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
index 71ad947..d33ad5f 100644
--- a/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
+++ b/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
@@ -169,8 +169,8 @@
if (code === 200) {
const arr = [
<NumberField key="id" source="id" />,
- <TooltipField key="name" source="name" label="table.field.matnr.name" cellClassName="name" />,
<TextField key="code" source="code" label="table.field.matnr.code" />,
+ <TooltipField key="name" source="name" label="table.field.matnr.name" cellClassName="name" />,
<TextField key="shipperId$" source="shipperId$" label="table.field.matnr.shipperId" />,
<ReferenceField key="groupId" source="groupId" label="table.field.matnr.groupId" reference="matnrGroup" link={false} sortable={false}>
<TextField source="name" />
@@ -256,10 +256,10 @@
<BulkDeleteButton mutationMode={OPERATE_MODE} />
</>}
rowClick={(id, resource, record) => false}
- omit={['id', 'shipperId', 'platCode', 'spec', 'model', 'weight', 'color', 'describle'
- , 'nromNum', 'unit', 'purchaseUnit', 'stockUnit', 'stockLeval', 'isLabelMange', 'safeQty'
+ omit={['id', 'shipperId', 'platCode', 'model', 'weight', 'color', 'describle'
+ , 'nromNum', 'unit', 'purchaseUnit', 'stockUnit', 'isLabelMange', 'safeQty'
, 'minQty', 'maxQty', 'stagn', 'valid', 'validWarn', 'flagCheck', 'updateTime', 'updateBy'
- , 'createTime', 'createBy', 'memo', 'rglarId', 'groupId', 'stockLevel']}
+ , 'createTime', 'createBy', 'memo', 'rglarId', 'groupId','statusBool', 'stockLeval$']}
>
{columns.map((column) => column)}
</StyledDatagrid>}
--
Gitblit v1.9.1