From 43c6e4ca1e4a7db22c1c2da4a40d90b0535c1c5c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 31 三月 2025 15:55:52 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/waitPakin/WaitPakinList.jsx | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/rsf-admin/src/page/waitPakin/WaitPakinList.jsx b/rsf-admin/src/page/waitPakin/WaitPakinList.jsx
index d25f626..b8cd4cd 100644
--- a/rsf-admin/src/page/waitPakin/WaitPakinList.jsx
+++ b/rsf-admin/src/page/waitPakin/WaitPakinList.jsx
@@ -60,8 +60,6 @@
const filters = [
<SearchInput source="condition" alwaysOn />,
- <DateInput label='common.time.after' source="timeStart" alwaysOn />,
- <DateInput label='common.time.before' source="timeEnd" alwaysOn />,
<TextInput source="code" label="table.field.waitPakin.code" />,
<NumberInput source="ansId" label="table.field.waitPakin.ansId" />,
@@ -71,7 +69,7 @@
<SelectInput source="ioStatus" label="table.field.waitPakin.ioStatus"
choices={[
{ id: 0, name: '寰呭叆搴�' },
- { id: 1, name: ' 鍏ュ簱涓�' },
+ { id: 1, name: ' 鍏ュ簱涓�' },
]}
/>,
@@ -102,7 +100,7 @@
theme.transitions.create(['all'], {
duration: theme.transitions.duration.enteringScreen,
}),
- marginRight: !!drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
+ marginRight: drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
}}
title={"menu.waitPakin"}
empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
@@ -111,7 +109,7 @@
actions={(
<TopToolbar>
<FilterButton />
- <MyCreateButton onClick={() => { setCreateDialog(true) }} />
+ {/* <MyCreateButton onClick={() => { setCreateDialog(true) }} /> */}
<SelectColumnsButton preferenceKey='waitPakin' />
<MyExportButton />
</TopToolbar>
@@ -128,8 +126,8 @@
>
<NumberField source="id" />
<TextField source="code" label="table.field.waitPakin.code" />
- <NumberField source="ansId" label="table.field.waitPakin.ansId" />
- <TextField source="asnCode" label="table.field.waitPakin.asnCode" />
+ {/* <NumberField source="ansId" label="table.field.waitPakin.ansId" /> */}
+ {/* <TextField source="asnCode" label="table.field.waitPakin.asnCode" /> */}
<TextField source="barcode" label="table.field.waitPakin.barcode" />
<NumberField source="anfme" label="table.field.waitPakin.anfme" />
<TextField source="ioStatus$" label="table.field.waitPakin.ioStatus" sortable={false} />
@@ -145,7 +143,7 @@
<BooleanField source="statusBool" label="common.field.status" sortable={false} />
<TextField source="memo" label="common.field.memo" sortable={false} />
<WrapperField cellClassName="opt" label="common.field.opt">
- <EditButton sx={{ padding: '1px', fontSize: '.75rem' }} />
+ {/* <EditButton sx={{ padding: '1px', fontSize: '.75rem' }} /> */}
<DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
</WrapperField>
</StyledDatagrid>
--
Gitblit v1.9.1