From 76c38d4e7a6e46f34f547fad873dc383c1397d00 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 24 五月 2025 14:53:09 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/orders/stock/OrderItemList.jsx | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/rsf-admin/src/page/orders/stock/OrderItemList.jsx b/rsf-admin/src/page/orders/stock/OrderItemList.jsx
index b2f0a97..03f5658 100644
--- a/rsf-admin/src/page/orders/stock/OrderItemList.jsx
+++ b/rsf-admin/src/page/orders/stock/OrderItemList.jsx
@@ -60,14 +60,16 @@
const filters = [
<SearchInput source="condition" alwaysOn />,
- <DateInput label='common.time.after' source="timeStart" />,
- <DateInput label='common.time.before' source="timeEnd" />,
+ <DateInput label='common.time.after' source="timeStart" />,
+ <DateInput label='common.time.before' source="timeEnd" />,
<NumberInput source="orderId" label="table.field.stockItem.orderId" />,
<TextInput source="orderCode" label="table.field.stockItem.orderCode" />,
<TextInput source="sourceItemId" label="table.field.stockItem.sourceItemId" />,
<TextInput source="matnrId" label="table.field.stockItem.matnrId" />,
<TextInput source="matnrCode" label="table.field.stockItem.matnrCode" />,
<TextInput source="maktx" label="table.field.stockItem.maktx" />,
+ <TextInput source="locCode" label="table.field.loc.code" />,
+ <TextInput source="barcode" label="table.field.task.barcode" />,
<NumberInput source="anfme" label="table.field.stockItem.anfme" />,
<TextInput source="stockUnit" label="table.field.stockItem.stockUnit" />,
<NumberInput source="workQty" label="table.field.stockItem.workQty" />,
@@ -132,7 +134,7 @@
rowClick={(id, resource, record) => false}
expand={false}
expandSingle={true}
- omit={['id', 'createTime', 'orderId', 'sourceItemId', 'matnrId', 'createBy','barcode', 'splrCode', 'splrBatch', 'updateBy$', 'createBy$', 'memo']}
+ omit={['id', 'createTime', 'orderId', 'sourceItemId', 'matnrId', 'purUnit','splrCode', 'purQty', 'createBy', 'packName', 'prodTime', 'splrName', 'splrCode', 'batch', 'packName', 'updateBy$', 'createBy$', 'memo']}
>
<NumberField source="id" />
<NumberField source="orderId" label="table.field.stockItem.orderId" />
@@ -144,6 +146,8 @@
<NumberField source="anfme" label="table.field.stockItem.anfme" />
<TextField source="stockUnit" label="table.field.stockItem.stockUnit" />
<NumberField source="workQty" label="table.field.stockItem.workQty" />
+ <TextField source="locCode" label="table.field.loc.code" />,
+ <TextField source="barcode" label="table.field.task.barcode" />,
<NumberField source="purQty" label="table.field.stockItem.purQty" />
<TextField source="purUnit" label="table.field.stockItem.purUnit" />
<NumberField source="qty" label="table.field.stockItem.qty" />
@@ -152,7 +156,6 @@
<TextField source="splrBatch" label="table.field.stockItem.splrBatch" />
<TextField source="splrName" label="table.field.stockItem.splrName" />
<TextField source="trackCode" label="table.field.stockItem.trackCode" />
- <TextField source="barcode" label="table.field.stockItem.barcode" />
<TextField source="prodTime" label="table.field.stockItem.prodTime" />
<TextField source="packName" label="table.field.stockItem.packName" />
<TextField source="updateBy$" label="common.field.updateBy" />
@@ -161,10 +164,6 @@
<DateField source="createTime" label="common.field.createTime" showTime />
<BooleanField source="statusBool" label="common.field.status" sortable={false} />
<TextField source="memo" label="common.field.memo" sortable={false} />
- <WrapperField cellClassName="opt" label="common.field.opt">
- <EditButton sx={{ padding: '1px', fontSize: '.75rem' }} />
- <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
- </WrapperField>
</StyledDatagrid>
</List>
<PageDrawer
--
Gitblit v1.9.1