From f9ae4dd16bc60281d7c2f7489e45d4f17896b659 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期一, 26 一月 2026 13:14:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz
---
rsf-admin/src/page/histories/asnOrderLog/AsnOrderItemLogList.jsx | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/rsf-admin/src/page/histories/asnOrderLog/AsnOrderItemLogList.jsx b/rsf-admin/src/page/histories/asnOrderLog/AsnOrderItemLogList.jsx
index dc87470..69f731c 100644
--- a/rsf-admin/src/page/histories/asnOrderLog/AsnOrderItemLogList.jsx
+++ b/rsf-admin/src/page/histories/asnOrderLog/AsnOrderItemLogList.jsx
@@ -141,11 +141,14 @@
preferenceKey='asnOrderItemLog'
bulkActionButtons={false}
rowClick={(id, resource, record) => false}
- omit={['id', 'orderId', 'poDetlId', 'poCode', 'qrcode', 'packName', 'createTime', 'memo', 'fieldsIndex', 'matnrId', 'splrCode', 'status', 'createBy$']}
+ omit={['id', 'orderId', 'poDetlId', 'poCode', 'qrcode', 'packName', 'createTime', 'memo', 'fieldsIndex', 'matnrId', 'splrCode', 'status', 'createBy$',
+ 'asnId', 'purQty', 'purUnit', 'splrName', 'trackCode', 'ntyStatus$', 'asnCode'
+ ]}
>
<NumberField source="id" />
<NumberField source="asnId" label="table.field.asnOrderItemLog.orderId" />
<TextField source="asnCode" label="table.field.asnOrderItemLog.orderCode" />
+ <TextField source="platWorkCode" label="table.field.asnOrderItem.platWorkCode" />,
<TextField source="platItemId" label="table.field.asnOrderItemLog.platItemId" />
<NumberField source="poDetlId" label="table.field.asnOrderItemLog.poDetlId" />
<TextField source="poCode" label="table.field.asnOrderItemLog.poCode" />
@@ -153,18 +156,19 @@
<TextField source="matnrId" label="table.field.asnOrderItemLog.matnrId" />
<TextField source="matnrCode" label="table.field.asnOrderItemLog.matnrCode" />
<TextField source="maktx" label="table.field.asnOrderItemLog.maktx" />
+ <TextField source="splrBatch" label="table.field.asnOrderItemLog.splrBatch" />
<NumberField source="anfme" label="table.field.asnOrderItemLog.anfme" />
<NumberField source="purQty" label="table.field.asnOrderItemLog.purQty" />
<TextField source="purUnit" label="table.field.asnOrderItemLog.purUnit" />
<NumberField source="qty" label="table.field.asnOrderItemLog.qty" />
<TextField source="splrCode" label="table.field.asnOrderItemLog.splrCode" />
- <TextField source="splrBatch" label="table.field.asnOrderItemLog.splrBatch" />
<TextField source="splrName" label="table.field.asnOrderItemLog.splrName" />
<TextField source="qrcode" label="table.field.asnOrderItemLog.qrcode" />
<TextField source="trackCode" label="table.field.asnOrderItemLog.trackCode" />
<TextField source="packName" label="table.field.asnOrderItemLog.packName" />
<TextField source="ntyStatus$" label="table.field.asnOrderItemLog.ntyStatus" sortable={false} />
<TextField source="updateBy$" label="common.field.updateBy" />
+ <DateField source="updateTime" label="common.field.createTime" showTime />
<TextField source="createBy$" label="common.field.createBy" />
<DateField source="createTime" label="common.field.createTime" showTime />
<TextField source="memo" label="common.field.memo" sortable={false} />
--
Gitblit v1.9.1