Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
A
admin-base
Project
Project
Details
Activity
Releases
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
new-sing
admin-base
Commits
95bd973f
Commit
95bd973f
authored
Dec 29, 2018
by
chenfenglei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
t其他类型不能退款
parent
521c5693
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
30 additions
and
2 deletions
+30
-2
index.vue
src/components/monthOrder/index.vue
+30
-2
No files found.
src/components/monthOrder/index.vue
View file @
95bd973f
...
@@ -41,6 +41,16 @@
...
@@ -41,6 +41,16 @@
:value=
"item.id"
>
:value=
"item.id"
>
</el-option>
</el-option>
</el-select>
</el-select>
</el-form-item>
<el-form-item
label=
"支付类型"
>
<el-select
v-model=
"searchFrom.order_type"
placeholder=
"请选择"
@
change=
"getOrderList"
clearable
>
<el-option
v-for=
"item in buyWay"
:key=
"item.id"
:label=
"item.value"
:value=
"item.id"
>
</el-option>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"订单状态"
>
<el-form-item
label=
"订单状态"
>
<el-select
multiple
v-model=
"searchFrom.status"
placeholder=
"请选择"
@
change=
"getOrderList"
clearable
>
<el-select
multiple
v-model=
"searchFrom.status"
placeholder=
"请选择"
@
change=
"getOrderList"
clearable
>
...
@@ -155,6 +165,13 @@
...
@@ -155,6 +165,13 @@
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
{{
scope
.
row
.
money
|
moneytFilter
}}
{{
scope
.
row
.
money
|
moneytFilter
}}
</
template
>
</
template
>
</el-table-column>
<el-table-column
label=
"支付类型"
width=
"80"
>
<
template
slot-scope=
"scope"
>
{{
scope
.
row
.
order_type
|
buyTypeWay
}}
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
<el-table-column
label=
"收货地址"
>
label=
"收货地址"
>
...
@@ -280,7 +297,7 @@
...
@@ -280,7 +297,7 @@
import
detailDialog
from
'./detail'
import
detailDialog
from
'./detail'
import
refundDetail
from
'./refundDetail'
import
refundDetail
from
'./refundDetail'
import
AddressArray
from
'../framework/address-picker/addr'
import
AddressArray
from
'../framework/address-picker/addr'
import
{
INVITETYPE
,
ORDERSTATUS
,
BUYTYPE
,
BUYTYPEOPTION
,
ORDERSTATUSOPTION
,
INVITETYPEOPTION
,
GOODSTYPE
}
from
"../../util/wordbook"
;
import
{
INVITETYPE
,
ORDERSTATUS
,
BUYTYPE
,
BUYTYPEOPTION
,
ORDERSTATUSOPTION
,
INVITETYPEOPTION
,
GOODSTYPE
,
BUYWay
,
BUYTYPEWAY
}
from
"../../util/wordbook"
;
import
CommonJs
from
'../../util/common'
;
import
CommonJs
from
'../../util/common'
;
export
default
{
export
default
{
...
@@ -308,6 +325,7 @@
...
@@ -308,6 +325,7 @@
invite_type
:
''
,
invite_type
:
''
,
invite_id
:
''
,
invite_id
:
''
,
buy_type
:
''
,
buy_type
:
''
,
order_type
:
''
,
status
:
[
1
,
4
,
5
],
status
:
[
1
,
4
,
5
],
goods_id
:
''
,
goods_id
:
''
,
out_trade_no
:
''
,
out_trade_no
:
''
,
...
@@ -334,6 +352,7 @@
...
@@ -334,6 +352,7 @@
inviteTypeOption
:
INVITETYPEOPTION
,
inviteTypeOption
:
INVITETYPEOPTION
,
orderStatusOption
:
ORDERSTATUSOPTION
,
orderStatusOption
:
ORDERSTATUSOPTION
,
buyTypeOption
:
BUYTYPEOPTION
,
buyTypeOption
:
BUYTYPEOPTION
,
buyWay
:
BUYWay
,
inviteSearchPlaceholder
:
''
,
inviteSearchPlaceholder
:
''
,
rules
:{
rules
:{
value
:[
value
:[
...
@@ -390,6 +409,9 @@
...
@@ -390,6 +409,9 @@
}
}
if
(
this
.
searchFrom
.
buy_type
)
{
if
(
this
.
searchFrom
.
buy_type
)
{
json
.
buy_type
=
this
.
searchFrom
.
buy_type
json
.
buy_type
=
this
.
searchFrom
.
buy_type
}
if
(
this
.
searchFrom
.
order_type
)
{
json
.
order_type
=
this
.
searchFrom
.
order_type
}
}
if
(
this
.
searchFrom
.
status
)
{
if
(
this
.
searchFrom
.
status
)
{
json
.
status
=
this
.
searchFrom
.
status
.
toString
()
json
.
status
=
this
.
searchFrom
.
status
.
toString
()
...
@@ -490,6 +512,9 @@
...
@@ -490,6 +512,9 @@
}
}
if
(
this
.
searchFrom
.
buy_type
)
{
if
(
this
.
searchFrom
.
buy_type
)
{
json
.
buy_type
=
this
.
searchFrom
.
buy_type
json
.
buy_type
=
this
.
searchFrom
.
buy_type
}
if
(
this
.
searchFrom
.
order_type
)
{
json
.
order_type
=
this
.
searchFrom
.
order_type
}
}
if
(
this
.
searchFrom
.
status
)
{
if
(
this
.
searchFrom
.
status
)
{
json
.
status
=
this
.
searchFrom
.
status
.
toString
()
json
.
status
=
this
.
searchFrom
.
status
.
toString
()
...
@@ -677,7 +702,10 @@
...
@@ -677,7 +702,10 @@
},
},
filterGoods
(
val
){
filterGoods
(
val
){
return
'['
+
GOODSTYPE
[
val
.
goods_type
]
+
']'
+
'['
+
val
.
current_price
/
100
+
'元]'
+
val
.
name
return
'['
+
GOODSTYPE
[
val
.
goods_type
]
+
']'
+
'['
+
val
.
current_price
/
100
+
'元]'
+
val
.
name
}
},
buyTypeWay
(
value
){
return
BUYTYPEWAY
[
value
]
},
}
}
}
}
</
script
>
</
script
>
...
...
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