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
a19be5bd
Commit
a19be5bd
authored
Dec 24, 2018
by
chenfenglei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
云集绑定状态
parent
b226ba74
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
95 additions
and
35 deletions
+95
-35
newDialog.vue
src/components/order/newDialog.vue
+89
-23
index.vue
src/components/yunji/index.vue
+6
-12
No files found.
src/components/order/newDialog.vue
View file @
a19be5bd
<
template
>
<
template
>
<el-dialog
<el-dialog
title=
"新增订单"
title=
"新增订单"
center
center
append-to-body
append-to-body
:visible
.
sync=
"newdialogObj.show"
:visible
.
sync=
"newdialogObj.show"
width=
"900px"
>
width=
"900px"
>
<el-form
ref=
"form"
:model=
"form"
label-width=
"120px"
>
<el-form
ref=
"form"
:model=
"form"
label-width=
"120px"
:rules=
"rules"
>
<el-row>
<el-row>
<el-col
:span=
"12"
>
<el-col
:span=
"12"
>
<el-form-item
label=
"期数名称"
required
>
<el-form-item
label=
"期数名称"
prop=
"periods_id"
>
<el-select
v-model=
"form.periods_id"
placeholder=
"请选择"
>
<el-select
v-model=
"form.periods_id"
placeholder=
"请选择"
>
<el-option
<el-option
v-for=
"item in
teacher2Options
"
v-for=
"item in
goodList
"
:key=
"item.id"
:key=
"item.id"
:label=
"item.name"
:label=
"item.name"
:value=
"item.id"
>
:value=
"item.id"
>
...
@@ -20,13 +20,13 @@
...
@@ -20,13 +20,13 @@
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"12"
>
<el-col
:span=
"12"
>
<el-form-item
label=
"商品名称"
required
>
<el-form-item
label=
"商品名称"
prop=
"goods_id"
>
<el-select
v-model=
"form.goods_id"
placeholder=
"请选择"
>
<el-select
v-model=
"form.goods_id"
placeholder=
"请选择"
>
<el-option
<el-option
v-for=
"
item in teacher2Options
"
v-for=
"
(data,index) in goodList
"
:key=
"i
tem.id
"
:key=
"i
ndex
"
:label=
"
item.value
"
:label=
"
data | filterGoods
"
:value=
"
item
.id"
>
:value=
"
data
.id"
>
</el-option>
</el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
...
@@ -34,19 +34,19 @@
...
@@ -34,19 +34,19 @@
</el-row>
</el-row>
<el-row>
<el-row>
<el-col
:span=
"12"
>
<el-col
:span=
"12"
>
<el-form-item
label=
"用户ID"
prop=
"user_id"
required
>
<el-form-item
label=
"用户ID"
prop=
"user_id"
>
<el-input
v-model=
"form.user_id"
></el-input>
<el-input
v-model=
"form.user_id"
></el-input>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
</el-row>
</el-row>
<el-row>
<el-row>
<el-col
:span=
"12"
>
<el-col
:span=
"12"
>
<el-form-item
label=
"实付金额(元)"
prop=
"money"
required
>
<el-form-item
label=
"实付金额(元)"
prop=
"money"
>
<el-input
v-model=
"form.money"
></el-input>
<el-input
v-model=
"form.money"
></el-input>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"12"
>
<el-col
:span=
"12"
>
<el-form-item
label=
"购买方式"
required
>
<el-form-item
label=
"购买方式"
prop=
"buy_type"
>
<el-select
v-model=
"form.buy_type"
placeholder=
"请选择"
>
<el-select
v-model=
"form.buy_type"
placeholder=
"请选择"
>
<el-option
<el-option
v-for=
"item in buyTypeOptions"
v-for=
"item in buyTypeOptions"
...
@@ -60,7 +60,7 @@
...
@@ -60,7 +60,7 @@
</el-row>
</el-row>
<el-row>
<el-row>
<el-col
:span=
"12"
>
<el-col
:span=
"12"
>
<el-form-item
label=
"推广人ID"
prop=
"invite_id"
>
<el-form-item
label=
"推广人ID"
>
<el-input
v-model=
"form.invite_id"
></el-input>
<el-input
v-model=
"form.invite_id"
></el-input>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
...
@@ -74,7 +74,7 @@
...
@@ -74,7 +74,7 @@
</el-row>
</el-row>
<vue-address
:province=
"form.province_name"
:city=
"form.city"
:district=
"form.area"
:detail=
"form.address"
:mobile=
"form.receive_mobile"
:name=
"form.receive_name"
@
change=
"handlerAddressChange"
>
<vue-address
:province=
"form.province_name"
:city=
"form.city"
:district=
"form.area"
:detail=
"form.address"
:mobile=
"form.receive_mobile"
:name=
"form.receive_name"
@
change=
"handlerAddressChange"
>
</vue-address>
</vue-address>
<el-form-item
label=
"支付类型"
required
>
<el-form-item
label=
"支付类型"
prop=
"order_type"
>
<el-select
v-model=
"form.order_type"
placeholder=
"请选择"
>
<el-select
v-model=
"form.order_type"
placeholder=
"请选择"
>
<el-option
<el-option
v-for=
"item in buyWayOptioms"
v-for=
"item in buyWayOptioms"
...
@@ -84,7 +84,7 @@
...
@@ -84,7 +84,7 @@
</el-option>
</el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"支付时间"
prop=
"pay_at"
required
>
<el-form-item
label=
"支付时间"
prop=
"pay_at"
>
<el-date-picker
<el-date-picker
v-model=
"form.pay_at"
v-model=
"form.pay_at"
type=
"datetime"
type=
"datetime"
...
@@ -102,9 +102,10 @@
...
@@ -102,9 +102,10 @@
</
template
>
</
template
>
<
script
>
<
script
>
import
{
getGoodsListApi
,
setOrderApi
}
from
"../../service/api"
import
vueAddress
from
'../framework/address-picker/Address'
import
vueAddress
from
'../framework/address-picker/Address'
import
AddressArray
from
'../framework/address-picker/addr'
import
AddressArray
from
'../framework/address-picker/addr'
import
{
ORDERSTATUS
,
BUYTYPEOPTION
,
BUYWay
}
from
"../../util/wordbook"
import
{
ORDERSTATUS
,
BUYTYPEOPTION
,
BUYWay
,
GOODSTYPE
}
from
"../../util/wordbook"
import
CommonJs
from
'../../util/common'
;
import
CommonJs
from
'../../util/common'
;
export
default
{
export
default
{
name
:
"newdialogObj"
,
name
:
"newdialogObj"
,
...
@@ -113,7 +114,29 @@
...
@@ -113,7 +114,29 @@
],
],
data
(){
data
(){
return
{
return
{
rules
:[],
rules
:{
periods_id
:
[
{
required
:
true
,
message
:
'请输入期数名称'
,
trigger
:
'change'
}
],
goods_id
:
[
{
required
:
true
,
message
:
'请输入商品名称'
,
trigger
:
'change'
}
],
money
:
[
{
required
:
true
,
message
:
'请输入金额'
,
trigger
:
'blur'
}
],
user_id
:
[
{
required
:
true
,
message
:
'请输入用户ID'
,
trigger
:
'blur'
}
],
pay_at
:
[
{
required
:
true
,
message
:
'请选择日期'
,
trigger
:
'change'
}
],
buy_type
:[
{
required
:
true
,
message
:
'请选择购买方式'
,
trigger
:
'change'
}
],
order_type
:[
{
required
:
true
,
message
:
'请选择支付类型'
,
trigger
:
'change'
}
]
},
form
:{
form
:{
periods_id
:
""
,
periods_id
:
""
,
goods_id
:
""
,
goods_id
:
""
,
...
@@ -137,21 +160,26 @@
...
@@ -137,21 +160,26 @@
pay_at
:
""
,
pay_at
:
""
,
},
},
teacher2Options
:[],
goodList
:[],
buyTypeOptions
:
BUYTYPEOPTION
,
buyTypeOptions
:
BUYTYPEOPTION
,
pickerOptions1
:
{}
,
pickerOptions1
:
''
,
buyWayOptioms
:
BUYWay
,
buyWayOptioms
:
BUYWay
,
}
}
},
},
components
:{
components
:{
vueAddress
vueAddress
},
filters
:{
filterGoods
(
val
){
return
'['
+
GOODSTYPE
[
val
.
goods_type
]
+
']'
+
'['
+
val
.
current_price
/
100
+
'元]'
+
val
.
name
}
},
},
methods
:{
methods
:{
saveAddOrder
(
data
){
saveAddOrder
(
data
){
this
.
$refs
[
'form'
].
validate
((
valid
)
=>
{
if
(
valid
)
{
let
json
=
{
let
json
=
{
periods_id
:
data
.
periods_id
,
periods_id
:
data
.
periods_id
,
goods_id
:
data
.
goods_id
,
goods_id
:
data
.
goods_id
,
user_id
:
data
.
user_id
,
user_id
:
data
.
user_id
,
...
@@ -169,6 +197,8 @@
...
@@ -169,6 +197,8 @@
receive_name
:
data
.
receive_name
,
receive_name
:
data
.
receive_name
,
order_type
:
data
.
order_type
,
order_type
:
data
.
order_type
,
}
}
// 元转分
json
.
money
=
json
.
money
*
100.0
;
if
(
data
.
pay_at
){
if
(
data
.
pay_at
){
json
.
pay_at
=
CommonJs
.
dateFmt
(
data
.
pay_at
,
"yyyy-MM-dd hh:mm:ss"
);
json
.
pay_at
=
CommonJs
.
dateFmt
(
data
.
pay_at
,
"yyyy-MM-dd hh:mm:ss"
);
}
}
...
@@ -180,6 +210,27 @@
...
@@ -180,6 +210,27 @@
}
}
console
.
log
(
json
)
console
.
log
(
json
)
// this.newdialogObj.show=false
// this.newdialogObj.show=false
if
(
json
.
province_name
&&
json
.
address
&&
json
.
receive_mobile
&&
json
.
receive_name
){
this
.
$message
({
message
:
'添加成功'
,
type
:
'success'
});
}
else
{
this
.
$message
({
message
:
"缺少必填项"
,
type
:
"warning"
});
}
}
else
{
console
.
log
(
'error submit!!'
);
return
false
;
}
});
},
},
handlerAddressChange
(
val
){
handlerAddressChange
(
val
){
if
(
!
val
.
province
||
!
val
.
city
||
!
val
.
district
){
if
(
!
val
.
province
||
!
val
.
city
||
!
val
.
district
){
...
@@ -203,9 +254,24 @@
...
@@ -203,9 +254,24 @@
this
.
form
.
city_name
=
cityObj
[
0
].
label
;
this
.
form
.
city_name
=
cityObj
[
0
].
label
;
this
.
form
.
district_name
=
districtObj
.
length
>
0
?
districtObj
[
0
].
label
:
cityObj
[
0
].
children
[
0
].
label
;
this
.
form
.
district_name
=
districtObj
.
length
>
0
?
districtObj
[
0
].
label
:
cityObj
[
0
].
children
[
0
].
label
;
this
.
form
.
district
=
districtObj
.
length
>
0
?
districtObj
[
0
].
value
:
cityObj
[
0
].
children
[
0
].
value
;
this
.
form
.
district
=
districtObj
.
length
>
0
?
districtObj
[
0
].
value
:
cityObj
[
0
].
children
[
0
].
value
;
}
},
getGoodsOption
(){
let
json
=
{
page
:
1
,
limit
:
200
};
getGoodsListApi
(
json
).
then
(
res
=>
{
console
.
log
(
res
)
this
.
goodList
=
res
.
list
;
})
},
},
},
mounted
(){
mounted
(){
},
watch
:{
'newdialogObj'
(
value
){
this
.
getGoodsOption
()
}
}
}
}
}
</
script
>
</
script
>
...
...
src/components/yunji/index.vue
View file @
a19be5bd
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"4"
>
<el-col
:span=
"4"
>
<el-form-item
label=
"
购买
状态"
>
<el-form-item
label=
"
绑定
状态"
>
<el-select
v-model=
"searchFrom.user_buy"
placeholder=
"请选择"
@
change=
"getList"
clearable
>
<el-select
v-model=
"searchFrom.user_buy"
placeholder=
"请选择"
@
change=
"getList"
clearable
>
<el-option
<el-option
v-for=
"item in useTypeList"
v-for=
"item in useTypeList"
...
@@ -95,12 +95,6 @@
...
@@ -95,12 +95,6 @@
<el-table-column
<el-table-column
prop=
"goods_name"
prop=
"goods_name"
label=
"商品名称"
>
label=
"商品名称"
>
</el-table-column>
<el-table-column
label=
"购买状态"
>
<
template
slot-scope=
"scope"
>
{{
scope
.
row
.
user_id
|
filterStatus
}}
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
<el-table-column
prop=
"receiver_name"
prop=
"receiver_name"
...
@@ -129,7 +123,7 @@
...
@@ -129,7 +123,7 @@
label=
"备注"
>
label=
"备注"
>
</el-table-column>
</el-table-column>
<el-table-column
<el-table-column
label=
"操作"
>
label=
"操作"
v-if=
"!$store.state.readonly"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<el-button
@
click=
"bindTeacher(scope.row)"
size=
"mini"
plain
type=
"success"
>
绑定老师
</el-button>
<el-button
@
click=
"bindTeacher(scope.row)"
size=
"mini"
plain
type=
"success"
>
绑定老师
</el-button>
</
template
>
</
template
>
...
@@ -159,11 +153,11 @@
...
@@ -159,11 +153,11 @@
useTypeList
:[
useTypeList
:[
{
{
user_buy
:
0
,
user_buy
:
0
,
value
:
'未
购买
'
value
:
'未
绑定
'
},
},
{
{
user_buy
:
1
,
user_buy
:
1
,
value
:
'已
购买
'
value
:
'已
绑定
'
},
},
],
],
searchFrom
:
{
searchFrom
:
{
...
@@ -187,9 +181,9 @@
...
@@ -187,9 +181,9 @@
filterStatus
:
function
(
value
)
{
filterStatus
:
function
(
value
)
{
let
msg
=
''
;
let
msg
=
''
;
if
(
value
===
0
){
if
(
value
===
0
){
msg
=
'未
购买
'
msg
=
'未
绑定
'
}
else
{
}
else
{
msg
=
"已
购课
"
msg
=
"已
绑定
"
}
}
return
msg
;
return
msg
;
},
},
...
...
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