#

luxiaotao1123

2024-02-15 333a2edeafc7ace144f3e3a005097174be6cda30

#

 zy-asrs-flow/src/components/TableSearch/index.jsx

@@ -1,5 +1,6 @@
import React from 'react';
import { Input, Button, Space, Select } from 'antd';
import { Input, Button, Space, Select, DatePicker } from 'antd';
import moment from 'moment';

const NONE_OPTION = -9999;

@@ -104,4 +105,59 @@
    );
}

export { TextFilter, SelectFilter };
const DatetimeRangeFilter = (props) => {
    const [startDate, setStartDate] = React.useState(null);
    const [endDate, setEndDate] = React.useState(null);

    return (
        <div style={{ padding: 8 }}>
            <div>
                <Space direction="vertical" size={12}>
                    <DatePicker.RangePicker
                        showTime
                        onChange={dates => {
                            setStartDate(dates[0]?.toISOString());
                            setEndDate(dates[1]?.toISOString());
                        }}
                    />
                    <Space>
                        <Button
                            type="primary"
                            onClick={() => {
                                console.log(startDate, endDate);
                                props.confirm();
                                props.setSearchParam(prevState => ({
                                    ...prevState,
                                    [props.name]: [startDate, endDate]
                                }));
                                props.actionRef.current?.reload();
                            }}
                            size="small"
                        >
                            确定
                        </Button>
                        <Button
                            onClick={() => {
                                setStartDate(null);
                                setEndDate(null);
                                props.setSelectedKeys([]);
                                props.setSearchParam(prevState => {
                                    const nextState = { ...prevState };
                                    delete nextState[props.name];
                                    return nextState;
                                });
                                props.clearFilters();
                            }}
                            size="small"
                        >
                            重置
                        </Button>
                    </Space>
                </Space>
            </div>
        </div>
    );
}


export { TextFilter, SelectFilter, DatetimeRangeFilter };

 zy-asrs-flow/src/pages/system/role/index.jsx

@@ -11,7 +11,7 @@
import { PlusOutlined, ExportOutlined } from '@ant-design/icons';
import Http from '@/utils/http';
import Edit from './components/edit'
import { TextFilter, SelectFilter } from '@/components/TableSearch'
import { TextFilter, SelectFilter, DatetimeRangeFilter } from '@/components/TableSearch'

const handleSave = async (val) => {
    const hide = message.loading('正在添加');
@@ -154,6 +154,12 @@
            title: '修改时间',
            dataIndex: 'updateTime$',
            valueType: 'text',
            filterDropdown: (props) => <DatetimeRangeFilter
                name='updateTime'
                {...props}
                actionRef={actionRef}
                setSearchParam={setSearchParam}
            />,
        },
        {
            title: '操作',