From b1a281bc282070f78ca5dff42fc74188bfc9e9c7 Mon Sep 17 00:00:00 2001
From: lbq <1065079612@qq.com>
Date: 星期二, 10 二月 2026 10:55:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz
---
rsf-admin/src/page/histories/waitPakinLog/WaitPakinItemLogList.jsx | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/rsf-admin/src/page/histories/waitPakinLog/WaitPakinItemLogList.jsx b/rsf-admin/src/page/histories/waitPakinLog/WaitPakinItemLogList.jsx
index c088062..5706485 100644
--- a/rsf-admin/src/page/histories/waitPakinLog/WaitPakinItemLogList.jsx
+++ b/rsf-admin/src/page/histories/waitPakinLog/WaitPakinItemLogList.jsx
@@ -108,7 +108,7 @@
marginRight: drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
}}
title={"menu.waitPakinItemLog"}
- empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
+ empty={false}
filters={filters}
filter={{ logId: recordId }}
sort={{ field: "create_time", order: "desc" }}
@@ -123,7 +123,7 @@
>
<StyledDatagrid
preferenceKey='waitPakinItemLog'
- bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
+ bulkActionButtons={false}
rowClick={ false}
omit={['id', 'createTime', 'createBy', 'memo', 'pakinId', 'pakinItemId', 'asnId' ,'asnItemId', 'createBy$', 'fieldsIndex']}
>
@@ -132,9 +132,9 @@
<TextField source="id" />
</ReferenceField>
<NumberField source="pakinItemId" label="table.field.waitPakinItemLog.pakinItemId" />
- <NumberField source="asnId" label="table.field.waitPakinItemLog.asnId" />
+ {/* <NumberField source="asnId" label="table.field.waitPakinItemLog.asnId" />
<TextField source="asnCode" label="table.field.waitPakinItemLog.asnCode" />
- <NumberField source="asnItemId" label="table.field.waitPakinItemLog.asnItemId" />
+ <NumberField source="asnItemId" label="table.field.waitPakinItemLog.asnItemId" /> */}
<TextField source="trackCode" label="table.field.waitPakinItemLog.trackCode" />
<TextField source="maktx" label="table.field.waitPakinItemLog.maktx" />
<ReferenceField source="matnrId" label="table.field.waitPakinItemLog.matnrId" reference="matnr" link={false} sortable={false}>
--
Gitblit v1.9.1