From 8e622d6a1d07937cd654364748b52e15a50c67d8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 14 五月 2025 09:14:43 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/orders/purchase/PurchaseList.jsx | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/rsf-admin/src/page/orders/purchase/PurchaseList.jsx b/rsf-admin/src/page/orders/purchase/PurchaseList.jsx
index df7db49..fdfcc50 100644
--- a/rsf-admin/src/page/orders/purchase/PurchaseList.jsx
+++ b/rsf-admin/src/page/orders/purchase/PurchaseList.jsx
@@ -106,7 +106,7 @@
marginRight: drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
}}
title={"menu.purchase"}
- empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
+ empty={false}
filters={filters}
sort={{ field: "create_time", order: "desc" }}
actions={(
@@ -122,23 +122,23 @@
>
<StyledDatagrid
preferenceKey='purchase'
- bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
+ bulkActionButtons={() => <BulkDeleteButton mutationMode="pessimistic"/>}
rowClick={'edit'}
expand={false}
expandSingle={true}
- omit={['id', 'createTime', 'createBy', 'memo', 'preArr', 'channel','startTime','workQty', 'endTime']}
+ omit={['id', 'createTime', 'createBy','channel', 'platCode', 'memo', 'channel','startTime','workQty', 'endTime']}
>
<NumberField source="id" />
<TextField source="code" label="table.field.purchase.code" />
<TextField source="type$" label="table.field.purchase.type" />
<TextField source="wkType$" label="table.field.purchase.wkType" />
<TextField source="source" label="table.field.purchase.source" />
- <DateField source="preArr" label="table.field.purchase.preArr" showTime />
<NumberField source="anfme" label="table.field.purchase.anfme" />
<NumberField source="qty" label="table.field.purchase.qty" />
- <NumberField source="workQty" label="table.field.purchase.workQty" />
+ {/* <NumberField source="workQty" label="table.field.purchase.workQty" /> */}
<TextField source="channel" label="table.field.purchase.channel" />
<TextField source="platCode" label="table.field.purchase.platCode" />
+ <DateField source="preArr" label="table.field.purchase.preArr" showTime />
<DateField source="startTime" label="table.field.purchase.startTime" showTime />
<DateField source="endTime" label="table.field.purchase.endTime" showTime />
<TextField source="project" label="table.field.purchase.project" />
@@ -150,7 +150,7 @@
<TextField source="memo" label="common.field.memo" sortable={false} />
<WrapperField cellClassName="opt" label="common.field.opt">
<EditButton sx={{ padding: '1px', fontSize: '.75rem' }} />
- <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
+ <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode="pessimistic"/>
</WrapperField>
</StyledDatagrid>
</List>
--
Gitblit v1.9.1