conf: 日期查询, 避免23:59:59 进位到第二天

feature/2.0-sales-trade
Lei OT 2 years ago
parent 2efd2e2669
commit 0dc12429ff

@ -1,7 +1,7 @@
import { createContext, useContext, useEffect } from 'react'; import { createContext, useContext, useEffect } from 'react';
import { toJS } from 'mobx'; import { toJS } from 'mobx';
import { observer } from 'mobx-react'; import { observer } from 'mobx-react';
import { DATE_FORMAT, stores_Context } from './../../config'; import { DATE_FORMAT, SMALL_DATETIME_FORMAT, stores_Context } from './../../config';
import { SearchOutlined } from '@ant-design/icons'; import { SearchOutlined } from '@ant-design/icons';
import { Form, Row, Col, Select, Button, Space, DatePicker } from 'antd'; import { Form, Row, Col, Select, Button, Space, DatePicker } from 'antd';
import moment from 'moment'; import moment from 'moment';
@ -98,7 +98,7 @@ export default observer((props) => {
}, },
{ {
key: 'Date2', key: 'Date2',
transform: (value) => (value === '' || !Array.isArray(value) ? undefined : moment(value[1]).format(`${DATE_FORMAT} 23:59:59`)), transform: (value) => (value === '' || !Array.isArray(value) ? undefined : moment(value[1]).format(SMALL_DATETIME_FORMAT)),
default: '', default: '',
}, },
], ],
@ -110,7 +110,7 @@ export default observer((props) => {
}, },
{ {
key: 'DateDiff2', key: 'DateDiff2',
transform: (value) => (value === '' || !Array.isArray(value) ? undefined : value[1] ? moment(value[1]).format(`${DATE_FORMAT} 23:59:59`) : undefined), transform: (value) => (value === '' || !Array.isArray(value) ? undefined : value[1] ? moment(value[1]).format(SMALL_DATETIME_FORMAT) : undefined),
default: '', default: '',
}, },
], ],
@ -122,7 +122,7 @@ export default observer((props) => {
}, },
{ {
key: 'Date2', key: 'Date2',
transform: (value) => (value ? moment(value).format(`YYYY-12-31 23:59:59`) : undefined), transform: (value) => (value ? moment(value).format(`YYYY-12-31 23:59:00`) : undefined),
default: '', default: '',
}, },
], ],
@ -134,7 +134,7 @@ export default observer((props) => {
}, },
{ {
key: 'DateDiff2', key: 'DateDiff2',
transform: (value) => (value ? moment(value).format(`YYYY-12-31 23:59:59`) : undefined), transform: (value) => (value ? moment(value).format(`YYYY-12-31 23:59:00`) : undefined),
default: '', default: '',
}, },
], ],

@ -2,4 +2,6 @@ import React from "react";
export const stores_Context = React.createContext(); export const stores_Context = React.createContext();
export const DATE_FORMAT = "YYYY-MM-DD"; export const DATE_FORMAT = "YYYY-MM-DD";
export const SMALL_DATETIME_FORMAT = 'YYYY-MM-DD 23:59:00';
export const DATETIME_FORMAT = 'YYYY-MM-DD 23:59:59';
export const HT_HOST = process.env.NODE_ENV === "production" ? "https://p9axztuwd7x8a7.mycht.cn" : "http://202.103.68.100:890"; export const HT_HOST = process.env.NODE_ENV === "production" ? "https://p9axztuwd7x8a7.mycht.cn" : "http://202.103.68.100:890";

Loading…
Cancel
Save