From c8fde8647b48e7c7d9b3beb6e8c39459f07c9eb2 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 08 五月 2025 14:55:46 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/waitPakin/WaitPakinItemList.jsx | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/rsf-admin/src/page/waitPakin/WaitPakinItemList.jsx b/rsf-admin/src/page/waitPakin/WaitPakinItemList.jsx
index 611914e..13acd1c 100644
--- a/rsf-admin/src/page/waitPakin/WaitPakinItemList.jsx
+++ b/rsf-admin/src/page/waitPakin/WaitPakinItemList.jsx
@@ -119,25 +119,25 @@
preferenceKey='waitPakinItem'
bulkActionButtons={false}
rowClick={(id, resource, record) => false}
- omit={['id', 'pakinId', 'createTime', 'createBy', 'memo', 'fieldsIndex']}
+ omit={['id', 'pakinId', 'createTime', 'matnrId', 'createBy', 'memo', 'fieldsIndex']}
>
<NumberField source="id" />
<NumberField source="pakinId" label="table.field.waitPakinItem.pakinId" />
- <TextField source="maktx" label="table.field.waitPakinItem.maktx" />
- <NumberField source="matnrId" label="table.field.waitPakinItem.matnrId" />
<TextField source="matnrCode" label="table.field.waitPakinItem.matnrCode" />
- <NumberField source="anfme" label="table.field.waitPakinItem.anfme" />
- <NumberField source="workQty" label="table.field.waitPakinItem.workQty" />
- <TextField source="unit" label="table.field.waitPakinItem.unit" />
- <TextField source="fieldsIndex" label="table.field.waitPakinItem.fieldsIndex" />
- <NumberField source="qty" label="table.field.waitPakinItem.qty" />
+ <TextField source="maktx" label="table.field.waitPakinItem.maktx" />
<TextField source="batch" label="table.field.waitPakinItem.batch" />
+ <NumberField source="matnrId" label="table.field.waitPakinItem.matnrId" />
+ <NumberField source="anfme" label="table.field.waitPakinItem.anfme" />
+ <TextField source="unit" label="table.field.waitPakinItem.unit" />
+ <NumberField source="workQty" label="table.field.waitPakinItem.workQty" />
+ <NumberField source="qty" label="table.field.waitPakinItem.qty" />
+ <TextField source="fieldsIndex" label="table.field.waitPakinItem.fieldsIndex" />
+ <TextField source="isptResult$" label="table.field.waitPakinItem.isptResult" />
<TextField source="updateBy$" label="common.field.updateBy" />
<DateField source="updateTime" label="common.field.updateTime" showTime />
<TextField source="createBy$" label="common.field.createBy" />
- <TextField source="flagDefect" label="common.field.createBy" />
<DateField source="createTime" label="common.field.createTime" showTime />
- <BooleanField source="statusBool" label="common.field.status" sortable={false} />
+ {/* <BooleanField source="statusBool" label="common.field.status" sortable={false} /> */}
<TextField source="memo" label="common.field.memo" sortable={false} />
</StyledDatagrid>
</List>
--
Gitblit v1.9.1