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 | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
index e2ef514..8668d96 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
@@ -98,6 +98,7 @@
const [editDialog, setEditDialog] = useState(false);
const [drawerVal, setDrawerVal] = useState(false);
const [select, setSelect] = useState({});
+ const result = JSON.parse(localStorage.getItem('sys_dicts'))?.filter(dict => (dict.dictTypeCode == 'sys_rule_type')) || [];
const asnId = useGetRecordId();
const { data: dicts, isPending, error } = useGetOne('asnOrder', { id: asnId });
@@ -115,14 +116,14 @@
marginRight: drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
}}
title={"menu.asnOrderItem"}
- empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
+ empty={false}
filter={{ asnId: asnId, deleted: 0 }}
filters={filters}
sort={{ field: "create_time", order: "desc" }}
actions={(
<TopToolbar>
<FilterButton />
- <MyCreateButton onClick={() => { setCreateDialog(true) }} />
+ {/* <MyCreateButton onClick={() => { setCreateDialog(true) }} /> */}
<SelectColumnsButton preferenceKey='asnOrderItem' />
{/* <MyExportButton /> */}
</TopToolbar>
@@ -132,35 +133,47 @@
<StyledDatagrid
preferenceKey='asnOrderItem'
bulkActionButtons={false}
- rowClick={(id, resource, record) => {
- setSelect(record)
- setEditDialog(true)
- }}
- omit={['id', 'createTime', 'createBy', 'memo', 'poDetlId', 'matnrId', 'asnId']}
+ rowClick={false}
+ // rowClick={(id, resource, record) => {
+ // setSelect(record)
+ // setEditDialog(true)
+ // }}
+ 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" />
+ <TextField source="splrBatch" label="table.field.asnOrderItem.splrBatch" />
+ <TextField source="spec" label="table.field.asnOrderItem.spec" />
+ <TextField source="model" label="table.field.asnOrderItem.model" />
<NumberField source="anfme" label="table.field.asnOrderItem.anfme" />
<TextField source="stockUnit" label="table.field.asnOrderItem.stockUnit" />
<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="disQty" label="table.field.asnOrderItem.disQty" />
+ <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" />
- <TextField source="updateBy$" label="common.field.updateBy" />
<DateField source="updateTime" label="common.field.updateTime" showTime />
- <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 />
- <BooleanField source="status$" label="common.field.status" sortable={false} />
<TextField source="memo" label="common.field.memo" sortable={false} />
</StyledDatagrid>
</List>
--
Gitblit v1.9.1