From eab76cd34bff799686f68e6b70f86c9001e4913f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 23 五月 2025 09:41:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-admin/src/page/orders/stock/OrderList.jsx | 23 +++++++++--------------
1 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/rsf-admin/src/page/orders/stock/OrderList.jsx b/rsf-admin/src/page/orders/stock/OrderList.jsx
index 95bff50..bfb26c5 100644
--- a/rsf-admin/src/page/orders/stock/OrderList.jsx
+++ b/rsf-admin/src/page/orders/stock/OrderList.jsx
@@ -99,7 +99,7 @@
marginRight: !!drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
}}
title={"menu.stock"}
- empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
+ empty={false}
filters={filters}
sort={{ field: "create_time", order: "desc" }}
actions={(
@@ -113,26 +113,21 @@
>
<StyledDatagrid
preferenceKey='stock'
- bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
- rowClick={(id, resource, record) => false}
- expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo']}
+ bulkActionButtons={false}
+ rowClick='edit'
+ expandSingle={false}
+ omit={['id', 'createTime','sourceId', 'createBy', 'memo']}
>
<NumberField source="id" />
<TextField source="code" label="table.field.stock.code" />
<TextField source="sourceCode" label="table.field.stock.sourceCode" />
<NumberField source="sourceId" label="table.field.stock.sourceId" />
- <TextField source="type" label="table.field.stock.type" />
- <TextField source="wkType" label="table.field.stock.wkType" />
+ <TextField source="type$" label="table.field.stock.type" />
+ <TextField source="wkType$" label="table.field.stock.wkType" />
<NumberField source="anfme" label="table.field.stock.anfme" />
-
- <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