From aa94600e75403b21af50dce1e8c8041f73cf0a29 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期一, 31 三月 2025 09:37:22 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/qlyInspect/QlyInspectList.jsx | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/rsf-admin/src/page/qlyInspect/QlyInspectList.jsx b/rsf-admin/src/page/qlyInspect/QlyInspectList.jsx
index 591d778..7da510e 100644
--- a/rsf-admin/src/page/qlyInspect/QlyInspectList.jsx
+++ b/rsf-admin/src/page/qlyInspect/QlyInspectList.jsx
@@ -60,11 +60,14 @@
const filters = [
<SearchInput source="condition" alwaysOn />,
- <DateInput label='common.time.after' source="timeStart" alwaysOn />,
- <DateInput label='common.time.before' source="timeEnd" alwaysOn />,
+ <NumberInput source="asnItemId" label="table.field.qlyInspect.asnItemId" />,
<TextInput source="code" label="table.field.qlyInspect.code" />,
- <TextInput source="name" label="table.field.qlyInspect.name" />,
+ <TextInput source="wkType" label="table.field.qlyInspect.wkType" />,
+ <NumberInput source="safeQty" label="table.field.qlyInspect.safeQty" />,
+ <NumberInput source="dlyQty" label="table.field.qlyInspect.dlyQty" />,
+ <NumberInput source="rcptQty" label="table.field.qlyInspect.rcptQty" />,
+ <NumberInput source="isptQty" label="table.field.qlyInspect.isptQty" />,
<TextInput label="common.field.memo" source="memo" />,
<SelectInput
@@ -93,7 +96,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.qlyInspect"}
empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
@@ -102,7 +105,6 @@
actions={(
<TopToolbar>
<FilterButton />
- <MyCreateButton onClick={() => { setCreateDialog(true) }} />
<SelectColumnsButton preferenceKey='qlyInspect' />
<MyExportButton />
</TopToolbar>
@@ -118,8 +120,13 @@
omit={['id', 'createTime', 'createBy', 'memo']}
>
<NumberField source="id" />
+ <NumberField source="asnItemId$" label="table.field.qlyInspect.asnItemId" />
<TextField source="code" label="table.field.qlyInspect.code" />
- <TextField source="name" label="table.field.qlyInspect.name" />
+ <TextField source="wkType" label="table.field.qlyInspect.wkType" />
+ <NumberField source="safeQty" label="table.field.qlyInspect.safeQty" />
+ <NumberField source="dlyQty" label="table.field.qlyInspect.dlyQty" />
+ <NumberField source="rcptQty" label="table.field.qlyInspect.rcptQty" />
+ <NumberField source="isptQty" label="table.field.qlyInspect.isptQty" />
<ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
<TextField source="nickname" />
@@ -132,7 +139,6 @@
<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' }} />
<DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
</WrapperField>
</StyledDatagrid>
--
Gitblit v1.9.1