From 401e85bb3749bb9107f65ddaa15868a0a9ba852e Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期五, 11 四月 2025 14:18:46 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/asnOrderLog/AsnOrderLogList.jsx | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/rsf-admin/src/page/asnOrderLog/AsnOrderLogList.jsx b/rsf-admin/src/page/asnOrderLog/AsnOrderLogList.jsx
index 29c4a09..ceb24f6 100644
--- a/rsf-admin/src/page/asnOrderLog/AsnOrderLogList.jsx
+++ b/rsf-admin/src/page/asnOrderLog/AsnOrderLogList.jsx
@@ -60,7 +60,6 @@
const filters = [
<SearchInput source="condition" alwaysOn />,
-
<TextInput source="code" label="table.field.asnOrderLog.code" />,
<TextInput source="poCode" label="table.field.asnOrderLog.poCode" />,
<NumberInput source="poId" label="table.field.asnOrderLog.poId" />,
@@ -128,32 +127,27 @@
>
<StyledDatagrid
preferenceKey='asnOrderLog'
- bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
+ bulkActionButtons={false}
rowClick={'edit'}
expand={false}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo']}
+ omit={['id', 'createTime', 'createBy', 'memo', 'rleStatus']}
>
<NumberField source="id" />
<TextField source="code" label="table.field.asnOrderLog.code" />
<TextField source="poCode" label="table.field.asnOrderLog.poCode" />
<NumberField source="poId" label="table.field.asnOrderLog.poId" />
- <TextField source="type" label="table.field.asnOrderLog.type" />
- <TextField source="wkType" label="table.field.asnOrderLog.wkType" />
+ <TextField source="type$" label="table.field.asnOrderLog.type" />
+ <TextField source="wkType$" label="table.field.asnOrderLog.wkType" />
<NumberField source="anfme" label="table.field.asnOrderLog.anfme" />
<NumberField source="qty" label="table.field.asnOrderLog.qty" />
<TextField source="logisNo" label="table.field.asnOrderLog.logisNo" />
<DateField source="arrTime" label="table.field.asnOrderLog.arrTime" showTime />
<TextField source="rleStatus$" label="table.field.asnOrderLog.rleStatus" sortable={false} />
<TextField source="ntyStatus$" label="table.field.asnOrderLog.ntyStatus" sortable={false} />
-
- <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
- <TextField source="nickname" />
- </ReferenceField>
+ <TextField source="updateBy$" label="common.field.updateBy" />
<DateField source="updateTime" label="common.field.updateTime" showTime />
- <ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}>
- <TextField source="nickname" />
- </ReferenceField>
+ <TextField source="createBy$" label="common.field.createBy"/>
<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} />
--
Gitblit v1.9.1