|
|
@@ -22,7 +22,6 @@ import { BinFilter } from '@/states/patient/bin/types/binFilter';
|
|
|
import TimeRangeSelector from './TimeRangeSelector';
|
|
|
// import { AnyAction } from '@reduxjs/toolkit';
|
|
|
|
|
|
-const { RangePicker } = DatePicker;
|
|
|
|
|
|
const SearchPanel: React.FC = () => {
|
|
|
const intl = useIntl();
|
|
|
@@ -70,34 +69,53 @@ const SearchPanel: React.FC = () => {
|
|
|
onChange={(e) => dispatch(setAccNo(e.target.value))}
|
|
|
/>
|
|
|
<TimeRangeSelector />
|
|
|
- <RangePicker
|
|
|
+ {/* 开始时间 */}
|
|
|
+ <DatePicker
|
|
|
className="w-full"
|
|
|
- placeholder={[
|
|
|
- intl.formatMessage({
|
|
|
- id: 'searchPanel.startDate',
|
|
|
- defaultMessage: 'searchPanel.startDate',
|
|
|
- }),
|
|
|
- intl.formatMessage({
|
|
|
- id: 'searchPanel.endDate',
|
|
|
- defaultMessage: 'searchPanel.endDate',
|
|
|
- }),
|
|
|
- ]}
|
|
|
+ placeholder={intl.formatMessage({
|
|
|
+ id: 'searchPanel.startDate',
|
|
|
+ defaultMessage: 'searchPanel.startDate',
|
|
|
+ })}
|
|
|
size="small"
|
|
|
- value={startTime && endTime ? [dayjs(startTime), dayjs(endTime)] : null}
|
|
|
- onChange={(dates) => {
|
|
|
- if (dates && dates[0] && dates[1]) {
|
|
|
- // 使用RFC3339Nano格式
|
|
|
- dispatch(
|
|
|
- setStartTime(dates[0].format('YYYY-MM-DDTHH:mm:ss.SSS[+08:00]'))
|
|
|
- );
|
|
|
- dispatch(
|
|
|
- setEndTime(dates[1].format('YYYY-MM-DDTHH:mm:ss.SSS[+08:00]'))
|
|
|
- );
|
|
|
+ value={startTime ? dayjs(startTime) : null}
|
|
|
+ onChange={(date) => {
|
|
|
+ if (date) {
|
|
|
+ dispatch(setStartTime(date.format('YYYY-MM-DDTHH:mm:ss.SSS[+08:00]')));
|
|
|
} else {
|
|
|
dispatch(setStartTime(''));
|
|
|
+ }
|
|
|
+ }}
|
|
|
+ disabledDate={(current) => {
|
|
|
+ // 如果已选择结束时间,禁用结束时间之后的日期
|
|
|
+ if (endTime) {
|
|
|
+ return current && current.isAfter(dayjs(endTime), 'day');
|
|
|
+ }
|
|
|
+ return false;
|
|
|
+ }}
|
|
|
+ />
|
|
|
+ {/* 结束时间 */}
|
|
|
+ <DatePicker
|
|
|
+ className="w-full"
|
|
|
+ placeholder={intl.formatMessage({
|
|
|
+ id: 'searchPanel.endDate',
|
|
|
+ defaultMessage: 'searchPanel.endDate',
|
|
|
+ })}
|
|
|
+ size="small"
|
|
|
+ value={endTime ? dayjs(endTime) : null}
|
|
|
+ onChange={(date) => {
|
|
|
+ if (date) {
|
|
|
+ dispatch(setEndTime(date.format('YYYY-MM-DDTHH:mm:ss.SSS[+08:00]')));
|
|
|
+ } else {
|
|
|
dispatch(setEndTime(''));
|
|
|
}
|
|
|
}}
|
|
|
+ disabledDate={(current) => {
|
|
|
+ // 如果已选择开始时间,禁用开始时间之前的日期
|
|
|
+ if (startTime) {
|
|
|
+ return current && current.isBefore(dayjs(startTime), 'day');
|
|
|
+ }
|
|
|
+ return false;
|
|
|
+ }}
|
|
|
/>
|
|
|
<Button
|
|
|
type="primary"
|