From ca36e3b92acaa53f042fd8af1920930af782efc6 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 25 十二月 2025 12:43:16 +0800
Subject: [PATCH] Merge branch 'devlop_org' into devlop-phyz
---
rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx | 58 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx b/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
index 71ad947..ef49214 100644
--- a/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
+++ b/rsf-admin/src/page/basicInfo/matnr/MatnrList.jsx
@@ -169,40 +169,40 @@
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" />,
- <TextField key="shipperId$" source="shipperId$" label="table.field.matnr.shipperId" />,
+ <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" />
</ReferenceField>,
- <TextField key="platCode" source="platCode" label="table.field.matnr.platCode" />,
+ // <TextField key="platCode" source="platCode" label="table.field.matnr.platCode" />,
<TextField key="spec" source="spec" label="table.field.matnr.spec" />,
<TextField key="model" source="model" label="table.field.matnr.model" />,
- <NumberField key="weight" source="weight" label="table.field.matnr.weight" />,
- <TextField key="describle" source="describle" label="table.field.matnr.describle" />,
- <NumberField key="nromNum" source="nromNum" label="table.field.matnr.nromNum" />,
+ // <NumberField key="weight" source="weight" label="table.field.matnr.weight" />,
+ // <TextField key="describle" source="describle" label="table.field.matnr.describle" />,
+ // <NumberField key="nromNum" source="nromNum" label="table.field.matnr.nromNum" />,
<TextField key="unit" source="unit" label="table.field.matnr.unit" />,
- <TextField key="purchaseUnit" source="purchaseUnit" label="table.field.matnr.purUnit" />,
+ // <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="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" />,
- <NumberField key="stagn" source="stagn" label="table.field.matnr.stagn" />,
- <NumberField key="valid" source="valid" label="table.field.matnr.valid" />,
- <NumberField key="validWarn" source="validWarn" label="table.field.matnr.validWarn" />,
- <BooleanField key="flagCheck" source="flagCheck" label="table.field.matnr.flagCheck" sortable={false} />,
- <ReferenceField key="updateBy" source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
- <TextField source="nickname" />
- </ReferenceField>,
- <DateField key="updateTime" source="updateTime" label="common.field.updateTime" showTime />,
- <ReferenceField key="createBy" source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}>
- <TextField source="nickname" />
- </ReferenceField>,
- <DateField key="createTime" source="createTime" label="common.field.createTime" showTime />,
+ // <TextField key="stockLeval$" source="stockLeval$" label="table.field.matnr.stockLevel" 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" />,
+ // <NumberField key="stagn" source="stagn" label="table.field.matnr.stagn" />,
+ // <NumberField key="valid" source="valid" label="table.field.matnr.valid" />,
+ // <NumberField key="validWarn" source="validWarn" label="table.field.matnr.validWarn" />,
+ // <BooleanField key="flagCheck" source="flagCheck" label="table.field.matnr.flagCheck" sortable={false} />,
+ // <ReferenceField key="updateBy" source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
+ // <TextField source="nickname" />
+ // </ReferenceField>,
+ // <DateField key="updateTime" source="updateTime" label="common.field.updateTime" showTime />,
+ // <ReferenceField key="createBy" source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}>
+ // <TextField source="nickname" />
+ // </ReferenceField>,
+ // <DateField key="createTime" source="createTime" label="common.field.createTime" showTime />,
<BooleanField key="statusBool" source="statusBool" label="common.field.status" sortable={false} />,
- <TextField key="memo" source="memo" label="common.field.memo" sortable={false} />,
+ // <TextField key="memo" source="memo" label="common.field.memo" sortable={false} />,
]
const fields = data.map(el => <TextField key={el.fields} source={`extendFields.[${el.fields}]`} label={el.fieldsAlise} />)
const opt = <WrapperField key="opt" cellClassName="fixed" className="fixed" label="common.field.opt">
@@ -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>}
@@ -286,7 +286,7 @@
marginRight: drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
}}
title={"menu.matnr"}
- empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
+ empty={false}
filters={filters}
sort={{ field: "create_time", order: "desc" }}
actions={(
--
Gitblit v1.9.1