✨ feat(码单管理日期优化):
This commit is contained in:
parent
af03e5fdd3
commit
e8f050bcbb
@ -18,8 +18,8 @@ const TimePicker = (props: Props) => {
|
|||||||
|
|
||||||
const handTime = (e) => {
|
const handTime = (e) => {
|
||||||
const { start, end } = e.value
|
const { start, end } = e.value
|
||||||
// 如果选的是同一天的日期, end 自动加一天
|
|
||||||
if (!end) {
|
if (!end) {
|
||||||
|
// 如果选的是同一天的日期, end 自动加一天
|
||||||
// 判断如果没选下一天的时候
|
// 判断如果没选下一天的时候
|
||||||
e.value.end = `${dayjs(new Date(start)).add(1, 'day').format('YYYY-MM-DD')} 00:00:00`
|
e.value.end = `${dayjs(new Date(start)).add(1, 'day').format('YYYY-MM-DD')} 00:00:00`
|
||||||
}
|
}
|
||||||
@ -35,7 +35,7 @@ const TimePicker = (props: Props) => {
|
|||||||
setTime(e)
|
setTime(e)
|
||||||
}
|
}
|
||||||
const currentDate = useMemo(() => {
|
const currentDate = useMemo(() => {
|
||||||
return (!start && !end) ? null : { start, end }
|
return (!start && !end) ? { start: `${dayjs(new Date()).format('YYYY-MM-DD')} 00:00:00`, end } : { start, end }
|
||||||
}, [props])
|
}, [props])
|
||||||
// 由于小程序的bug,部分ios和安卓显示时间的时候会有问题,原因是格式化时有`-`这个横杠
|
// 由于小程序的bug,部分ios和安卓显示时间的时候会有问题,原因是格式化时有`-`这个横杠
|
||||||
return (
|
return (
|
||||||
|
|||||||
@ -1,18 +1,16 @@
|
|||||||
import { Text, View } from '@tarojs/components'
|
import { Text, View } from '@tarojs/components'
|
||||||
import { useDidHide, useDidShow } from '@tarojs/taro'
|
import { useDidHide, useDidShow } from '@tarojs/taro'
|
||||||
import { useEffect, useRef, useState } from 'react'
|
import { useCallback, useEffect, useRef, useState } from 'react'
|
||||||
import ColorItem from '../colorItem'
|
import ColorItem from '../colorItem'
|
||||||
import styles from './index.module.scss'
|
import styles from './index.module.scss'
|
||||||
import IconFont from '@/components/iconfont/iconfont'
|
import IconFont from '@/components/iconfont/iconfont'
|
||||||
import SelectList from '@/components/selectList'
|
import SelectList from '@/components/selectList'
|
||||||
import Search from '@/components/search'
|
import Search from '@/components/search'
|
||||||
import { GetCustomCodeLApi } from '@/api/codeManage'
|
import { GetCustomCodeLApi } from '@/api/codeManage'
|
||||||
|
import TimePickerPopup from '@/components/timePickerPopup'
|
||||||
|
import { alert } from '@/common/common'
|
||||||
|
|
||||||
interface ParamType {
|
export default () => {
|
||||||
onClickData: () => void
|
|
||||||
}
|
|
||||||
export default (props: ParamType) => {
|
|
||||||
const { onClickData } = props
|
|
||||||
const [formData, setFormData] = useState<{ sale_start_time?: string; sale_end_time?: string; any_query?: string }|null>(null)
|
const [formData, setFormData] = useState<{ sale_start_time?: string; sale_end_time?: string; any_query?: string }|null>(null)
|
||||||
// 获取码单列表
|
// 获取码单列表
|
||||||
const [list, setList] = useState<any[]>([])
|
const [list, setList] = useState<any[]>([])
|
||||||
@ -32,12 +30,26 @@ export default (props: ParamType) => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
const onSearch = (val) => {
|
const onSearch = (val) => {
|
||||||
formData == null ? setFormData(() => ({ any_query: val })) : setFormData(e => ({ ...e, any_query: val }))
|
setFormData(e => ({ ...e, any_query: val }))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const [showTime, setShowTime] = useState(false)
|
||||||
|
const handClose = useCallback(() => {
|
||||||
|
setShowTime(false)
|
||||||
|
}, [])
|
||||||
|
const onSelectDate = useCallback((val) => {
|
||||||
|
if (!val.value?.start && !val.value?.end) {
|
||||||
|
alert.error('请选择日期')
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
setFormData(e => ({ ...e, sale_start_time: val.value.start, sale_end_time: val.value.end }))
|
||||||
|
}
|
||||||
|
console.log('val::', val)
|
||||||
|
}, [])
|
||||||
return <View>
|
return <View>
|
||||||
<View className={styles.code_list_search}>
|
<View className={styles.code_list_search}>
|
||||||
<View className={styles['code_list_search--code']}><Search placeholder="请输入单据抬头/客户/单号" changeOnSearch={onSearch} debounceTime={300} /></View>
|
<View className={styles['code_list_search--code']}><Search placeholder="请输入单据抬头/客户/单号" changeOnSearch={onSearch} debounceTime={300} /></View>
|
||||||
<View className={styles['code_list_search--data']} onClick={onClickData}>
|
<View className={styles['code_list_search--data']} onClick={() => setShowTime(true)}>
|
||||||
<IconFont name="icon-riqi" size={43} />
|
<IconFont name="icon-riqi" size={43} />
|
||||||
<Text>日期</Text>
|
<Text>日期</Text>
|
||||||
</View>
|
</View>
|
||||||
@ -49,5 +61,6 @@ export default (props: ParamType) => {
|
|||||||
</View>
|
</View>
|
||||||
})}
|
})}
|
||||||
</View>
|
</View>
|
||||||
|
<TimePickerPopup showTime={showTime} closePopup={handClose} onSelectDate={onSelectDate} />
|
||||||
</View>
|
</View>
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
import { View } from '@tarojs/components'
|
import { View } from '@tarojs/components'
|
||||||
import { useEffect, useState } from 'react'
|
import { useCallback, useEffect, useState } from 'react'
|
||||||
import styles from './index.module.scss'
|
import styles from './index.module.scss'
|
||||||
import CodeModel from './components/codeModel'
|
import CodeModel from './components/codeModel'
|
||||||
import CompanyModel from './components/companyModel'
|
import CompanyModel from './components/companyModel'
|
||||||
@ -17,6 +17,5 @@ export default () => {
|
|||||||
<SelectList list={selectList} defaultIndex={selectIndex} onSelect={index => setSelectIndex(index)} />
|
<SelectList list={selectList} defaultIndex={selectIndex} onSelect={index => setSelectIndex(index)} />
|
||||||
{selectIndex == 1 && <CodeModel />}
|
{selectIndex == 1 && <CodeModel />}
|
||||||
{selectIndex == 2 && <CompanyModel />}
|
{selectIndex == 2 && <CompanyModel />}
|
||||||
{/* <TimePickerPopup showTime={showTime} closePopup={handClose} onSelectDate={onSelectDate} /> */}
|
|
||||||
</View>
|
</View>
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user