From 2da12c3d55a709241d245d0ca6a22b56e4c048a0 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 09 四月 2025 14:04:19 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-admin/src/page/qlyIsptItem/QlyIsptItemList.jsx | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/rsf-admin/src/page/qlyIsptItem/QlyIsptItemList.jsx b/rsf-admin/src/page/qlyIsptItem/QlyIsptItemList.jsx
index ae7a557..ff12b3d 100644
--- a/rsf-admin/src/page/qlyIsptItem/QlyIsptItemList.jsx
+++ b/rsf-admin/src/page/qlyIsptItem/QlyIsptItemList.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 />,
<NumberInput source="ispectId" label="table.field.qlyIsptItem.ispectId" />,
<TextInput source="matnrCode" label="table.field.qlyIsptItem.matnrCode" />,
@@ -103,7 +101,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.qlyIsptItem"}
empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
@@ -123,8 +121,6 @@
preferenceKey='qlyIsptItem'
bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
rowClick={(id, resource, record) => false}
- expand={() => <QlyIsptItemPanel />}
- expandSingle={true}
omit={['id', 'createTime', 'createBy', 'memo']}
>
<NumberField source="id" />
@@ -136,6 +132,7 @@
<TextField source="splrBatch" label="table.field.qlyIsptItem.splrBatch" />
<TextField source="stockBatch" label="table.field.qlyIsptItem.stockBatch" />
<NumberField source="rcptQty" label="table.field.qlyIsptItem.rcptQty" />
+ <NumberField source="isptResult$" label="table.field.qlyIsptItem.isptResult" />
<NumberField source="dlyQty" label="table.field.qlyIsptItem.dlyQty" />
<NumberField source="disQty" label="table.field.qlyIsptItem.disQty" />
<NumberField source="safeQty" label="table.field.qlyIsptItem.safeQty" />
--
Gitblit v1.9.1