From ed1f6cfe669199976cf9f4423ee4e7b440549016 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 14 四月 2025 12:47:32 +0800
Subject: [PATCH] #修改 1. 组拖问题修复
---
rsf-admin/src/page/waitPakinItem/WaitPakinItemList.jsx | 33 +++++++++++----------------------
1 files changed, 11 insertions(+), 22 deletions(-)
diff --git a/rsf-admin/src/page/waitPakinItem/WaitPakinItemList.jsx b/rsf-admin/src/page/waitPakinItem/WaitPakinItemList.jsx
index 7d051ac..9d8f88f 100644
--- a/rsf-admin/src/page/waitPakinItem/WaitPakinItemList.jsx
+++ b/rsf-admin/src/page/waitPakinItem/WaitPakinItemList.jsx
@@ -31,6 +31,7 @@
ReferenceArrayInput,
AutocompleteInput,
DeleteButton,
+ useGetRecordId,
} from 'react-admin';
import { Box, Typography, Card, Stack } from '@mui/material';
import { styled } from '@mui/material/styles';
@@ -41,7 +42,7 @@
import MyExportButton from '../components/MyExportButton';
import PageDrawer from "../components/PageDrawer";
import MyField from "../components/MyField";
-import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
+import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE, DEFAULT_ITEM_PAGE_SIZE } from '@/config/setting';
import * as Common from '@/utils/common';
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
@@ -60,9 +61,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="pakinId" label="table.field.waitPakinItem.pakinId" />,
<TextInput source="maktx" label="table.field.waitPakinItem.maktx" />,
<NumberInput source="matnrId" label="table.field.waitPakinItem.matnrId" />,
@@ -73,7 +71,6 @@
<TextInput source="fieldsIndex" label="table.field.waitPakinItem.fieldsIndex" />,
<NumberInput source="qty" label="table.field.waitPakinItem.qty" />,
<TextInput source="batch" label="table.field.waitPakinItem.batch" />,
-
<TextInput label="common.field.memo" source="memo" />,
<SelectInput
label="common.field.status"
@@ -88,20 +85,22 @@
const WaitPakinItemList = () => {
const translate = useTranslate();
-
const [createDialog, setCreateDialog] = useState(false);
const [drawerVal, setDrawerVal] = useState(false);
+ const pakinId = useGetRecordId();
return (
<Box display="flex">
<List
+ resource="waitPakinItem"
+ filter={{pakinId: pakinId}}
sx={{
flexGrow: 1,
transition: (theme) =>
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.waitPakinItem"}
empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
@@ -110,19 +109,17 @@
actions={(
<TopToolbar>
<FilterButton />
- <MyCreateButton onClick={() => { setCreateDialog(true) }} />
+ {/* <MyCreateButton onClick={() => { setCreateDialog(true) }} /> */}
<SelectColumnsButton preferenceKey='waitPakinItem' />
<MyExportButton />
</TopToolbar>
)}
- perPage={DEFAULT_PAGE_SIZE}
+ perPage={DEFAULT_ITEM_PAGE_SIZE}
>
<StyledDatagrid
preferenceKey='waitPakinItem'
bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
rowClick={(id, resource, record) => false}
- expand={() => <WaitPakinItemPanel />}
- expandSingle={true}
omit={['id', 'createTime', 'createBy', 'memo']}
>
<NumberField source="id" />
@@ -136,21 +133,13 @@
<TextField source="fieldsIndex" label="table.field.waitPakinItem.fieldsIndex" />
<NumberField source="qty" label="table.field.waitPakinItem.qty" />
<TextField source="batch" label="table.field.waitPakinItem.batch" />
-
- <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" />
+ <TextField source="flagDefect" 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} />
- <WrapperField cellClassName="opt" label="common.field.opt">
- <EditButton sx={{ padding: '1px', fontSize: '.75rem' }} />
- <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
- </WrapperField>
</StyledDatagrid>
</List>
<WaitPakinItemCreate
--
Gitblit v1.9.1