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/orders/asnOrder/AsnOrderItemList.jsx | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
index e35ba63..8668d96 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
@@ -138,13 +138,14 @@
// setSelect(record)
// setEditDialog(true)
// }}
- omit={['id', 'createTime', 'purQty', 'purUnit', 'poDetlCode', 'createBy', 'memo', 'model', 'packName', 'splrCode', 'qrcode', 'poDetlId', 'matnrId', 'asnId']}
+ omit={['id', 'purQty', 'purUnit', 'platItemId', 'poDetlCode', 'trackCode', 'memo', 'model', 'packName', 'splrCode', 'qrcode', 'poDetlId', 'matnrId', 'asnId']}
>
<NumberField source="id" />
<NumberField source="asnId" label="table.field.asnOrderItem.asnId" />
<TextField source="asnCode" label="table.field.asnOrderItem.asnCode" />
<TextField source="poDetlId" label="table.field.asnOrderItem.poDetlId" />
<TextField source="poDetlCode" label="table.field.asnOrderItem.poDetlCode" />
+ <TextField source="platItemId" label="table.field.asnOrderItem.platItemId" />
<TextField source="matnrId" label="table.field.asnOrderItem.matnrId" />
<TextField source="matnrCode" label="table.field.asnOrderItem.matnrCode" />
<TextField source="maktx" label="table.field.asnOrderItem.maktx" />
@@ -156,17 +157,22 @@
<NumberField source="purQty" label="table.field.asnOrderItem.purQty" />
<TextField source="purUnit" label="table.field.asnOrderItem.purUnit" />
<NumberField source="qty" label="table.field.asnOrderItem.qty" />
- <NumberField source="safeQty" label="table.field.asnOrderItem.safeQty" />
+ {/* <NumberField source="safeQty" label="table.field.asnOrderItem.safeQty" />
<NumberField source="disQty" label="table.field.asnOrderItem.disQty" />
- <TextField source="isptResult$" label="table.field.asnOrderItem.isptResult" />
+ <TextField source="isptResult$" label="table.field.asnOrderItem.isptResult" /> */}
<TextField source="splrCode" label="table.field.asnOrderItem.splrCode" />
<TextField source="splrName" label="table.field.asnOrderItem.splrName" />
+ <TextField source="isptResult$" label="table.field.asnOrderItem.isptResult" />
<TextField source="qrcode" label="table.field.asnOrderItem.qrcode" />
<TextField source="trackCode" label="table.field.asnOrderItem.barcode" />
<TextField source="packName" label="table.field.asnOrderItem.packName" />
<DateField source="updateTime" label="common.field.updateTime" showTime />
- <TextField source="updateBy$" label="common.field.updateBy" />
- <TextField source="createBy$" label="common.field.createBy" />
+ <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
+ <TextField source="nickname" />
+ </ReferenceField>
+ <ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}>
+ <TextField source="nickname" />
+ </ReferenceField>
<DateField source="createTime" label="common.field.createTime" showTime />
<TextField source="memo" label="common.field.memo" sortable={false} />
</StyledDatagrid>
--
Gitblit v1.9.1