Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
Litemall
Commits
455d1b12
Commit
455d1b12
authored
May 07, 2020
by
Junling Bu
Browse files
fix: 日期格式
parent
1e72ae82
Changes
2
Hide whitespace changes
Inline
Side-by-side
litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminOrderController.java
View file @
455d1b12
...
...
@@ -46,8 +46,8 @@ public class AdminOrderController {
@RequiresPermissionsDesc
(
menu
=
{
"商场管理"
,
"订单管理"
},
button
=
"查询"
)
@GetMapping
(
"/list"
)
public
Object
list
(
Integer
userId
,
String
orderSn
,
@RequestParam
(
required
=
false
)
@DateTimeFormat
(
iso
=
DateTimeFormat
.
ISO
.
DATE_TIME
)
LocalDateTime
start
,
@RequestParam
(
required
=
false
)
@DateTimeFormat
(
iso
=
DateTimeFormat
.
ISO
.
DATE_TIME
)
LocalDateTime
end
,
@RequestParam
(
required
=
false
)
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
LocalDateTime
start
,
@RequestParam
(
required
=
false
)
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
LocalDateTime
end
,
@RequestParam
(
required
=
false
)
List
<
Short
>
orderStatusArray
,
@RequestParam
(
defaultValue
=
"1"
)
Integer
page
,
@RequestParam
(
defaultValue
=
"10"
)
Integer
limit
,
...
...
litemall-admin/src/views/mall/order.vue
View file @
455d1b12
...
...
@@ -5,7 +5,7 @@
<div
class=
"filter-container"
>
<el-input
v-model=
"listQuery.userId"
clearable
class=
"filter-item"
style=
"width: 160px;"
placeholder=
"请输入用户ID"
/>
<el-input
v-model=
"listQuery.orderSn"
clearable
class=
"filter-item"
style=
"width: 160px;"
placeholder=
"请输入订单编号"
/>
<el-date-picker
v-model=
"listQuery.timeArray"
type=
"datetimerange"
class=
"filter-item"
range-separator=
"至"
start-placeholder=
"开始日期"
end-placeholder=
"结束日期"
:picker-options=
"pickerOptions"
/>
<el-date-picker
v-model=
"listQuery.timeArray"
type=
"datetimerange"
value-format=
"yyyy-MM-dd HH:mm:ss"
class=
"filter-item"
range-separator=
"至"
start-placeholder=
"开始日期"
end-placeholder=
"结束日期"
:picker-options=
"pickerOptions"
/>
<el-select
v-model=
"listQuery.orderStatusArray"
multiple
style=
"width: 200px"
class=
"filter-item"
placeholder=
"请选择订单状态"
>
<el-option
v-for=
"(key, value) in statusMap"
:key=
"key"
:label=
"key"
:value=
"value"
/>
</el-select>
...
...
Write
Preview
Supports
Markdown
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