Commit 8917f098 authored by 前端-钟卫鹏's avatar 前端-钟卫鹏

Merge branch 'dev' into test

parents 33d658c7 e2d5eae1
import React, { useRef, useEffect, useMemo } from 'react'
import { DatePicker } from 'antd';
import moment from 'moment';
/**
* Unix时间戳格式的时间范围选择
*/
const { RangePicker } = DatePicker;
const DateRangePickerUnix = (props) => {
const { value, mutators } = props
const { placeholder, dataSource, ...rest } = props.props["x-component-props"] || {}
const handleChange = (dates, dateString) => {
if(dateString.length === 2) {
mutators.change([moment(dateString[0]).format('x'), moment(dateString[1]).format('x')]);
}
}
return (
<RangePicker
style={{minWidth: 160}}
placeholder={placeholder}
onChange={handleChange}
{...rest}
/>
)
}
DateRangePickerUnix.defaultProps = {}
DateRangePickerUnix.isFieldComponent = true;
export default DateRangePickerUnix
\ No newline at end of file
...@@ -24,6 +24,7 @@ import TableTagList from './components/TableTagList'; ...@@ -24,6 +24,7 @@ import TableTagList from './components/TableTagList';
import './index.less' import './index.less'
import { Checkbox, Radio } from '@formily/antd-components'; import { Checkbox, Radio } from '@formily/antd-components';
import DateSelect from './components/DateSelect'; import DateSelect from './components/DateSelect';
import DateRangePickerUnix from './components/DateRangePickerUnix';
import VirtualChildren from './components/VirtualChildren'; import VirtualChildren from './components/VirtualChildren';
import SmilingFace from './components/SmilingFace'; import SmilingFace from './components/SmilingFace';
import SliderValidate from './components/SliderValidate'; import SliderValidate from './components/SliderValidate';
...@@ -97,6 +98,7 @@ export const componentExport = { ...@@ -97,6 +98,7 @@ export const componentExport = {
DateRangePicker: DatePicker.RangePicker, DateRangePicker: DatePicker.RangePicker,
TableTagList, TableTagList,
DateSelect, DateSelect,
DateRangePickerUnix,
VirtualChildren, VirtualChildren,
SmilingFace, SmilingFace,
SliderValidate, SliderValidate,
......
...@@ -11,7 +11,7 @@ import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilte ...@@ -11,7 +11,7 @@ import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilte
import { searchSchema } from './schema' import { searchSchema } from './schema'
import { FORM_FILTER_PATH } from '@/formSchema/const' import { FORM_FILTER_PATH } from '@/formSchema/const'
import EyePreview from '@/components/EyePreview' import EyePreview from '@/components/EyePreview'
import { DatePicker } from '@formily/antd-components' import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
import StatusTag from '@/components/StatusTag' import StatusTag from '@/components/StatusTag'
import { statusMap } from '../../constant' import { statusMap } from '../../constant'
import moment from 'moment' import moment from 'moment'
...@@ -140,7 +140,7 @@ const CheckWithdraw: React.FC<{}> = () => { ...@@ -140,7 +140,7 @@ const CheckWithdraw: React.FC<{}> = () => {
controlRender={ controlRender={
<NiceForm <NiceForm
components={{ components={{
RangePicker: DatePicker.RangePicker DateRangePickerUnix,
}} }}
actions={formActions} actions={formActions}
onSubmit={values => ref.current.reload(values)} onSubmit={values => ref.current.reload(values)}
......
...@@ -75,7 +75,7 @@ export const searchSchema: ISchema = { ...@@ -75,7 +75,7 @@ export const searchSchema: ISchema = {
}, },
"[startTime,endTime]": { "[startTime,endTime]": {
type: 'array', type: 'array',
"x-component": 'RangePicker', "x-component": 'DateRangePickerUnix',
'x-component-props': { 'x-component-props': {
placeholder: ['开始时间','结束时间'], placeholder: ['开始时间','结束时间'],
}, },
......
...@@ -11,7 +11,7 @@ import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilte ...@@ -11,7 +11,7 @@ import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilte
import { searchSchema } from './schema' import { searchSchema } from './schema'
import { FORM_FILTER_PATH } from '@/formSchema/const' import { FORM_FILTER_PATH } from '@/formSchema/const'
import EyePreview from '@/components/EyePreview' import EyePreview from '@/components/EyePreview'
import { DatePicker } from '@formily/antd-components' import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
import StatusTag from '@/components/StatusTag' import StatusTag from '@/components/StatusTag'
import { statusMap } from '../../constant' import { statusMap } from '../../constant'
import moment from 'moment' import moment from 'moment'
...@@ -102,7 +102,7 @@ const PaymentWithdraw: React.FC<{}> = () => { ...@@ -102,7 +102,7 @@ const PaymentWithdraw: React.FC<{}> = () => {
controlRender={ controlRender={
<NiceForm <NiceForm
components={{ components={{
RangePicker: DatePicker.RangePicker DateRangePickerUnix,
}} }}
actions={formActions} actions={formActions}
onSubmit={values => ref.current.reload(values)} onSubmit={values => ref.current.reload(values)}
......
...@@ -61,7 +61,7 @@ export const searchSchema: ISchema = { ...@@ -61,7 +61,7 @@ export const searchSchema: ISchema = {
}, },
"[startTime,endTime]": { "[startTime,endTime]": {
type: 'array', type: 'array',
"x-component": 'RangePicker', "x-component": 'DateRangePickerUnix',
'x-component-props': { 'x-component-props': {
placeholder: ['开始时间','结束时间'], placeholder: ['开始时间','结束时间'],
}, },
......
...@@ -228,6 +228,7 @@ const AccountDetail: React.FC<{}> = () => { ...@@ -228,6 +228,7 @@ const AccountDetail: React.FC<{}> = () => {
setScanVisible(false) setScanVisible(false)
getAccountInfo() getAccountInfo()
refTrade.current.reload() refTrade.current.reload()
clearInterval(timeChange)
} }
return ( return (
......
...@@ -14,6 +14,7 @@ import { DatePicker } from '@formily/antd-components' ...@@ -14,6 +14,7 @@ import { DatePicker } from '@formily/antd-components'
import StatusTag from '@/components/StatusTag' import StatusTag from '@/components/StatusTag'
import { accountStatusMap, memberStatusMap, memberLevelTypeMap, accountMemberType } from '../../constant' import { accountStatusMap, memberStatusMap, memberLevelTypeMap, accountMemberType } from '../../constant'
import LevelBrand from '@/pages/member/components/LevelBrand' import LevelBrand from '@/pages/member/components/LevelBrand'
import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
const formActions = createFormActions(); const formActions = createFormActions();
...@@ -108,7 +109,7 @@ const AccountLists: React.FC<{}> = () => { ...@@ -108,7 +109,7 @@ const AccountLists: React.FC<{}> = () => {
controlRender={ controlRender={
<NiceForm <NiceForm
components={{ components={{
RangePicker: DatePicker.RangePicker DateRangePickerUnix,
}} }}
actions={formActions} actions={formActions}
onSubmit={values => ref.current.reload(values)} onSubmit={values => ref.current.reload(values)}
......
...@@ -76,7 +76,7 @@ export const searchSchema: ISchema = { ...@@ -76,7 +76,7 @@ export const searchSchema: ISchema = {
}, },
"[startTime,endTime]": { "[startTime,endTime]": {
type: 'array', type: 'array',
"x-component": 'RangePicker', "x-component": 'DateRangePickerUnix',
'x-component-props': { 'x-component-props': {
placeholder: ['开始时间','结束时间'], placeholder: ['开始时间','结束时间'],
}, },
......
...@@ -68,7 +68,7 @@ export const tableListSchema: ISchema = { ...@@ -68,7 +68,7 @@ export const tableListSchema: ISchema = {
}, },
"[startCreateTime,endCreateTime]": { "[startCreateTime,endCreateTime]": {
type: 'array', type: 'array',
"x-component": 'daterangepicker', "x-component": 'DateRangePickerUnix',
'x-component-props': { 'x-component-props': {
placeholder: ['开始时间','结束时间'], placeholder: ['开始时间','结束时间'],
}, },
......
...@@ -11,7 +11,7 @@ import { tableListSchema } from './schema' ...@@ -11,7 +11,7 @@ import { tableListSchema } from './schema'
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch' import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
import { FORM_FILTER_PATH } from '@/formSchema/const' import { FORM_FILTER_PATH } from '@/formSchema/const'
import Submit from '@/components/NiceForm/components/Submit' import Submit from '@/components/NiceForm/components/Submit'
import { DatePicker } from '@formily/antd-components' import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
// 待新增采购入库单 // 待新增采购入库单
...@@ -52,7 +52,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => { ...@@ -52,7 +52,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
); );
}, },
components: { components: {
DateRangePicker: DatePicker.RangePicker, DateRangePickerUnix,
Submit Submit
} }
} }
......
...@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = { ...@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = {
}, },
"[startCreateTime,endCreateTime]": { "[startCreateTime,endCreateTime]": {
type: 'array', type: 'array',
"x-component": 'daterangepicker', "x-component": 'DateRangePickerUnix',
'x-component-props': { 'x-component-props': {
placeholder: ['开始时间','结束时间'], placeholder: ['开始时间','结束时间'],
}, },
......
...@@ -11,7 +11,7 @@ import { tableListSchema } from './schema' ...@@ -11,7 +11,7 @@ import { tableListSchema } from './schema'
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch' import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
import { FORM_FILTER_PATH } from '@/formSchema/const' import { FORM_FILTER_PATH } from '@/formSchema/const'
import Submit from '@/components/NiceForm/components/Submit' import Submit from '@/components/NiceForm/components/Submit'
import { DatePicker } from '@formily/antd-components' import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
import { useRowSelectionTable } from '@/hooks/useRowSelectionTable' import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
import { PurchaseOrderInsideWorkState } from '@/constants' import { PurchaseOrderInsideWorkState } from '@/constants'
import { useHttpRequest } from '@/hooks/useHttpRequest' import { useHttpRequest } from '@/hooks/useHttpRequest'
...@@ -77,7 +77,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => { ...@@ -77,7 +77,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
); );
}, },
components: { components: {
DateRangePicker: DatePicker.RangePicker, DateRangePickerUnix,
Submit Submit
} }
}, },
......
...@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = { ...@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = {
}, },
"[startCreateTime,endCreateTime]": { "[startCreateTime,endCreateTime]": {
type: 'array', type: 'array',
"x-component": 'daterangepicker', "x-component": 'DateRangePickerUnix',
'x-component-props': { 'x-component-props': {
placeholder: ['开始时间','结束时间'], placeholder: ['开始时间','结束时间'],
}, },
......
...@@ -11,6 +11,7 @@ import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilte ...@@ -11,6 +11,7 @@ import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilte
import { FORM_FILTER_PATH } from '@/formSchema/const' import { FORM_FILTER_PATH } from '@/formSchema/const'
import { DatePicker } from '@formily/antd-components' import { DatePicker } from '@formily/antd-components'
import Submit from '@/components/NiceForm/components/Submit' import Submit from '@/components/NiceForm/components/Submit'
import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
// 订单查询 // 订单查询
...@@ -82,7 +83,7 @@ const PurchaseOrder: React.FC<PurchaseOrderProps> = (props) => { ...@@ -82,7 +83,7 @@ const PurchaseOrder: React.FC<PurchaseOrderProps> = (props) => {
); );
}, },
components: { components: {
DateRangePicker: DatePicker.RangePicker, DateRangePickerUnix,
Submit Submit
} }
} }
......
...@@ -42,7 +42,7 @@ export const tableListSchema: ISchema = { ...@@ -42,7 +42,7 @@ export const tableListSchema: ISchema = {
}, },
"[startCreateTime,endCreateTime]": { "[startCreateTime,endCreateTime]": {
type: 'array', type: 'array',
"x-component": 'daterangepicker', "x-component": 'DateRangePickerUnix',
'x-component-props': { 'x-component-props': {
placeholder: ['开始时间','结束时间'], placeholder: ['开始时间','结束时间'],
}, },
......
...@@ -15,6 +15,7 @@ import { useSelfTable } from './model/useReadyAddOrder' ...@@ -15,6 +15,7 @@ import { useSelfTable } from './model/useReadyAddOrder'
import { useRowSelectionTable } from '@/hooks/useRowSelectionTable' import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
import { PurchaseOrderInsideWorkState } from '@/constants' import { PurchaseOrderInsideWorkState } from '@/constants'
import { useHttpRequest } from '@/hooks/useHttpRequest' import { useHttpRequest } from '@/hooks/useHttpRequest'
import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
// 待新增订单 // 待新增订单
...@@ -88,7 +89,7 @@ const ReadyAddOrder:React.FC<ReadyAddOrderProps> = (props) => { ...@@ -88,7 +89,7 @@ const ReadyAddOrder:React.FC<ReadyAddOrderProps> = (props) => {
); );
}, },
components: { components: {
DateRangePicker: DatePicker.RangePicker, DateRangePickerUnix,
Submit Submit
} }
}, },
......
...@@ -43,7 +43,7 @@ export const tableListSchema: ISchema = { ...@@ -43,7 +43,7 @@ export const tableListSchema: ISchema = {
}, },
"[startCreateTime,endCreateTime]": { "[startCreateTime,endCreateTime]": {
type: 'array', type: 'array',
"x-component": 'daterangepicker', "x-component": 'DateRangePickerUnix',
'x-component-props': { 'x-component-props': {
placeholder: ['开始时间','结束时间'], placeholder: ['开始时间','结束时间'],
}, },
......
...@@ -11,7 +11,7 @@ import { tableListSchema } from './schema' ...@@ -11,7 +11,7 @@ import { tableListSchema } from './schema'
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch' import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
import { FORM_FILTER_PATH } from '@/formSchema/const' import { FORM_FILTER_PATH } from '@/formSchema/const'
import Submit from '@/components/NiceForm/components/Submit' import Submit from '@/components/NiceForm/components/Submit'
import { DatePicker } from '@formily/antd-components' import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
// 待确认电子合同 // 待确认电子合同
...@@ -50,7 +50,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => { ...@@ -50,7 +50,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
); );
}, },
components: { components: {
DateRangePicker: DatePicker.RangePicker, DateRangePickerUnix,
Submit Submit
} }
} }
......
...@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = { ...@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = {
}, },
"[startCreateTime,endCreateTime]": { "[startCreateTime,endCreateTime]": {
type: 'array', type: 'array',
"x-component": 'daterangepicker', "x-component": 'DateRangePickerUnix',
'x-component-props': { 'x-component-props': {
placeholder: ['开始时间','结束时间'], placeholder: ['开始时间','结束时间'],
}, },
......
...@@ -11,10 +11,10 @@ import { tableListSchema } from './schema' ...@@ -11,10 +11,10 @@ import { tableListSchema } from './schema'
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch' import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
import { FORM_FILTER_PATH } from '@/formSchema/const' import { FORM_FILTER_PATH } from '@/formSchema/const'
import Submit from '@/components/NiceForm/components/Submit' import Submit from '@/components/NiceForm/components/Submit'
import { DatePicker } from '@formily/antd-components'
import { useRowSelectionTable } from '@/hooks/useRowSelectionTable' import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
import { PurchaseOrderInsideWorkState, SaleOrderInsideWorkState } from '@/constants' import { PurchaseOrderInsideWorkState, SaleOrderInsideWorkState } from '@/constants'
import { useHttpRequest } from '@/hooks/useHttpRequest' import { useHttpRequest } from '@/hooks/useHttpRequest'
import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
// 待归档订单 // 待归档订单
...@@ -76,7 +76,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => { ...@@ -76,7 +76,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
); );
}, },
components: { components: {
DateRangePicker: DatePicker.RangePicker, DateRangePickerUnix,
Submit Submit
} }
}, },
......
...@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = { ...@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = {
}, },
"[startCreateTime,endCreateTime]": { "[startCreateTime,endCreateTime]": {
type: 'array', type: 'array',
"x-component": 'daterangepicker', "x-component": 'DateRangePickerUnix',
'x-component-props': { 'x-component-props': {
placeholder: ['开始时间','结束时间'], placeholder: ['开始时间','结束时间'],
}, },
......
...@@ -11,7 +11,7 @@ import { tableListSchema } from './schema' ...@@ -11,7 +11,7 @@ import { tableListSchema } from './schema'
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch' import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
import { FORM_FILTER_PATH } from '@/formSchema/const' import { FORM_FILTER_PATH } from '@/formSchema/const'
import Submit from '@/components/NiceForm/components/Submit' import Submit from '@/components/NiceForm/components/Submit'
import { DatePicker } from '@formily/antd-components' import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
// 待支付订单 // 待支付订单
...@@ -50,7 +50,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => { ...@@ -50,7 +50,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
); );
}, },
components: { components: {
DateRangePicker: DatePicker.RangePicker, DateRangePickerUnix,
Submit Submit
} }
} }
......
...@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = { ...@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = {
}, },
"[startCreateTime,endCreateTime]": { "[startCreateTime,endCreateTime]": {
type: 'array', type: 'array',
"x-component": 'daterangepicker', "x-component": 'DateRangePickerUnix',
'x-component-props': { 'x-component-props': {
placeholder: ['开始时间','结束时间'], placeholder: ['开始时间','结束时间'],
}, },
......
...@@ -11,7 +11,7 @@ import { tableListSchema } from './schema' ...@@ -11,7 +11,7 @@ import { tableListSchema } from './schema'
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch' import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
import { FORM_FILTER_PATH } from '@/formSchema/const' import { FORM_FILTER_PATH } from '@/formSchema/const'
import Submit from '@/components/NiceForm/components/Submit' import Submit from '@/components/NiceForm/components/Submit'
import { DatePicker } from '@formily/antd-components' import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
// 待确认收货单 // 待确认收货单
...@@ -50,7 +50,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => { ...@@ -50,7 +50,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
); );
}, },
components: { components: {
DateRangePicker: DatePicker.RangePicker, DateRangePickerUnix,
Submit Submit
} }
} }
......
...@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = { ...@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = {
}, },
"[startCreateTime,endCreateTime]": { "[startCreateTime,endCreateTime]": {
type: 'array', type: 'array',
"x-component": 'daterangepicker', "x-component": 'DateRangePickerUnix',
'x-component-props': { 'x-component-props': {
placeholder: ['开始时间','结束时间'], placeholder: ['开始时间','结束时间'],
}, },
......
...@@ -11,7 +11,7 @@ import { tableListSchema } from './schema' ...@@ -11,7 +11,7 @@ import { tableListSchema } from './schema'
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch' import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
import { FORM_FILTER_PATH } from '@/formSchema/const' import { FORM_FILTER_PATH } from '@/formSchema/const'
import Submit from '@/components/NiceForm/components/Submit' import Submit from '@/components/NiceForm/components/Submit'
import { DatePicker } from '@formily/antd-components' import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
import { PurchaseOrderOutWorkState, PurchaseOrderInsideWorkState } from '@/constants' import { PurchaseOrderOutWorkState, PurchaseOrderInsideWorkState } from '@/constants'
import { useHttpRequest } from '@/hooks/useHttpRequest' import { useHttpRequest } from '@/hooks/useHttpRequest'
...@@ -72,7 +72,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => { ...@@ -72,7 +72,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
); );
}, },
components: { components: {
DateRangePicker: DatePicker.RangePicker, DateRangePickerUnix,
Submit Submit
} }
}, },
......
...@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = { ...@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = {
}, },
"[startCreateTime,endCreateTime]": { "[startCreateTime,endCreateTime]": {
type: 'array', type: 'array',
"x-component": 'daterangepicker', "x-component": 'DateRangePickerUnix',
'x-component-props': { 'x-component-props': {
placeholder: ['开始时间','结束时间'], placeholder: ['开始时间','结束时间'],
}, },
......
...@@ -11,7 +11,7 @@ import { tableListSchema } from './schema' ...@@ -11,7 +11,7 @@ import { tableListSchema } from './schema'
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch' import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
import { FORM_FILTER_PATH } from '@/formSchema/const' import { FORM_FILTER_PATH } from '@/formSchema/const'
import Submit from '@/components/NiceForm/components/Submit' import Submit from '@/components/NiceForm/components/Submit'
import { DatePicker } from '@formily/antd-components' import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
import { useRowSelectionTable } from '@/hooks/useRowSelectionTable' import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
import { useHttpRequest } from '@/hooks/useHttpRequest' import { useHttpRequest } from '@/hooks/useHttpRequest'
...@@ -69,7 +69,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => { ...@@ -69,7 +69,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
); );
}, },
components: { components: {
DateRangePicker: DatePicker.RangePicker, DateRangePickerUnix,
Submit Submit
} }
}, },
......
...@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = { ...@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = {
}, },
"[startCreateTime,endCreateTime]": { "[startCreateTime,endCreateTime]": {
type: 'array', type: 'array',
"x-component": 'daterangepicker', "x-component": 'DateRangePickerUnix',
'x-component-props': { 'x-component-props': {
placeholder: ['开始时间','结束时间'], placeholder: ['开始时间','结束时间'],
}, },
......
...@@ -11,7 +11,7 @@ import { tableListSchema } from './schema' ...@@ -11,7 +11,7 @@ import { tableListSchema } from './schema'
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch' import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
import { FORM_FILTER_PATH } from '@/formSchema/const' import { FORM_FILTER_PATH } from '@/formSchema/const'
import Submit from '@/components/NiceForm/components/Submit' import Submit from '@/components/NiceForm/components/Submit'
import { DatePicker } from '@formily/antd-components' import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
// 待确认支付结果订单 // 待确认支付结果订单
...@@ -52,7 +52,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => { ...@@ -52,7 +52,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
); );
}, },
components: { components: {
DateRangePicker: DatePicker.RangePicker, DateRangePickerUnix,
Submit Submit
} }
} }
......
...@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = { ...@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = {
}, },
"[startCreateTime,endCreateTime]": { "[startCreateTime,endCreateTime]": {
type: 'array', type: 'array',
"x-component": 'daterangepicker', "x-component": 'DateRangePickerUnix',
'x-component-props': { 'x-component-props': {
placeholder: ['开始时间','结束时间'], placeholder: ['开始时间','结束时间'],
}, },
......
...@@ -11,7 +11,7 @@ import { tableListSchema } from './schema' ...@@ -11,7 +11,7 @@ import { tableListSchema } from './schema'
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch' import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
import { FORM_FILTER_PATH } from '@/formSchema/const' import { FORM_FILTER_PATH } from '@/formSchema/const'
import Submit from '@/components/NiceForm/components/Submit' import Submit from '@/components/NiceForm/components/Submit'
import { DatePicker } from '@formily/antd-components' import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
import { useRowSelectionTable } from '@/hooks/useRowSelectionTable' import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
import { PurchaseOrderInsideWorkState, SaleOrderInsideWorkState } from '@/constants' import { PurchaseOrderInsideWorkState, SaleOrderInsideWorkState } from '@/constants'
import { useHttpRequest } from '@/hooks/useHttpRequest' import { useHttpRequest } from '@/hooks/useHttpRequest'
...@@ -72,7 +72,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => { ...@@ -72,7 +72,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
); );
}, },
components: { components: {
DateRangePicker: DatePicker.RangePicker, DateRangePickerUnix,
Submit Submit
} }
}, },
......
...@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = { ...@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = {
}, },
"[startCreateTime,endCreateTime]": { "[startCreateTime,endCreateTime]": {
type: 'array', type: 'array',
"x-component": 'daterangepicker', "x-component": 'DateRangePickerUnix',
'x-component-props': { 'x-component-props': {
placeholder: ['开始时间','结束时间'], placeholder: ['开始时间','结束时间'],
}, },
......
...@@ -9,7 +9,7 @@ import { PurchaseOrderInsideWorkState, PurchaseOrderOutWorkState } from '@/const ...@@ -9,7 +9,7 @@ import { PurchaseOrderInsideWorkState, PurchaseOrderOutWorkState } from '@/const
import { tableListSchema } from '../_public/order/constant' import { tableListSchema } from '../_public/order/constant'
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch' import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
import { FORM_FILTER_PATH } from '@/formSchema/const' import { FORM_FILTER_PATH } from '@/formSchema/const'
import { DatePicker } from '@formily/antd-components' import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
import Submit from '@/components/NiceForm/components/Submit' import Submit from '@/components/NiceForm/components/Submit'
import moment from 'moment' import moment from 'moment'
...@@ -81,7 +81,7 @@ const SaleOrder: React.FC<SaleOrderProps> = (props) => { ...@@ -81,7 +81,7 @@ const SaleOrder: React.FC<SaleOrderProps> = (props) => {
); );
}, },
components: { components: {
DateRangePicker: DatePicker.RangePicker, DateRangePickerUnix,
Submit Submit
} }
} }
......
...@@ -11,7 +11,7 @@ import { tableListSchema } from './schema' ...@@ -11,7 +11,7 @@ import { tableListSchema } from './schema'
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch' import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
import { FORM_FILTER_PATH } from '@/formSchema/const' import { FORM_FILTER_PATH } from '@/formSchema/const'
import Submit from '@/components/NiceForm/components/Submit' import Submit from '@/components/NiceForm/components/Submit'
import { DatePicker } from '@formily/antd-components' import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
// 待新增物流单 // 待新增物流单
...@@ -50,7 +50,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => { ...@@ -50,7 +50,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
); );
}, },
components: { components: {
DateRangePicker: DatePicker.RangePicker, DateRangePickerUnix,
Submit Submit
} }
} }
......
...@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = { ...@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = {
}, },
"[startCreateTime,endCreateTime]": { "[startCreateTime,endCreateTime]": {
type: 'array', type: 'array',
"x-component": 'daterangepicker', "x-component": 'DateRangePickerUnix',
'x-component-props': { 'x-component-props': {
placeholder: ['开始时间','结束时间'], placeholder: ['开始时间','结束时间'],
}, },
......
...@@ -7,7 +7,7 @@ import { tableListSchema } from './schema' ...@@ -7,7 +7,7 @@ import { tableListSchema } from './schema'
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch' import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
import { FORM_FILTER_PATH } from '@/formSchema/const' import { FORM_FILTER_PATH } from '@/formSchema/const'
import Submit from '@/components/NiceForm/components/Submit' import Submit from '@/components/NiceForm/components/Submit'
import { DatePicker } from '@formily/antd-components' import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
import { useSelfTable } from './model/useSelfTable' import { useSelfTable } from './model/useSelfTable'
import { useRowSelectionTable } from '@/hooks/useRowSelectionTable' import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
import { useHttpRequest } from '@/hooks/useHttpRequest' import { useHttpRequest } from '@/hooks/useHttpRequest'
...@@ -64,7 +64,7 @@ const ReadyApprovedOrder:React.FC<ReadyApprovedOrderProps> = (props) => { ...@@ -64,7 +64,7 @@ const ReadyApprovedOrder:React.FC<ReadyApprovedOrderProps> = (props) => {
); );
}, },
components: { components: {
DateRangePicker: DatePicker.RangePicker, DateRangePickerUnix,
Submit Submit
} }
}, },
......
...@@ -43,7 +43,7 @@ export const tableListSchema: ISchema = { ...@@ -43,7 +43,7 @@ export const tableListSchema: ISchema = {
}, },
"[startCreateTime,endCreateTime]": { "[startCreateTime,endCreateTime]": {
type: 'array', type: 'array',
"x-component": 'daterangepicker', "x-component": 'DateRangePickerUnix',
'x-component-props': { 'x-component-props': {
placeholder: ['开始时间','结束时间'], placeholder: ['开始时间','结束时间'],
}, },
......
...@@ -11,7 +11,7 @@ import { tableListSchema } from './schema' ...@@ -11,7 +11,7 @@ import { tableListSchema } from './schema'
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch' import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
import { FORM_FILTER_PATH } from '@/formSchema/const' import { FORM_FILTER_PATH } from '@/formSchema/const'
import Submit from '@/components/NiceForm/components/Submit' import Submit from '@/components/NiceForm/components/Submit'
import { DatePicker } from '@formily/antd-components' import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
// 待确认发货单 // 待确认发货单
...@@ -50,7 +50,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => { ...@@ -50,7 +50,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
); );
}, },
components: { components: {
DateRangePicker: DatePicker.RangePicker, DateRangePickerUnix,
Submit Submit
} }
} }
......
...@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = { ...@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = {
}, },
"[startCreateTime,endCreateTime]": { "[startCreateTime,endCreateTime]": {
type: 'array', type: 'array',
"x-component": 'daterangepicker', "x-component": 'DateRangePickerUnix',
'x-component-props': { 'x-component-props': {
placeholder: ['开始时间','结束时间'], placeholder: ['开始时间','结束时间'],
}, },
......
...@@ -11,7 +11,7 @@ import { tableListSchema } from './schema' ...@@ -11,7 +11,7 @@ import { tableListSchema } from './schema'
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch' import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
import { FORM_FILTER_PATH } from '@/formSchema/const' import { FORM_FILTER_PATH } from '@/formSchema/const'
import Submit from '@/components/NiceForm/components/Submit' import Submit from '@/components/NiceForm/components/Submit'
import { DatePicker } from '@formily/antd-components' import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
// 待确认订单 // 待确认订单
...@@ -50,7 +50,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => { ...@@ -50,7 +50,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
); );
}, },
components: { components: {
DateRangePicker: DatePicker.RangePicker, DateRangePickerUnix,
Submit Submit
} }
} }
......
...@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = { ...@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = {
}, },
"[startCreateTime,endCreateTime]": { "[startCreateTime,endCreateTime]": {
type: 'array', type: 'array',
"x-component": 'daterangepicker', "x-component": 'DateRangePickerUnix',
'x-component-props': { 'x-component-props': {
placeholder: ['开始时间','结束时间'], placeholder: ['开始时间','结束时间'],
}, },
......
...@@ -11,7 +11,7 @@ import { tableListSchema } from './schema' ...@@ -11,7 +11,7 @@ import { tableListSchema } from './schema'
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch' import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
import { FORM_FILTER_PATH } from '@/formSchema/const' import { FORM_FILTER_PATH } from '@/formSchema/const'
import Submit from '@/components/NiceForm/components/Submit' import Submit from '@/components/NiceForm/components/Submit'
import { DatePicker } from '@formily/antd-components' import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
// 待确认回单 // 待确认回单
...@@ -50,7 +50,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => { ...@@ -50,7 +50,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
); );
}, },
components: { components: {
DateRangePicker: DatePicker.RangePicker, DateRangePickerUnix,
Submit Submit
} }
} }
......
...@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = { ...@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = {
}, },
"[startCreateTime,endCreateTime]": { "[startCreateTime,endCreateTime]": {
type: 'array', type: 'array',
"x-component": 'daterangepicker', "x-component": 'DateRangePickerUnix',
'x-component-props': { 'x-component-props': {
placeholder: ['开始时间','结束时间'], placeholder: ['开始时间','结束时间'],
}, },
......
...@@ -11,7 +11,7 @@ import { tableListSchema } from './schema' ...@@ -11,7 +11,7 @@ import { tableListSchema } from './schema'
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch' import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
import { FORM_FILTER_PATH } from '@/formSchema/const' import { FORM_FILTER_PATH } from '@/formSchema/const'
import Submit from '@/components/NiceForm/components/Submit' import Submit from '@/components/NiceForm/components/Submit'
import { DatePicker } from '@formily/antd-components' import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
// 待确认支付结果订单 // 待确认支付结果订单
...@@ -50,7 +50,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => { ...@@ -50,7 +50,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
); );
}, },
components: { components: {
DateRangePicker: DatePicker.RangePicker, DateRangePickerUnix,
Submit Submit
} }
} }
......
...@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = { ...@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = {
}, },
"[startCreateTime,endCreateTime]": { "[startCreateTime,endCreateTime]": {
type: 'array', type: 'array',
"x-component": 'daterangepicker', "x-component": 'DateRangePickerUnix',
'x-component-props': { 'x-component-props': {
placeholder: ['开始时间','结束时间'], placeholder: ['开始时间','结束时间'],
}, },
......
...@@ -11,7 +11,7 @@ import { tableListSchema } from './schema' ...@@ -11,7 +11,7 @@ import { tableListSchema } from './schema'
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch' import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
import { FORM_FILTER_PATH } from '@/formSchema/const' import { FORM_FILTER_PATH } from '@/formSchema/const'
import Submit from '@/components/NiceForm/components/Submit' import Submit from '@/components/NiceForm/components/Submit'
import { DatePicker } from '@formily/antd-components' import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
import { useRowSelectionTable } from '@/hooks/useRowSelectionTable' import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
import { PurchaseOrderInsideWorkState, SaleOrderInsideWorkState } from '@/constants' import { PurchaseOrderInsideWorkState, SaleOrderInsideWorkState } from '@/constants'
import { useHttpRequest } from '@/hooks/useHttpRequest' import { useHttpRequest } from '@/hooks/useHttpRequest'
...@@ -76,7 +76,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => { ...@@ -76,7 +76,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
); );
}, },
components: { components: {
DateRangePicker: DatePicker.RangePicker, DateRangePickerUnix,
Submit Submit
} }
}, },
......
...@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = { ...@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = {
}, },
"[startCreateTime,endCreateTime]": { "[startCreateTime,endCreateTime]": {
type: 'array', type: 'array',
"x-component": 'daterangepicker', "x-component": 'DateRangePickerUnix',
'x-component-props': { 'x-component-props': {
placeholder: ['开始时间','结束时间'], placeholder: ['开始时间','结束时间'],
}, },
......
...@@ -11,9 +11,9 @@ import { tableListSchema } from './schema' ...@@ -11,9 +11,9 @@ import { tableListSchema } from './schema'
import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch' import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
import { FORM_FILTER_PATH } from '@/formSchema/const' import { FORM_FILTER_PATH } from '@/formSchema/const'
import Submit from '@/components/NiceForm/components/Submit' import Submit from '@/components/NiceForm/components/Submit'
import { DatePicker } from '@formily/antd-components'
import { useRowSelectionTable } from '@/hooks/useRowSelectionTable' import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
import { useHttpRequest } from '@/hooks/useHttpRequest' import { useHttpRequest } from '@/hooks/useHttpRequest'
import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
// 二级待审核订单 // 二级待审核订单
...@@ -68,7 +68,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => { ...@@ -68,7 +68,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
); );
}, },
components: { components: {
DateRangePicker: DatePicker.RangePicker, DateRangePickerUnix,
Submit Submit
} }
}, },
......
...@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = { ...@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = {
}, },
"[startCreateTime,endCreateTime]": { "[startCreateTime,endCreateTime]": {
type: 'array', type: 'array',
"x-component": 'daterangepicker', "x-component": 'DateRangePickerUnix',
'x-component-props': { 'x-component-props': {
placeholder: ['开始时间','结束时间'], placeholder: ['开始时间','结束时间'],
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment