第二次筛选物料列表为空问题修复

skyouc

7 天以前 51ea5c4baf680676ee6c00dbcbbee81b3ad32059

 rsf-admin/src/page/basicInfo/warehouse/WarehouseList.jsx

@@ -44,24 +44,33 @@
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import * as Common from '@/utils/common';

const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
    '& .css-1vooibu-MuiSvgIcon-root': {
        height: '.9em'
    },
    '& .RaDatagrid-row': {
        cursor: 'auto'
    },
    '& .column-name': {
    },
    '& .opt': {
        width: 200
    },
}));
// const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
//     '& .css-1vooibu-MuiSvgIcon-root': {
//         height: '.9em'
//     },
//     '& .RaDatagrid-row': {
//         cursor: 'auto'
//     },
//     '& .column-name': {
//     },
//     '& .opt': {
//         width: 200
//     },       
//     '& .RaDatagrid-cell': {
//         whiteSpace: 'nowrap',
//         overflow: 'visible',
//         textOverflow: 'unset',
//         maxWidth: 'none'
//     },
//     '& .MuiTableCell-root': {
//         whiteSpace: 'nowrap',
//         overflow: 'visible',
//         textOverflow: 'unset'
//     }
// }));

const filters = [
    <SearchInput source="condition" alwaysOn />,
    <DateInput label='common.time.after' source="timeStart" alwaysOn />,
    <DateInput label='common.time.before' source="timeEnd" alwaysOn />,

    <TextInput source="name" label="table.field.warehouse.name" />,
    <TextInput source="code" label="table.field.warehouse.code" />,
@@ -100,7 +109,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.warehouse"}
                empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
@@ -114,20 +123,18 @@
                        <MyExportButton />
                    </TopToolbar>
                )}
                perPage={DEFAULT_PAGE_SIZE}
                perPage={DEFAULT_PAGE_SIZE}                
            >
                <StyledDatagrid
                <DatagridConfigurable
                    preferenceKey='warehouse'
                    bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
                    rowClick={(id, resource, record) => false}
                    expand={() => <WarehousePanel />}
                    expandSingle={true}
                    omit={['id', 'createTime', 'createBy', 'memo']}
                    rowClick={(id, resource, record) => false} 
                    omit={['id', 'createTime', 'createBy', 'memo', 'longitude', 'latgitude', 'length', 'width', 'height']}
                >
                    <NumberField source="id" />
                    <TextField source="factory" label="table.field.warehouse.factory" />
                    <TextField source="name" label="table.field.warehouse.name" />
                    <TextField source="code" label="table.field.warehouse.code" />
                    <TextField source="factory" label="table.field.warehouse.factory" />
                    <TextField source="address" label="table.field.warehouse.address" />
                    <TextField source="longitude" label="table.field.warehouse.longitude" />
                    <TextField source="latgitude" label="table.field.warehouse.latgitude" />
@@ -143,13 +150,12 @@
                        <TextField source="nickname" />
                    </ReferenceField>
                    <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>
                </DatagridConfigurable>
            </List>
            <WarehouseCreate
                open={createDialog}