Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
merchant-manage-ui
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
ui
merchant-manage-ui
Commits
f85f6cc5
Commit
f85f6cc5
authored
Jul 08, 2021
by
FE-安焕焕
👣
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加时间限制
parent
02092fca
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
38 additions
and
3 deletions
+38
-3
index.jsx
src/pages/orderManage/pendingDeliveryOrder/index.jsx
+38
-3
No files found.
src/pages/orderManage/pendingDeliveryOrder/index.jsx
View file @
f85f6cc5
...
@@ -18,6 +18,7 @@ import {
...
@@ -18,6 +18,7 @@ import {
}
from
'
./service
'
;
}
from
'
./service
'
;
const
TableList
=
props
=>
{
const
TableList
=
props
=>
{
const
dateFormat
=
'
YYYY-MM-DD
'
;
const
[
companys
,
setCompanys
]
=
useState
([]);
const
[
companys
,
setCompanys
]
=
useState
([]);
const
[
LogisticsModalVisible
,
handleModalVisible
]
=
useState
(
false
);
const
[
LogisticsModalVisible
,
handleModalVisible
]
=
useState
(
false
);
const
[
skuList
,
setSkuList
]
=
useState
([]);
const
[
skuList
,
setSkuList
]
=
useState
([]);
...
@@ -25,6 +26,20 @@ const TableList = props => {
...
@@ -25,6 +26,20 @@ const TableList = props => {
const
[
ShowUpdateBtn
]
=
useState
([
2
,
5
]);
const
[
ShowUpdateBtn
]
=
useState
([
2
,
5
]);
const
[
LogisticsComList
,
setLogisticsComList
]
=
useState
({});
const
[
LogisticsComList
,
setLogisticsComList
]
=
useState
({});
const
[
LogisticsComModalVisible
,
handleComModalVisible
]
=
useState
(
false
);
const
[
LogisticsComModalVisible
,
handleComModalVisible
]
=
useState
(
false
);
const
[
startTime
,
setStartTime
]
=
useState
(
moment
().
add
(
-
1
,
'
months
'
));
const
[
startTimeStr
,
setStartTimeStr
]
=
useState
(
moment
()
.
add
(
-
1
,
'
months
'
)
.
format
(
dateFormat
),
);
const
[
endTime
,
setEndTime
]
=
useState
(
moment
());
const
[
endTimeStr
,
setEndTimeStr
]
=
useState
(
moment
().
format
(
dateFormat
));
const
startDisabledDate
=
current
=>
current
&&
(
endTime
.
diff
(
current
,
'
days
'
)
>
30
||
endTime
.
diff
(
current
,
'
days
'
)
<
0
);
const
endDisabledDate
=
current
=>
current
&&
(
current
.
diff
(
startTime
,
'
days
'
)
>
30
||
current
.
diff
(
startTime
,
'
days
'
)
<
0
);
const
actionRef
=
useRef
();
const
actionRef
=
useRef
();
const
ref
=
useRef
(
FormInstance
);
const
ref
=
useRef
(
FormInstance
);
...
@@ -198,6 +213,15 @@ const TableList = props => {
...
@@ -198,6 +213,15 @@ const TableList = props => {
key
:
'
startTime
'
,
key
:
'
startTime
'
,
valueType
:
'
date
'
,
valueType
:
'
date
'
,
hideInTable
:
true
,
hideInTable
:
true
,
formItemProps
:
{
value
:
startTime
,
onChange
(
time
,
timeString
)
{
setStartTime
(
time
);
setStartTimeStr
(
timeString
);
},
disabledDate
:
startDisabledDate
,
allowClear
:
false
,
},
},
},
{
{
title
:
'
订单结束时间
'
,
title
:
'
订单结束时间
'
,
...
@@ -205,6 +229,15 @@ const TableList = props => {
...
@@ -205,6 +229,15 @@ const TableList = props => {
key
:
'
endTime
'
,
key
:
'
endTime
'
,
valueType
:
'
date
'
,
valueType
:
'
date
'
,
hideInTable
:
true
,
hideInTable
:
true
,
formItemProps
:
{
value
:
endTime
,
onChange
(
time
,
timeString
)
{
setEndTime
(
time
);
setEndTimeStr
(
timeString
);
},
disabledDate
:
endDisabledDate
,
allowClear
:
false
,
},
},
},
{
{
title
:
'
操作
'
,
title
:
'
操作
'
,
...
@@ -298,8 +331,8 @@ const TableList = props => {
...
@@ -298,8 +331,8 @@ const TableList = props => {
onClick=
{
()
=>
{
onClick=
{
()
=>
{
if
(
ref
.
current
)
{
if
(
ref
.
current
)
{
const
obj
=
{
...
ref
.
current
.
getFieldsValue
(),
logisticsStatus
:
props
.
type
||
1
};
const
obj
=
{
...
ref
.
current
.
getFieldsValue
(),
logisticsStatus
:
props
.
type
||
1
};
obj
.
startTime
=
obj
.
startTime
&&
moment
(
obj
.
startTime
).
format
(
'
YYYY-MM-DD
'
)
;
obj
.
startTime
=
startTimeStr
;
obj
.
endTime
=
obj
.
endTime
&&
moment
(
obj
.
endTime
).
format
(
'
YYYY-MM-DD
'
)
;
obj
.
endTime
=
endTimeStr
;
downOrder
(
obj
);
downOrder
(
obj
);
}
}
}
}
}
}
...
@@ -312,7 +345,9 @@ const TableList = props => {
...
@@ -312,7 +345,9 @@ const TableList = props => {
<
ProTable
<
ProTable
className=
{
style
.
protable
}
className=
{
style
.
protable
}
actionRef=
{
actionRef
}
actionRef=
{
actionRef
}
request=
{
params
=>
queryToSendFn
({
...
params
})
}
request=
{
params
=>
queryToSendFn
({
...
params
,
startTime
:
startTimeStr
,
endTime
:
endTimeStr
})
}
columns=
{
columns
}
columns=
{
columns
}
rowKey=
{
r
=>
r
.
orderNo
}
rowKey=
{
r
=>
r
.
orderNo
}
formRef=
{
ref
}
formRef=
{
ref
}
...
...
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