Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-platform
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linweijiong
jinfa-platform
Commits
e2d5eae1
Commit
e2d5eae1
authored
Nov 20, 2020
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:处理订单/资金账户区块时间筛选为时间戳格式,添加时间戳格式的时间范围选择控件DateRangePickerUnix
parent
1cfc61a6
Hide whitespace changes
Inline
Side-by-side
Showing
50 changed files
with
111 additions
and
69 deletions
+111
-69
DateRangePickerUnix.tsx
src/components/NiceForm/components/DateRangePickerUnix.tsx
+37
-0
index.tsx
src/components/NiceForm/index.tsx
+2
-0
index.tsx
.../payandSettle/amountAccountManage/checkWithdraw/index.tsx
+2
-2
index.tsx
...Settle/amountAccountManage/checkWithdraw/schema/index.tsx
+1
-1
index.tsx
...ayandSettle/amountAccountManage/paymentWithdraw/index.tsx
+2
-2
index.tsx
...ttle/amountAccountManage/paymentWithdraw/schema/index.tsx
+1
-1
index.tsx
...pages/payandSettle/capitalAccounts/accountLists/index.tsx
+2
-1
index.tsx
...ayandSettle/capitalAccounts/accountLists/schema/index.tsx
+1
-1
constant.ts
src/pages/transaction/_public/order/constant.ts
+1
-1
index.tsx
...saction/purchaseOrder/addPurchaseWarehouseOrder/index.tsx
+2
-2
index.ts
...n/purchaseOrder/addPurchaseWarehouseOrder/schema/index.ts
+1
-1
index.tsx
...es/transaction/purchaseOrder/firstApprovedOrder/index.tsx
+2
-2
index.ts
...nsaction/purchaseOrder/firstApprovedOrder/schema/index.ts
+1
-1
index.tsx
src/pages/transaction/purchaseOrder/index.tsx
+2
-1
index.ts
...es/transaction/purchaseOrder/orderCollect/schema/index.ts
+1
-1
index.tsx
src/pages/transaction/purchaseOrder/readyAddOrder/index.tsx
+2
-1
index.ts
...s/transaction/purchaseOrder/readyAddOrder/schema/index.ts
+1
-1
index.tsx
.../transaction/purchaseOrder/readyConfirmContract/index.tsx
+2
-2
index.ts
...action/purchaseOrder/readyConfirmContract/schema/index.ts
+1
-1
index.tsx
src/pages/transaction/purchaseOrder/readyFileOrder/index.tsx
+2
-2
index.ts
.../transaction/purchaseOrder/readyFileOrder/schema/index.ts
+1
-1
index.tsx
src/pages/transaction/purchaseOrder/readyPayOrder/index.tsx
+2
-2
index.ts
...s/transaction/purchaseOrder/readyPayOrder/schema/index.ts
+1
-1
index.tsx
...ges/transaction/purchaseOrder/readyReceiveOrder/index.tsx
+2
-2
index.ts
...ansaction/purchaseOrder/readyReceiveOrder/schema/index.ts
+1
-1
index.tsx
...ages/transaction/purchaseOrder/readySubmitOrder/index.tsx
+2
-2
index.ts
...ransaction/purchaseOrder/readySubmitOrder/schema/index.ts
+1
-1
index.tsx
...s/transaction/purchaseOrder/secondApprovedOrder/index.tsx
+2
-2
index.ts
...saction/purchaseOrder/secondApprovedOrder/schema/index.ts
+1
-1
index.tsx
...pages/transaction/saleOrder/addSaleDelevedOrder/index.tsx
+2
-2
index.ts
...transaction/saleOrder/addSaleDelevedOrder/schema/index.ts
+1
-1
index.tsx
src/pages/transaction/saleOrder/firstApprovedOrder/index.tsx
+2
-2
index.ts
.../transaction/saleOrder/firstApprovedOrder/schema/index.ts
+1
-1
index.tsx
src/pages/transaction/saleOrder/index.tsx
+2
-2
index.tsx
...es/transaction/saleOrder/readyAddLogisticsOrder/index.tsx
+2
-2
index.ts
...nsaction/saleOrder/readyAddLogisticsOrder/schema/index.ts
+1
-1
index.tsx
src/pages/transaction/saleOrder/readyApprovedOrder/index.tsx
+2
-2
index.ts
.../transaction/saleOrder/readyApprovedOrder/schema/index.ts
+1
-1
index.tsx
.../transaction/saleOrder/readyConfirmDelevedOrder/index.tsx
+2
-2
index.ts
...action/saleOrder/readyConfirmDelevedOrder/schema/index.ts
+1
-1
index.tsx
src/pages/transaction/saleOrder/readyConfirmOrder/index.tsx
+2
-2
index.ts
...s/transaction/saleOrder/readyConfirmOrder/schema/index.ts
+1
-1
index.tsx
...s/transaction/saleOrder/readyConfirmReturnOrder/index.tsx
+2
-2
index.ts
...saction/saleOrder/readyConfirmReturnOrder/schema/index.ts
+1
-1
index.tsx
src/pages/transaction/saleOrder/readyPayResult/index.tsx
+2
-2
index.ts
...ages/transaction/saleOrder/readyPayResult/schema/index.ts
+1
-1
index.tsx
...pages/transaction/saleOrder/readyReturnDocument/index.tsx
+2
-2
index.ts
...transaction/saleOrder/readyReturnDocument/schema/index.ts
+1
-1
index.tsx
...pages/transaction/saleOrder/secondApprovedOrder/index.tsx
+2
-2
index.ts
...transaction/saleOrder/secondApprovedOrder/schema/index.ts
+1
-1
No files found.
src/components/NiceForm/components/DateRangePickerUnix.tsx
0 → 100644
View file @
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
src/components/NiceForm/index.tsx
View file @
e2d5eae1
...
...
@@ -24,6 +24,7 @@ import TableTagList from './components/TableTagList';
import
'./index.less'
import
{
Checkbox
,
Radio
}
from
'@formily/antd-components'
;
import
DateSelect
from
'./components/DateSelect'
;
import
DateRangePickerUnix
from
'./components/DateRangePickerUnix'
;
import
VirtualChildren
from
'./components/VirtualChildren'
;
import
SmilingFace
from
'./components/SmilingFace'
;
import
SliderValidate
from
'./components/SliderValidate'
;
...
...
@@ -97,6 +98,7 @@ export const componentExport = {
DateRangePicker
:
DatePicker
.
RangePicker
,
TableTagList
,
DateSelect
,
DateRangePickerUnix
,
VirtualChildren
,
SmilingFace
,
SliderValidate
,
...
...
src/pages/payandSettle/amountAccountManage/checkWithdraw/index.tsx
View file @
e2d5eae1
...
...
@@ -11,7 +11,7 @@ import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilte
import
{
searchSchema
}
from
'./schema'
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
import
EyePreview
from
'@/components/EyePreview'
import
{
DatePicker
}
from
'@formily/antd-components
'
import
DateRangePickerUnix
from
'@/components/NiceForm/components/DateRangePickerUnix
'
import
StatusTag
from
'@/components/StatusTag'
import
{
statusMap
}
from
'../../constant'
import
moment
from
'moment'
...
...
@@ -140,7 +140,7 @@ const CheckWithdraw: React.FC<{}> = () => {
controlRender=
{
<
NiceForm
components=
{
{
RangePicker
:
DatePicker
.
RangePicker
DateRangePickerUnix
,
}
}
actions=
{
formActions
}
onSubmit=
{
values
=>
ref
.
current
.
reload
(
values
)
}
...
...
src/pages/payandSettle/amountAccountManage/checkWithdraw/schema/index.tsx
View file @
e2d5eae1
...
...
@@ -75,7 +75,7 @@ export const searchSchema: ISchema = {
},
"[startTime,endTime]"
:
{
type
:
'array'
,
"x-component"
:
'
RangePicker
'
,
"x-component"
:
'
DateRangePickerUnix
'
,
'x-component-props'
:
{
placeholder
:
[
'开始时间'
,
'结束时间'
],
},
...
...
src/pages/payandSettle/amountAccountManage/paymentWithdraw/index.tsx
View file @
e2d5eae1
...
...
@@ -11,7 +11,7 @@ import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilte
import
{
searchSchema
}
from
'./schema'
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
import
EyePreview
from
'@/components/EyePreview'
import
{
DatePicker
}
from
'@formily/antd-components
'
import
DateRangePickerUnix
from
'@/components/NiceForm/components/DateRangePickerUnix
'
import
StatusTag
from
'@/components/StatusTag'
import
{
statusMap
}
from
'../../constant'
import
moment
from
'moment'
...
...
@@ -102,7 +102,7 @@ const PaymentWithdraw: React.FC<{}> = () => {
controlRender=
{
<
NiceForm
components=
{
{
RangePicker
:
DatePicker
.
RangePicker
DateRangePickerUnix
,
}
}
actions=
{
formActions
}
onSubmit=
{
values
=>
ref
.
current
.
reload
(
values
)
}
...
...
src/pages/payandSettle/amountAccountManage/paymentWithdraw/schema/index.tsx
View file @
e2d5eae1
...
...
@@ -61,7 +61,7 @@ export const searchSchema: ISchema = {
},
"[startTime,endTime]"
:
{
type
:
'array'
,
"x-component"
:
'
RangePicker
'
,
"x-component"
:
'
DateRangePickerUnix
'
,
'x-component-props'
:
{
placeholder
:
[
'开始时间'
,
'结束时间'
],
},
...
...
src/pages/payandSettle/capitalAccounts/accountLists/index.tsx
View file @
e2d5eae1
...
...
@@ -14,6 +14,7 @@ import { DatePicker } from '@formily/antd-components'
import
StatusTag
from
'@/components/StatusTag'
import
{
accountStatusMap
,
memberStatusMap
,
memberLevelTypeMap
,
accountMemberType
}
from
'../../constant'
import
LevelBrand
from
'@/pages/member/components/LevelBrand'
import
DateRangePickerUnix
from
'@/components/NiceForm/components/DateRangePickerUnix'
const
formActions
=
createFormActions
();
...
...
@@ -108,7 +109,7 @@ const AccountLists: React.FC<{}> = () => {
controlRender=
{
<
NiceForm
components=
{
{
RangePicker
:
DatePicker
.
RangePicker
DateRangePickerUnix
,
}
}
actions=
{
formActions
}
onSubmit=
{
values
=>
ref
.
current
.
reload
(
values
)
}
...
...
src/pages/payandSettle/capitalAccounts/accountLists/schema/index.tsx
View file @
e2d5eae1
...
...
@@ -76,7 +76,7 @@ export const searchSchema: ISchema = {
},
"[startTime,endTime]"
:
{
type
:
'array'
,
"x-component"
:
'
RangePicker
'
,
"x-component"
:
'
DateRangePickerUnix
'
,
'x-component-props'
:
{
placeholder
:
[
'开始时间'
,
'结束时间'
],
},
...
...
src/pages/transaction/_public/order/constant.ts
View file @
e2d5eae1
...
...
@@ -68,7 +68,7 @@ export const tableListSchema: ISchema = {
},
"[startCreateTime,endCreateTime]"
:
{
type
:
'array'
,
"x-component"
:
'
daterangepicker
'
,
"x-component"
:
'
DateRangePickerUnix
'
,
'x-component-props'
:
{
placeholder
:
[
'开始时间'
,
'结束时间'
],
},
...
...
src/pages/transaction/purchaseOrder/addPurchaseWarehouseOrder/index.tsx
View file @
e2d5eae1
...
...
@@ -11,7 +11,7 @@ import { tableListSchema } from './schema'
import
{
useStateFilterSearchLinkageEffect
}
from
'@/formSchema/effects/useFilterSearch'
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
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) => {
);
},
components
:
{
DateRangePicker
:
DatePicker
.
RangePicker
,
DateRangePicker
Unix
,
Submit
}
}
...
...
src/pages/transaction/purchaseOrder/addPurchaseWarehouseOrder/schema/index.ts
View file @
e2d5eae1
...
...
@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = {
},
"[startCreateTime,endCreateTime]"
:
{
type
:
'array'
,
"x-component"
:
'
daterangepicker
'
,
"x-component"
:
'
DateRangePickerUnix
'
,
'x-component-props'
:
{
placeholder
:
[
'开始时间'
,
'结束时间'
],
},
...
...
src/pages/transaction/purchaseOrder/firstApprovedOrder/index.tsx
View file @
e2d5eae1
...
...
@@ -11,7 +11,7 @@ import { tableListSchema } from './schema'
import
{
useStateFilterSearchLinkageEffect
}
from
'@/formSchema/effects/useFilterSearch'
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
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
{
PurchaseOrderInsideWorkState
}
from
'@/constants'
import
{
useHttpRequest
}
from
'@/hooks/useHttpRequest'
...
...
@@ -77,7 +77,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
);
},
components
:
{
DateRangePicker
:
DatePicker
.
RangePicker
,
DateRangePicker
Unix
,
Submit
}
},
...
...
src/pages/transaction/purchaseOrder/firstApprovedOrder/schema/index.ts
View file @
e2d5eae1
...
...
@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = {
},
"[startCreateTime,endCreateTime]"
:
{
type
:
'array'
,
"x-component"
:
'
daterangepicker
'
,
"x-component"
:
'
DateRangePickerUnix
'
,
'x-component-props'
:
{
placeholder
:
[
'开始时间'
,
'结束时间'
],
},
...
...
src/pages/transaction/purchaseOrder/index.tsx
View file @
e2d5eae1
...
...
@@ -11,6 +11,7 @@ import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilte
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
import
{
DatePicker
}
from
'@formily/antd-components'
import
Submit
from
'@/components/NiceForm/components/Submit'
import
DateRangePickerUnix
from
'@/components/NiceForm/components/DateRangePickerUnix'
// 订单查询
...
...
@@ -82,7 +83,7 @@ const PurchaseOrder: React.FC<PurchaseOrderProps> = (props) => {
);
},
components
:
{
DateRangePicker
:
DatePicker
.
RangePicker
,
DateRangePicker
Unix
,
Submit
}
}
...
...
src/pages/transaction/purchaseOrder/orderCollect/schema/index.ts
View file @
e2d5eae1
...
...
@@ -42,7 +42,7 @@ export const tableListSchema: ISchema = {
},
"[startCreateTime,endCreateTime]"
:
{
type
:
'array'
,
"x-component"
:
'
daterangepicker
'
,
"x-component"
:
'
DateRangePickerUnix
'
,
'x-component-props'
:
{
placeholder
:
[
'开始时间'
,
'结束时间'
],
},
...
...
src/pages/transaction/purchaseOrder/readyAddOrder/index.tsx
View file @
e2d5eae1
...
...
@@ -15,6 +15,7 @@ import { useSelfTable } from './model/useReadyAddOrder'
import
{
useRowSelectionTable
}
from
'@/hooks/useRowSelectionTable'
import
{
PurchaseOrderInsideWorkState
}
from
'@/constants'
import
{
useHttpRequest
}
from
'@/hooks/useHttpRequest'
import
DateRangePickerUnix
from
'@/components/NiceForm/components/DateRangePickerUnix'
// 待新增订单
...
...
@@ -88,7 +89,7 @@ const ReadyAddOrder:React.FC<ReadyAddOrderProps> = (props) => {
);
},
components
:
{
DateRangePicker
:
DatePicker
.
RangePicker
,
DateRangePicker
Unix
,
Submit
}
},
...
...
src/pages/transaction/purchaseOrder/readyAddOrder/schema/index.ts
View file @
e2d5eae1
...
...
@@ -43,7 +43,7 @@ export const tableListSchema: ISchema = {
},
"[startCreateTime,endCreateTime]"
:
{
type
:
'array'
,
"x-component"
:
'
daterangepicker
'
,
"x-component"
:
'
DateRangePickerUnix
'
,
'x-component-props'
:
{
placeholder
:
[
'开始时间'
,
'结束时间'
],
},
...
...
src/pages/transaction/purchaseOrder/readyConfirmContract/index.tsx
View file @
e2d5eae1
...
...
@@ -11,7 +11,7 @@ import { tableListSchema } from './schema'
import
{
useStateFilterSearchLinkageEffect
}
from
'@/formSchema/effects/useFilterSearch'
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
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) => {
);
},
components
:
{
DateRangePicker
:
DatePicker
.
RangePicker
,
DateRangePicker
Unix
,
Submit
}
}
...
...
src/pages/transaction/purchaseOrder/readyConfirmContract/schema/index.ts
View file @
e2d5eae1
...
...
@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = {
},
"[startCreateTime,endCreateTime]"
:
{
type
:
'array'
,
"x-component"
:
'
daterangepicker
'
,
"x-component"
:
'
DateRangePickerUnix
'
,
'x-component-props'
:
{
placeholder
:
[
'开始时间'
,
'结束时间'
],
},
...
...
src/pages/transaction/purchaseOrder/readyFileOrder/index.tsx
View file @
e2d5eae1
...
...
@@ -11,10 +11,10 @@ import { tableListSchema } from './schema'
import
{
useStateFilterSearchLinkageEffect
}
from
'@/formSchema/effects/useFilterSearch'
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
import
Submit
from
'@/components/NiceForm/components/Submit'
import
{
DatePicker
}
from
'@formily/antd-components'
import
{
useRowSelectionTable
}
from
'@/hooks/useRowSelectionTable'
import
{
PurchaseOrderInsideWorkState
,
SaleOrderInsideWorkState
}
from
'@/constants'
import
{
useHttpRequest
}
from
'@/hooks/useHttpRequest'
import
DateRangePickerUnix
from
'@/components/NiceForm/components/DateRangePickerUnix'
// 待归档订单
...
...
@@ -76,7 +76,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
);
},
components
:
{
DateRangePicker
:
DatePicker
.
RangePicker
,
DateRangePicker
Unix
,
Submit
}
},
...
...
src/pages/transaction/purchaseOrder/readyFileOrder/schema/index.ts
View file @
e2d5eae1
...
...
@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = {
},
"[startCreateTime,endCreateTime]"
:
{
type
:
'array'
,
"x-component"
:
'
daterangepicker
'
,
"x-component"
:
'
DateRangePickerUnix
'
,
'x-component-props'
:
{
placeholder
:
[
'开始时间'
,
'结束时间'
],
},
...
...
src/pages/transaction/purchaseOrder/readyPayOrder/index.tsx
View file @
e2d5eae1
...
...
@@ -11,7 +11,7 @@ import { tableListSchema } from './schema'
import
{
useStateFilterSearchLinkageEffect
}
from
'@/formSchema/effects/useFilterSearch'
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
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) => {
);
},
components
:
{
DateRangePicker
:
DatePicker
.
RangePicker
,
DateRangePicker
Unix
,
Submit
}
}
...
...
src/pages/transaction/purchaseOrder/readyPayOrder/schema/index.ts
View file @
e2d5eae1
...
...
@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = {
},
"[startCreateTime,endCreateTime]"
:
{
type
:
'array'
,
"x-component"
:
'
daterangepicker
'
,
"x-component"
:
'
DateRangePickerUnix
'
,
'x-component-props'
:
{
placeholder
:
[
'开始时间'
,
'结束时间'
],
},
...
...
src/pages/transaction/purchaseOrder/readyReceiveOrder/index.tsx
View file @
e2d5eae1
...
...
@@ -11,7 +11,7 @@ import { tableListSchema } from './schema'
import
{
useStateFilterSearchLinkageEffect
}
from
'@/formSchema/effects/useFilterSearch'
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
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) => {
);
},
components
:
{
DateRangePicker
:
DatePicker
.
RangePicker
,
DateRangePicker
Unix
,
Submit
}
}
...
...
src/pages/transaction/purchaseOrder/readyReceiveOrder/schema/index.ts
View file @
e2d5eae1
...
...
@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = {
},
"[startCreateTime,endCreateTime]"
:
{
type
:
'array'
,
"x-component"
:
'
daterangepicker
'
,
"x-component"
:
'
DateRangePickerUnix
'
,
'x-component-props'
:
{
placeholder
:
[
'开始时间'
,
'结束时间'
],
},
...
...
src/pages/transaction/purchaseOrder/readySubmitOrder/index.tsx
View file @
e2d5eae1
...
...
@@ -11,7 +11,7 @@ import { tableListSchema } from './schema'
import
{
useStateFilterSearchLinkageEffect
}
from
'@/formSchema/effects/useFilterSearch'
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
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
{
useHttpRequest
}
from
'@/hooks/useHttpRequest'
...
...
@@ -72,7 +72,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
);
},
components
:
{
DateRangePicker
:
DatePicker
.
RangePicker
,
DateRangePicker
Unix
,
Submit
}
},
...
...
src/pages/transaction/purchaseOrder/readySubmitOrder/schema/index.ts
View file @
e2d5eae1
...
...
@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = {
},
"[startCreateTime,endCreateTime]"
:
{
type
:
'array'
,
"x-component"
:
'
daterangepicker
'
,
"x-component"
:
'
DateRangePickerUnix
'
,
'x-component-props'
:
{
placeholder
:
[
'开始时间'
,
'结束时间'
],
},
...
...
src/pages/transaction/purchaseOrder/secondApprovedOrder/index.tsx
View file @
e2d5eae1
...
...
@@ -11,7 +11,7 @@ import { tableListSchema } from './schema'
import
{
useStateFilterSearchLinkageEffect
}
from
'@/formSchema/effects/useFilterSearch'
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
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
{
useHttpRequest
}
from
'@/hooks/useHttpRequest'
...
...
@@ -69,7 +69,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
);
},
components
:
{
DateRangePicker
:
DatePicker
.
RangePicker
,
DateRangePicker
Unix
,
Submit
}
},
...
...
src/pages/transaction/purchaseOrder/secondApprovedOrder/schema/index.ts
View file @
e2d5eae1
...
...
@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = {
},
"[startCreateTime,endCreateTime]"
:
{
type
:
'array'
,
"x-component"
:
'
daterangepicker
'
,
"x-component"
:
'
DateRangePickerUnix
'
,
'x-component-props'
:
{
placeholder
:
[
'开始时间'
,
'结束时间'
],
},
...
...
src/pages/transaction/saleOrder/addSaleDelevedOrder/index.tsx
View file @
e2d5eae1
...
...
@@ -11,7 +11,7 @@ import { tableListSchema } from './schema'
import
{
useStateFilterSearchLinkageEffect
}
from
'@/formSchema/effects/useFilterSearch'
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
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) => {
);
},
components
:
{
DateRangePicker
:
DatePicker
.
RangePicker
,
DateRangePicker
Unix
,
Submit
}
}
...
...
src/pages/transaction/saleOrder/addSaleDelevedOrder/schema/index.ts
View file @
e2d5eae1
...
...
@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = {
},
"[startCreateTime,endCreateTime]"
:
{
type
:
'array'
,
"x-component"
:
'
daterangepicker
'
,
"x-component"
:
'
DateRangePickerUnix
'
,
'x-component-props'
:
{
placeholder
:
[
'开始时间'
,
'结束时间'
],
},
...
...
src/pages/transaction/saleOrder/firstApprovedOrder/index.tsx
View file @
e2d5eae1
...
...
@@ -11,7 +11,7 @@ import { tableListSchema } from './schema'
import
{
useStateFilterSearchLinkageEffect
}
from
'@/formSchema/effects/useFilterSearch'
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
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
{
PurchaseOrderInsideWorkState
,
SaleOrderInsideWorkState
}
from
'@/constants'
import
{
useHttpRequest
}
from
'@/hooks/useHttpRequest'
...
...
@@ -72,7 +72,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
);
},
components
:
{
DateRangePicker
:
DatePicker
.
RangePicker
,
DateRangePicker
Unix
,
Submit
}
},
...
...
src/pages/transaction/saleOrder/firstApprovedOrder/schema/index.ts
View file @
e2d5eae1
...
...
@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = {
},
"[startCreateTime,endCreateTime]"
:
{
type
:
'array'
,
"x-component"
:
'
daterangepicker
'
,
"x-component"
:
'
DateRangePickerUnix
'
,
'x-component-props'
:
{
placeholder
:
[
'开始时间'
,
'结束时间'
],
},
...
...
src/pages/transaction/saleOrder/index.tsx
View file @
e2d5eae1
...
...
@@ -9,7 +9,7 @@ import { PurchaseOrderInsideWorkState, PurchaseOrderOutWorkState } from '@/const
import
{
tableListSchema
}
from
'../_public/order/constant'
import
{
useStateFilterSearchLinkageEffect
}
from
'@/formSchema/effects/useFilterSearch'
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
moment
from
'moment'
...
...
@@ -81,7 +81,7 @@ const SaleOrder: React.FC<SaleOrderProps> = (props) => {
);
},
components
:
{
DateRangePicker
:
DatePicker
.
RangePicker
,
DateRangePicker
Unix
,
Submit
}
}
...
...
src/pages/transaction/saleOrder/readyAddLogisticsOrder/index.tsx
View file @
e2d5eae1
...
...
@@ -11,7 +11,7 @@ import { tableListSchema } from './schema'
import
{
useStateFilterSearchLinkageEffect
}
from
'@/formSchema/effects/useFilterSearch'
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
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) => {
);
},
components
:
{
DateRangePicker
:
DatePicker
.
RangePicker
,
DateRangePicker
Unix
,
Submit
}
}
...
...
src/pages/transaction/saleOrder/readyAddLogisticsOrder/schema/index.ts
View file @
e2d5eae1
...
...
@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = {
},
"[startCreateTime,endCreateTime]"
:
{
type
:
'array'
,
"x-component"
:
'
daterangepicker
'
,
"x-component"
:
'
DateRangePickerUnix
'
,
'x-component-props'
:
{
placeholder
:
[
'开始时间'
,
'结束时间'
],
},
...
...
src/pages/transaction/saleOrder/readyApprovedOrder/index.tsx
View file @
e2d5eae1
...
...
@@ -7,7 +7,7 @@ import { tableListSchema } from './schema'
import
{
useStateFilterSearchLinkageEffect
}
from
'@/formSchema/effects/useFilterSearch'
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
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
{
useRowSelectionTable
}
from
'@/hooks/useRowSelectionTable'
import
{
useHttpRequest
}
from
'@/hooks/useHttpRequest'
...
...
@@ -64,7 +64,7 @@ const ReadyApprovedOrder:React.FC<ReadyApprovedOrderProps> = (props) => {
);
},
components
:
{
DateRangePicker
:
DatePicker
.
RangePicker
,
DateRangePicker
Unix
,
Submit
}
},
...
...
src/pages/transaction/saleOrder/readyApprovedOrder/schema/index.ts
View file @
e2d5eae1
...
...
@@ -43,7 +43,7 @@ export const tableListSchema: ISchema = {
},
"[startCreateTime,endCreateTime]"
:
{
type
:
'array'
,
"x-component"
:
'
daterangepicker
'
,
"x-component"
:
'
DateRangePickerUnix
'
,
'x-component-props'
:
{
placeholder
:
[
'开始时间'
,
'结束时间'
],
},
...
...
src/pages/transaction/saleOrder/readyConfirmDelevedOrder/index.tsx
View file @
e2d5eae1
...
...
@@ -11,7 +11,7 @@ import { tableListSchema } from './schema'
import
{
useStateFilterSearchLinkageEffect
}
from
'@/formSchema/effects/useFilterSearch'
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
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) => {
);
},
components
:
{
DateRangePicker
:
DatePicker
.
RangePicker
,
DateRangePicker
Unix
,
Submit
}
}
...
...
src/pages/transaction/saleOrder/readyConfirmDelevedOrder/schema/index.ts
View file @
e2d5eae1
...
...
@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = {
},
"[startCreateTime,endCreateTime]"
:
{
type
:
'array'
,
"x-component"
:
'
daterangepicker
'
,
"x-component"
:
'
DateRangePickerUnix
'
,
'x-component-props'
:
{
placeholder
:
[
'开始时间'
,
'结束时间'
],
},
...
...
src/pages/transaction/saleOrder/readyConfirmOrder/index.tsx
View file @
e2d5eae1
...
...
@@ -11,7 +11,7 @@ import { tableListSchema } from './schema'
import
{
useStateFilterSearchLinkageEffect
}
from
'@/formSchema/effects/useFilterSearch'
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
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) => {
);
},
components
:
{
DateRangePicker
:
DatePicker
.
RangePicker
,
DateRangePicker
Unix
,
Submit
}
}
...
...
src/pages/transaction/saleOrder/readyConfirmOrder/schema/index.ts
View file @
e2d5eae1
...
...
@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = {
},
"[startCreateTime,endCreateTime]"
:
{
type
:
'array'
,
"x-component"
:
'
daterangepicker
'
,
"x-component"
:
'
DateRangePickerUnix
'
,
'x-component-props'
:
{
placeholder
:
[
'开始时间'
,
'结束时间'
],
},
...
...
src/pages/transaction/saleOrder/readyConfirmReturnOrder/index.tsx
View file @
e2d5eae1
...
...
@@ -11,7 +11,7 @@ import { tableListSchema } from './schema'
import
{
useStateFilterSearchLinkageEffect
}
from
'@/formSchema/effects/useFilterSearch'
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
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) => {
);
},
components
:
{
DateRangePicker
:
DatePicker
.
RangePicker
,
DateRangePicker
Unix
,
Submit
}
}
...
...
src/pages/transaction/saleOrder/readyConfirmReturnOrder/schema/index.ts
View file @
e2d5eae1
...
...
@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = {
},
"[startCreateTime,endCreateTime]"
:
{
type
:
'array'
,
"x-component"
:
'
daterangepicker
'
,
"x-component"
:
'
DateRangePickerUnix
'
,
'x-component-props'
:
{
placeholder
:
[
'开始时间'
,
'结束时间'
],
},
...
...
src/pages/transaction/saleOrder/readyPayResult/index.tsx
View file @
e2d5eae1
...
...
@@ -11,7 +11,7 @@ import { tableListSchema } from './schema'
import
{
useStateFilterSearchLinkageEffect
}
from
'@/formSchema/effects/useFilterSearch'
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
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) => {
);
},
components
:
{
DateRangePicker
:
DatePicker
.
RangePicker
,
DateRangePicker
Unix
,
Submit
}
}
...
...
src/pages/transaction/saleOrder/readyPayResult/schema/index.ts
View file @
e2d5eae1
...
...
@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = {
},
"[startCreateTime,endCreateTime]"
:
{
type
:
'array'
,
"x-component"
:
'
daterangepicker
'
,
"x-component"
:
'
DateRangePickerUnix
'
,
'x-component-props'
:
{
placeholder
:
[
'开始时间'
,
'结束时间'
],
},
...
...
src/pages/transaction/saleOrder/readyReturnDocument/index.tsx
View file @
e2d5eae1
...
...
@@ -11,7 +11,7 @@ import { tableListSchema } from './schema'
import
{
useStateFilterSearchLinkageEffect
}
from
'@/formSchema/effects/useFilterSearch'
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
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
{
PurchaseOrderInsideWorkState
,
SaleOrderInsideWorkState
}
from
'@/constants'
import
{
useHttpRequest
}
from
'@/hooks/useHttpRequest'
...
...
@@ -76,7 +76,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
);
},
components
:
{
DateRangePicker
:
DatePicker
.
RangePicker
,
DateRangePicker
Unix
,
Submit
}
},
...
...
src/pages/transaction/saleOrder/readyReturnDocument/schema/index.ts
View file @
e2d5eae1
...
...
@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = {
},
"[startCreateTime,endCreateTime]"
:
{
type
:
'array'
,
"x-component"
:
'
daterangepicker
'
,
"x-component"
:
'
DateRangePickerUnix
'
,
'x-component-props'
:
{
placeholder
:
[
'开始时间'
,
'结束时间'
],
},
...
...
src/pages/transaction/saleOrder/secondApprovedOrder/index.tsx
View file @
e2d5eae1
...
...
@@ -11,9 +11,9 @@ import { tableListSchema } from './schema'
import
{
useStateFilterSearchLinkageEffect
}
from
'@/formSchema/effects/useFilterSearch'
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
import
Submit
from
'@/components/NiceForm/components/Submit'
import
{
DatePicker
}
from
'@formily/antd-components'
import
{
useRowSelectionTable
}
from
'@/hooks/useRowSelectionTable'
import
{
useHttpRequest
}
from
'@/hooks/useHttpRequest'
import
DateRangePickerUnix
from
'@/components/NiceForm/components/DateRangePickerUnix'
// 二级待审核订单
...
...
@@ -68,7 +68,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
);
},
components
:
{
DateRangePicker
:
DatePicker
.
RangePicker
,
DateRangePicker
Unix
,
Submit
}
},
...
...
src/pages/transaction/saleOrder/secondApprovedOrder/schema/index.ts
View file @
e2d5eae1
...
...
@@ -39,7 +39,7 @@ export const tableListSchema: ISchema = {
},
"[startCreateTime,endCreateTime]"
:
{
type
:
'array'
,
"x-component"
:
'
daterangepicker
'
,
"x-component"
:
'
DateRangePickerUnix
'
,
'x-component-props'
:
{
placeholder
:
[
'开始时间'
,
'结束时间'
],
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment