Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform-ui
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
youjj
cloud-platform-ui
Commits
03dbdfb2
Commit
03dbdfb2
authored
Sep 12, 2019
by
hanfeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
app用户列表
parent
ac1c22cb
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
961 additions
and
80 deletions
+961
-80
memberOrderDetailModal.vue
src/views/userManagement/model/memberOrderDetailModal.vue
+222
-0
rentOrderDetailModal.vue
src/views/userManagement/model/rentOrderDetailModal.vue
+272
-0
tourOrderDetailModal.vue
src/views/userManagement/model/tourOrderDetailModal.vue
+276
-0
index.vue
src/views/userManagement/userList/index.vue
+191
-80
No files found.
src/views/userManagement/model/memberOrderDetailModal.vue
0 → 100644
View file @
03dbdfb2
<
template
>
<el-dialog
title=
"会员订单详情"
:visible
.
sync=
"dialogVisible"
class=
"order-details"
>
<el-form
:model=
"form"
ref=
"form"
label-width=
"90px"
>
<el-row>
<el-col
:span=
"8"
>
<el-form-item
label=
"订单号:"
>
<span>
{{
form
.
no
}}
</span>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"支付时间:"
>
<span>
{{
form
.
crtTime
}}
</span>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"订单状态:"
>
<span>
{{
form
.
status
}}
</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col
:span=
"8"
>
<el-form-item
label=
"姓名:"
>
<span>
{{
form
.
username
}}
</span>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"手机号:"
>
<span>
{{
form
.
telephone
}}
</span>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"名称:"
>
<span>
{{
form
.
name
}}
</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col
:span=
"8"
>
<el-form-item
label=
"商品价格:"
>
<span>
{{
form
.
goodsAmount
}}
</span>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"订单价格:"
>
<span>
{{
form
.
orderAmount
}}
</span>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"实际价格:"
>
<span>
{{
form
.
realAmount
}}
</span>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div
class=
"modal_modal"
v-show=
"resetCarVisible"
></div>
</el-dialog>
</
template
>
<
script
>
import
ElRow
from
"element-ui/packages/row/src/row"
;
import
ElInput
from
"../../../../node_modules/element-ui/packages/input/src/input.vue"
;
import
ElCol
from
"element-ui/packages/col/src/col"
;
import
ElFormItem
from
"../../../../node_modules/element-ui/packages/form/src/form-item.vue"
;
export
default
{
props
:
[
"memberRow"
],
name
:
'memberOrderDetailModal'
,
components
:
{
ElFormItem
,
ElCol
,
ElInput
,
ElRow
},
data
()
{
return
{
updateNumberPlat
:
false
,
//是否重新配车
dialogVisible
:
false
,
resetCarVisible
:
false
,
resetCarForm
:
{
no
:
''
,
numberPlate
:
''
,
//重新配车车牌号
},
form
:
{
couponAmount
:
undefined
,
crtHost
:
undefined
,
crtName
:
undefined
,
crtTime
:
undefined
,
crtUser
:
undefined
,
detailId
:
undefined
,
endCompanyName
:
undefined
,
goodsAmount
:
undefined
,
hasDiscount
:
undefined
,
hasMemberRight
:
undefined
,
hasPay
:
undefined
,
id
:
undefined
,
name
:
undefined
,
no
:
undefined
,
orderAmount
:
undefined
,
orderOrigin
:
undefined
,
orderTourDetail
:
{
adultNum
:
undefined
,
childNum
:
undefined
,
contactEmail
:
undefined
,
contactMan
:
undefined
,
contactPhone
:
undefined
,
costDetail
:
undefined
,
crtTime
:
undefined
,
dayNum
:
undefined
,
endAddr
:
undefined
,
endTime
:
undefined
,
goodId
:
undefined
,
hasInsure
:
undefined
,
id
:
undefined
,
isOutside
:
undefined
,
orderId
:
undefined
,
siteId
:
undefined
,
spePriceId
:
undefined
,
startAddr
:
undefined
,
startCity
:
undefined
,
startCityName
:
undefined
,
startCompanyId
:
undefined
,
startTime
:
undefined
,
totalNumber
:
undefined
,
tourUserIds
:
undefined
,
updTime
:
undefined
,
verificationId
:
undefined
},
payOrigin
:
undefined
,
picture
:
undefined
,
realAmount
:
undefined
,
refundStatus
:
undefined
,
startCompanyName
:
undefined
,
status
:
undefined
,
ststusName
:
undefined
,
telephone
:
undefined
,
type
:
undefined
,
updTime
:
undefined
,
userId
:
undefined
,
username
:
undefined
,
vehicleNumberPlat
:
undefined
,
version
:
undefined
,
},
rules
:
{
numberPlate
:
[
{
type
:
'string'
,
required
:
true
,
message
:
'请输入车牌号'
,
trigger
:
'blur'
}
]
},
}
},
watch
:
{
dialogVisible
(
newValue
,
oldValue
)
{
if
(
!
newValue
)
{
this
.
$emit
(
"memberOrderDetailDialogEvent"
,
this
.
updateNumberPlat
);
}
},
},
mounted
()
{
this
.
getOrderInfo
();
},
methods
:
{
getOrderInfo
()
{
this
.
form
=
this
.
memberRow
this
.
dialogVisible
=
true
}
}
}
</
script
>
<
style
>
.label-text
{
margin-left
:
10px
;
margin-right
:
20px
;
}
.label-title
{
margin-top
:
10px
;
}
.orderDetail
tr
th
{
background
:
#eef1f6
;
}
.orderDetail
tr
td
,
.orderDetail
tr
th
{
width
:
500px
;
text-align
:
center
;
border
:
1px
solid
#dfe6ec
;
margin-left
:
100px
;
margin-right
:
100px
;
padding
:
10px
;
}
.label-value
{
margin-left
:
80px
;
margin-right
:
100px
;
}
#license-img
{
width
:
50px
;
height
:
50px
;
}
.order-details
.el-form-item
{
margin-bottom
:
10px
!important
;
}
.modal_modal
{
position
:
fixed
;
left
:
0
;
top
:
0
;
width
:
100%
;
height
:
100%
;
opacity
:
.5
;
background
:
#000
;
z-index
:
2000
;
}
</
style
>
src/views/userManagement/model/rentOrderDetailModal.vue
0 → 100644
View file @
03dbdfb2
<
template
>
<el-dialog
title=
"租车订单详情"
:visible
.
sync=
"dialogVisible"
class=
"order-details"
>
<el-form
:model=
"form"
ref=
"form"
label-width=
"90px"
>
<el-row>
<el-col
:span=
"8"
>
<el-form-item
label=
"订单号:"
>
<span>
{{
form
.
no
}}
</span>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"支付时间:"
>
<span>
{{
form
.
crtTime
}}
</span>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"订单状态:"
>
<span>
{{
form
.
status
}}
</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col
:span=
"8"
>
<el-form-item
label=
"姓名:"
>
<span>
{{
form
.
username
}}
</span>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"手机号:"
>
<span>
{{
form
.
telephone
}}
</span>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"配车:"
>
<span
style=
"margin-right: 10px;"
>
{{
form
.
vehicleNumberPlat
?
form
.
vehicleNumberPlat
:
form
.
vehicalNumberPlat
}}
</span>
<el-button
size=
"small"
type=
"primary"
icon=
"edit"
v-if=
"form.status==4"
@
click=
"resetCar"
>
重新配车
</el-button>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col
:span=
"8"
>
<el-form-item
label=
"取车:"
>
<span>
{{
form
.
orderRentVehicleDetail
.
startTime
}}
</span>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
""
label-width=
"10px"
>
<span>
{{
form
.
orderRentVehicleDetail
.
startAddr
}}
</span>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"交车公司:"
>
<span>
{{
form
.
startCompanyName
}}
</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col
:span=
"8"
>
<el-form-item
label=
"还车:"
>
<span>
{{
form
.
orderRentVehicleDetail
.
endTime
}}
</span>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
""
label-width=
"10px"
>
<span>
{{
form
.
orderRentVehicleDetail
.
endAddr
}}
</span>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"交车公司:"
>
<span>
{{
form
.
endCompanyName
}}
</span>
</el-form-item>
</el-col>
</el-row>
<table
class=
"orderDetail"
>
<tr>
<th>
房车
</th>
<th>
租借天数
</th>
<th>
费用明细
</th>
</tr>
<tr>
<td>
{{
form
.
name
}}{{
rentCostDetail
}}
</td>
<td>
{{
form
.
orderRentVehicleDetail
.
dayNum
}}
天
</td>
<td>
{{
rentCostDetail
}}
</td>
</tr>
<tr>
<td></td>
<td></td>
<td>
共计:¥
{{
form
.
realAmount
}}
</td>
</tr>
</table>
<div
v-if=
"form.orderVehicleCrosstownDto"
style=
"margin: 20px 0;"
><span
style=
"font-size: 18px;font-weight: bold;"
>
驾驶人信息
</span></div>
<table
class=
"orderDetail"
v-if=
"form.orderVehicleCrosstownDto"
>
<tr>
<th>
姓名
</th>
<th>
手机号
</th>
<th>
身份证号
</th>
<th>
驾照
</th>
</tr>
<tr>
<td>
{{
form
.
orderVehicleCrosstownDto
.
licenseName
}}
</td>
<td>
{{
form
.
orderVehicleCrosstownDto
.
licensePhone
}}
</td>
<td>
{{
form
.
orderVehicleCrosstownDto
.
licenseIdCard
}}
</td>
<td><img
style=
"width: 140px;height: 140px;"
:src=
"form.orderVehicleCrosstownDto?form.orderVehicleCrosstownDto.licenseImg:'https://xxtest.upyuns.com/image/app/default_%20avatar.png'"
>
</td>
</tr>
</table>
</el-form>
<div
class=
"modal_modal"
v-show=
"resetCarVisible"
></div>
<!-- 重新配车 -->
<el-dialog
title=
"重新配车"
:visible
.
sync=
"resetCarVisible"
:append-to-body=
'true'
:modal=
"false"
>
<el-form
:model=
"resetCarForm"
ref=
"carForm"
:rules=
"rules"
label-width=
"90px"
>
<el-form-item
label=
"车牌号:"
prop=
"numberPlate"
>
<el-input
v-model=
"resetCarForm.numberPlate"
placeholder=
"请输入重配的车牌号"
></el-input>
</el-form-item>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
@
click=
"cancelResetCar"
>
取消
</el-button>
<el-button
type=
"primary"
@
click=
"update('carForm')"
>
确定
</el-button>
</div>
</el-dialog>
</el-dialog>
</
template
>
<
script
>
import
ElRow
from
"element-ui/packages/row/src/row"
;
import
ElInput
from
"../../../../node_modules/element-ui/packages/input/src/input.vue"
;
import
ElCol
from
"element-ui/packages/col/src/col"
;
import
ElFormItem
from
"../../../../node_modules/element-ui/packages/form/src/form-item.vue"
;
import
ElForm
from
"../../../../node_modules/element-ui/packages/form/src/form.vue"
;
import
{
editObj
}
from
'api/vehicle/vehicleInfo'
;
export
default
{
props
:
[
"form"
,
"rentCostDetail"
],
name
:
'rentOrderDetailModal'
,
components
:
{
ElFormItem
,
ElCol
,
ElInput
,
ElRow
},
data
()
{
return
{
updateNumberPlat
:
false
,
//是否重新配车
dialogVisible
:
false
,
resetCarVisible
:
false
,
resetCarForm
:
{
no
:
''
,
numberPlate
:
''
,
//重新配车车牌号
},
rules
:
{
numberPlate
:
[
{
type
:
'string'
,
required
:
true
,
message
:
'请输入车牌号'
,
trigger
:
'blur'
}
]
},
}
},
watch
:
{
dialogVisible
(
newValue
,
oldValue
)
{
if
(
!
newValue
)
{
this
.
$emit
(
"rentOrderDetailDialogEvent"
,
this
.
updateNumberPlat
);
}
},
},
mounted
()
{
this
.
dialogVisible
=
true
;
},
methods
:
{
resetCar
()
{
this
.
clearFrom
();
this
.
resetCarVisible
=
true
this
.
resetCarForm
.
no
=
this
.
form
.
no
},
cancelResetCar
()
{
this
.
resetCarVisible
=
false
},
clearFrom
()
{
this
.
resetCarForm
=
{
no
:
''
,
numberPlate
:
''
,
//重新配车车牌号
}
},
/**
* 重新配车
* */
update
(
formName
)
{
let
that
=
this
;
const
set
=
this
.
$refs
;
set
[
formName
].
validate
(
valid
=>
{
if
(
valid
)
{
editObj
(
this
.
resetCarForm
).
then
(
response
=>
{
if
(
response
.
status
===
200
)
{
this
.
$notify
({
title
:
'成功'
,
message
:
'修改成功'
,
type
:
'success'
,
duration
:
2000
});
this
.
resetCarVisible
=
false
this
.
form
.
vehicleNumberPlat
=
this
.
resetCarForm
.
numberPlate
this
.
updateNumberPlat
=
true
}
else
{
this
.
$notify
({
title
:
'失败'
,
message
:
response
.
message
,
type
:
'error'
,
duration
:
2000
});
}
});
}
else
{
return
false
;
}
});
},
}
}
</
script
>
<
style
>
.label-text
{
margin-left
:
10px
;
margin-right
:
20px
;
}
.label-title
{
margin-top
:
10px
;
}
.orderDetail
tr
th
{
background
:
#eef1f6
;
}
.orderDetail
tr
td
,
.orderDetail
tr
th
{
width
:
500px
;
text-align
:
center
;
border
:
1px
solid
#dfe6ec
;
margin-left
:
100px
;
margin-right
:
100px
;
padding
:
10px
;
}
.label-value
{
margin-left
:
80px
;
margin-right
:
100px
;
}
#license-img
{
width
:
50px
;
height
:
50px
;
}
.order-details
.el-form-item
{
margin-bottom
:
10px
!important
;
}
.modal_modal
{
position
:
fixed
;
left
:
0
;
top
:
0
;
width
:
100%
;
height
:
100%
;
opacity
:
.5
;
background
:
#000
;
z-index
:
2000
;
}
</
style
>
src/views/userManagement/model/tourOrderDetailModal.vue
0 → 100644
View file @
03dbdfb2
<
template
>
<el-dialog
title=
"旅游订单详情"
:visible
.
sync=
"dialogVisible"
>
<el-form
:model=
"form"
ref=
"form"
label-width=
"90px"
>
<el-row>
<el-col
:span=
"8"
>
<el-form-item
label=
"订单号:"
>
<span>
{{
form
.
no
}}
</span>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"支付时间:"
>
<span>
{{
form
.
crtTime
}}
</span>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"订单状态:"
>
<span>
{{
form
.
ststusName
}}
</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col>
<el-form-item
label=
"出发地:"
>
<span>
{{
form
.
orderTourDetail
.
startCityName
}}{{
form
.
orderTourDetail
.
startAddr
}}
</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col>
<el-form-item
label=
"目的地:"
>
<span>
{{
form
.
orderTourDetail
.
endAddr
}}
</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col>
<el-form-item
label=
"活动日期:"
>
<span>
{{
form
.
orderTourDetail
.
startTime
}}
~
{{
form
.
orderTourDetail
.
endTime
}}
</span>
</el-form-item>
</el-col>
</el-row>
<table
class=
"orderDetail"
>
<tr><th>
旅行
</th><th>
价格
</th><th>
人数
</th><th>
保险
</th></tr>
<tr>
<td>
{{
form
.
name
}}
</td>
<td>
{{
tourCostDetail
}}
</td>
<td>
成人:
{{
form
.
orderTourDetail
.
adultNum
}}
儿童:
{{
form
.
orderTourDetail
.
childNum
}}
</td>
<td>
{{
insureDetail
}}
</td>
</tr>
<tr>
<td
></td>
<td
></td>
<td
></td>
<td
>
订单金额:
{{
form
.
realAmount
}}
元
</td>
</tr>
</table>
<div>
<div
style=
"margin: 20px 0;"
><span
style=
"font-size: 18px;font-weight: bold;"
>
联系人信息
</span></div>
<div>
<span
style=
"font-weight: 700"
>
联系人:
</span><span
class=
"label-text"
>
{{
form
.
orderTourDetail
.
contactMan
}}
</span>
<span
style=
"font-weight: 700"
>
联系电话:
</span><span
class=
"label-text"
>
{{
form
.
orderTourDetail
.
contactPhone
}}
</span>
<span
style=
"font-weight: 700"
>
Email:
</span><span
class=
"label-text"
>
{{
form
.
orderTourDetail
.
contactEmail
}}
</span>
</div>
</div>
<div>
<div
style=
"margin: 20px 0;"
><span
style=
"font-size: 18px;font-weight: bold;"
>
出游人信息 成人
{{
form
.
orderTourDetail
.
adultNum
}}
人 儿童
{{
form
.
orderTourDetail
.
childNum
}}
人
</span></div>
<table
class=
"orderDetail"
>
<tr><th>
身份
</th><th>
姓名
</th><th>
电话
</th><th>
身份证号
</th></tr>
<tr
v-for=
"(item,index) in form.orderTourDetail.userVoList "
:key=
"index"
>
<td
v-if=
"item && item.isdel == 0 && item.isChild == 0"
>
成人
</td>
<td
v-if=
"item && item.isdel == 0 && item.isChild == 1"
>
儿童
</td>
<td
v-if=
"item && item.isdel == 0"
>
{{
item
.
name
}}
</td>
<td
v-if=
"item && item.isdel == 0"
>
{{
item
.
phone
}}
</td>
<td
v-if=
"item && item.isdel == 0"
>
{{
item
.
idCard
}}
</td>
</tr>
</table>
</div>
</el-form>
</el-dialog>
</
template
>
<
script
>
import
ElRow
from
"element-ui/packages/row/src/row"
;
import
ElInput
from
"../../../../node_modules/element-ui/packages/input/src/input.vue"
;
import
ElCol
from
"element-ui/packages/col/src/col"
;
import
ElFormItem
from
"../../../../node_modules/element-ui/packages/form/src/form-item.vue"
;
import
ElForm
from
"../../../../node_modules/element-ui/packages/form/src/form.vue"
;
import
{
getVehicleOrderDetail
}
from
'api/vehicle/vehicleSchedulManage'
;
import
{
timestamp2Date
}
from
'utils/dateUtils'
;
export
default
{
props
:
[
"tourRow"
],
name
:
'tourOrderDetailModal'
,
components
:
{
ElFormItem
,
ElCol
,
ElInput
,
ElRow
},
data
()
{
return
{
dialogVisible
:
false
,
form
:
{
couponAmount
:
undefined
,
crtHost
:
undefined
,
crtName
:
undefined
,
crtTime
:
undefined
,
crtUser
:
undefined
,
detailId
:
undefined
,
endCompanyName
:
undefined
,
goodsAmount
:
undefined
,
hasDiscount
:
undefined
,
hasMemberRight
:
undefined
,
hasPay
:
undefined
,
id
:
undefined
,
name
:
undefined
,
no
:
undefined
,
orderAmount
:
undefined
,
orderOrigin
:
undefined
,
orderTourDetail
:
{
adultNum
:
undefined
,
childNum
:
undefined
,
contactEmail
:
undefined
,
contactMan
:
undefined
,
contactPhone
:
undefined
,
costDetail
:
undefined
,
crtTime
:
undefined
,
dayNum
:
undefined
,
endAddr
:
undefined
,
endTime
:
undefined
,
goodId
:
undefined
,
hasInsure
:
undefined
,
id
:
undefined
,
isOutside
:
undefined
,
orderId
:
undefined
,
siteId
:
undefined
,
spePriceId
:
undefined
,
startAddr
:
undefined
,
startCity
:
undefined
,
startCityName
:
undefined
,
startCompanyId
:
undefined
,
startTime
:
undefined
,
totalNumber
:
undefined
,
tourUserIds
:
undefined
,
updTime
:
undefined
,
verificationId
:
undefined
},
payOrigin
:
undefined
,
picture
:
undefined
,
realAmount
:
undefined
,
refundStatus
:
undefined
,
startCompanyName
:
undefined
,
status
:
undefined
,
ststusName
:
undefined
,
telephone
:
undefined
,
type
:
undefined
,
updTime
:
undefined
,
userId
:
undefined
,
username
:
undefined
,
vehicleNumberPlat
:
undefined
,
version
:
undefined
,
},
costDetail
:{
key
:
undefined
,
val
:
undefined
,
children
:[
{
key
:
undefined
,
detail
:
undefined
,
val
:
undefined
}
]
},
insureDetail
:
''
,
//保险
tourCostDetail
:
''
}
},
watch
:
{
dialogVisible
(
newValue
,
oldValue
){
if
(
!
newValue
){
this
.
$emit
(
"tourOrderDetailDialogEvent"
,
false
);
}
},
},
mounted
()
{
this
.
getOrderInfo
();
//获取订单详情
},
methods
:
{
//获取订单详情
getOrderInfo
(){
// let params = {
// orderNo: this.tourRow.no
// };
this
.
form
=
this
.
tourRow
this
.
dialogVisible
=
true
;
// getVehicleOrderDetail(params).then(res => {
// if (res.status == 200) {
// let a = res.data;
// this.form = a;
// this.form.orderTourDetail.startTime = timestamp2Date(a.orderTourDetail.startTime)
// this.form.orderTourDetail.endTime = timestamp2Date(a.orderTourDetail.endTime)
// this.costDetail = JSON.parse(a.orderTourDetail.costDetail)
// var cost = '';
// this.costDetail.children.forEach(function(a1) {
// var detail = a1.detail==undefined?'':a1.detail
// cost += a1.key + ":" +detail+" "
// })
// if (this.form.status == 2) {
// this.form.ststusName = '取消';
// }
// if (this.form.status == 3) {
// this.form.ststusName = '待付款';
// }
// if (this.form.status == 4) {
// this.form.ststusName = '待出行';
// }
// if (this.form.status == 5) {
// this.form.ststusName = '出行中';
// }
// if (this.form.status == 6) {
// this.form.ststusName = '已完成';
// }
// if(a.orderTourDetail.hasInsure == 0) {
// this.insureDetail = "不需要保险"
// }
// this.tourCostDetail = cost;
// this.dialogVisible = true;
// } else {
// this.$notify({
// title: '失败',
// message: res.message,
// type: 'error',
// duration: 2000
// });
// this.$emit("tourOrderDetailDialogEvent", false);
// }
// });
}
}
}
</
script
>
<
style
>
.label-text
{
margin-left
:
10px
;
margin-right
:
20px
;
}
.label-title
{
margin-top
:
10px
;
}
.orderDetail
tr
th
{
background
:
#eef1f6
;
}
.orderDetail
tr
td
,
.orderDetail
tr
th
{
width
:
500px
;
text-align
:
center
;
border
:
1px
solid
#dfe6ec
;
margin-left
:
100px
;
margin-right
:
100px
;
padding
:
10px
;
}
.label-value
{
margin-left
:
80px
;
margin-right
:
100px
;
}
#license-img
{
width
:
50px
;
height
:
50px
;
}
.order-details
.el-form-item
{
margin-bottom
:
10px
!important
;
}
</
style
>
src/views/userManagement/userList/index.vue
View file @
03dbdfb2
...
@@ -364,7 +364,8 @@
...
@@ -364,7 +364,8 @@
<el-row>
<el-row>
<el-col
:span=
"16"
>
<el-col
:span=
"16"
>
<el-form-item
label=
"剩余天数"
prop=
"rentFreeDays"
>
<el-form-item
label=
"剩余天数"
prop=
"rentFreeDays"
>
<el-input
type=
"number"
v-model=
"userMembershipInformation.rentFreeDays"
min=
"0"
v-enterNumber
placeholder=
"请填写剩余天数"
></el-input>
<el-input
type=
"number"
v-model=
"userMembershipInformation.rentFreeDays"
min=
"0"
v-enterNumber
placeholder=
"请填写剩余天数"
></el-input>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
</el-row>
</el-row>
...
@@ -424,7 +425,7 @@
...
@@ -424,7 +425,7 @@
<el-row>
<el-row>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"订单类型"
>
<el-form-item
label=
"订单类型"
>
<el-select
class=
"filter-item"
v-model=
"orderQuery.type"
placeholder=
"请选订单
装太
"
>
<el-select
class=
"filter-item"
v-model=
"orderQuery.type"
placeholder=
"请选订单
状态
"
>
<el-option
:key=
"undefined"
label=
"所有订单"
:value=
"undefined"
></el-option>
<el-option
:key=
"undefined"
label=
"所有订单"
:value=
"undefined"
></el-option>
<el-option
v-for=
"(val, key, index) in orderTypeList "
:key=
"val.id"
:label=
"val.name"
<el-option
v-for=
"(val, key, index) in orderTypeList "
:key=
"val.id"
:label=
"val.name"
:value=
"val.id"
></el-option>
:value=
"val.id"
></el-option>
...
@@ -446,9 +447,7 @@
...
@@ -446,9 +447,7 @@
</el-button>
</el-button>
</el-col>
</el-col>
</el-row>
</el-row>
</el-form>
</el-form>
</div>
</div>
<!-- <el-form :model="userOrderMessage" ref="alterUserOrder" label-width="100px">-->
<!-- <el-form :model="userOrderMessage" ref="alterUserOrder" label-width="100px">-->
...
@@ -481,8 +480,9 @@
...
@@ -481,8 +480,9 @@
<el-table-column
<el-table-column
label=
"操作"
label=
"操作"
align=
"center"
>
align=
"center"
>
<el-button
size=
"small"
type=
"success"
>
查看详情
<
template
scope=
"scope"
>
</el-button>
<span
style=
"color: #13CE66;cursor: pointer;"
@
click=
"handleOrderDetail(scope.row)"
>
订单详情
</span>
</
template
>
</el-table-column>
</el-table-column>
</el-table>
</el-table>
<!-- </el-form>-->
<!-- </el-form>-->
...
@@ -497,41 +497,17 @@
...
@@ -497,41 +497,17 @@
</el-dialog>
</el-dialog>
<!--批量导入会员窗口-->
<!-- 订单详情 -->
<el-dialog
title=
"导入会员"
:visible
.
sync=
"bulkUploadMember"
>
<rentOrderDetailModal
:form=
"form"
:rentCostDetail=
"rentCostDetail"
v-if=
"rentDialogVisible"
<el-form
:model=
"fileForm"
>
v-on:rentOrderDetailDialogEvent=
"rentOrderDetailDialogEvent"
></rentOrderDetailModal>
<el-form-item
label=
"上传文件"
:label-width=
"formLabelWidth"
>
<el-button
type=
"primary"
icon=
"el-icon-download"
>
<a
class=
"el-icon-download"
:href=
"BASE_API+'/api/admin/admin/member/app/unauth/user/excel_model/dowload'"
>
下载模板
</a>
</el-button>
<el-upload
<tourOrderDetailModal
:tourRow=
"tourRow"
:insureDetail=
"insureDetail"
v-if=
"tourDialogVisible"
ref=
"uploadExcel"
:tourCostDetail=
"tourCostDetail"
:limit=
limitNum
v-on:tourOrderDetailDialogEvent=
"tourOrderDetailDialogEvent"
></tourOrderDetailModal>
action=
"1111"
:headers=
"getHeaderWithToken"
accept=
".xlsx"
:http-request=
"upLoad"
:on-remove=
"handleRemove"
:before-remove=
"beforeRemove"
:before-upload=
"beforeUploadFile"
:on-change=
"fileChange"
:on-exceed=
"exceedFile"
:file-list=
"fileList"
>
<el-button
size=
"small"
type=
"primary"
icon=
"el-icon-edit"
>
上传文件
<i
class=
"el-icon-upload el-icon--right"
>
</i></el-button>
<div
slot=
"tip"
class=
"el-upload__tip"
>
只能上传xlsx(Excel2007以上版本)文件,且不超过10M
</div>
</el-upload>
<el-button
size=
"small"
class=
"filter-item"
type=
"primary"
@
click=
"cancelNotDeleteForm"
>
取消
</el-button>
</el-form-item>
</el-form>
</el-dialog>
<
!-- <book-info-viewer ref="bookInfoViewer"></book-info-viewer>-->
<
memberOrderDetailModal
:memberRow=
"memberRow"
:memberCostDetail=
"memberCostDetail"
v-if=
"memberDialogVisible"
<!-- <acc-item-selector :selectedAccItem="selectedAccItem" :isReadOnly="true" ref="accItemSelector"></acc-item-selector>--
>
v-on:memberOrderDetailDialogEvent=
"memberOrderDetailDialogEvent"
></memberOrderDetailModal
>
</div>
</div>
</template>
</template>
...
@@ -558,11 +534,23 @@
...
@@ -558,11 +534,23 @@
}
from
'api/purseManage'
;
}
from
'api/purseManage'
;
import
{
formatDate
}
from
"../../../utils/dateFormattor"
;
import
{
formatDate
}
from
"../../../utils/dateFormattor"
;
import
{
getMembers
}
from
"src/api/admin/member/index"
import
{
getMembers
}
from
"src/api/admin/member/index"
import
tourOrderDetailModal
from
"src/views/userManagement/model/tourOrderDetailModal"
;
//旅游订单
import
rentOrderDetailModal
from
"src/views/userManagement/model/rentOrderDetailModal"
;
//租车订单详情
import
memberOrderDetailModal
from
"src/views/userManagement/model/memberOrderDetailModal"
;
//会员订单详情
export
default
{
export
default
{
name
:
'appUser'
,
name
:
'appUser'
,
components
:
{
rentOrderDetailModal
,
tourOrderDetailModal
,
memberOrderDetailModal
},
data
()
{
data
()
{
return
{
return
{
tourCostDetail
:
''
,
memberCostDetail
:
''
,
rentCostDetail
:
''
,
serviceCost
:
0
,
inline
:
true
,
inline
:
true
,
peopleSettingModal
:
false
,
peopleSettingModal
:
false
,
orderData
:
[],
orderData
:
[],
...
@@ -617,6 +605,10 @@
...
@@ -617,6 +605,10 @@
fileForm
:
{
fileForm
:
{
file
:
''
file
:
''
},
},
rentDialogVisible
:
false
,
tourDialogVisible
:
false
,
memberDialogVisible
:
false
,
insureDetail
:
''
,
fileList
:
[],
fileList
:
[],
errorHandler
:
true
,
errorHandler
:
true
,
list
:
null
,
list
:
null
,
...
@@ -637,7 +629,75 @@
...
@@ -637,7 +629,75 @@
type
:
undefined
,
type
:
undefined
,
status
:
undefined
status
:
undefined
},
},
form
:
{
couponAmount
:
undefined
,
crtHost
:
undefined
,
crtName
:
undefined
,
crtTime
:
undefined
,
crtUser
:
undefined
,
detailId
:
undefined
,
endCompanyName
:
undefined
,
goodsAmount
:
undefined
,
hasDiscount
:
undefined
,
hasMemberRight
:
undefined
,
hasPay
:
undefined
,
id
:
undefined
,
name
:
undefined
,
no
:
undefined
,
orderAmount
:
undefined
,
orderOrigin
:
undefined
,
orderVehicleCrosstownDto
:
{
licenseIdCard
:
""
,
licenseImg
:
""
,
licenseName
:
""
,
licensePhone
:
""
},
orderRentVehicleDetail
:
{
bookRecordId
:
undefined
,
costDetail
:
undefined
,
crtTime
:
undefined
,
dayNum
:
undefined
,
deposit
:
undefined
,
driverType
:
undefined
,
endAddr
:
undefined
,
endCity
:
undefined
,
endCityName
:
undefined
,
endCompanyId
:
undefined
,
endTime
:
undefined
,
freeDays
:
undefined
,
handelViolation
:
undefined
,
id
:
undefined
,
modelId
:
undefined
,
myDriverIds
:
undefined
,
orderId
:
undefined
,
score
:
undefined
,
startAddr
:
undefined
,
startCity
:
undefined
,
startCityName
:
undefined
,
startCompanyId
:
undefined
,
startTime
:
undefined
,
stime
:
undefined
,
suserid
:
undefined
,
updTime
:
undefined
,
vehicleId
:
undefined
,
},
payOrigin
:
undefined
,
picture
:
undefined
,
realAmount
:
undefined
,
refundStatus
:
undefined
,
startCompanyName
:
undefined
,
status
:
undefined
,
ststusName
:
undefined
,
telephone
:
undefined
,
type
:
undefined
,
updTime
:
undefined
,
userId
:
undefined
,
username
:
undefined
,
vehicleNumberPlat
:
undefined
,
version
:
undefined
},
tourRow
:
{},
memberRow
:{},
rules
:
{
rules
:
{
totalNumber
:
[
this
.
integerValidator
()],
totalNumber
:
[
this
.
integerValidator
()],
rentFreeDays
:
[
this
.
integerValidator
()]
rentFreeDays
:
[
this
.
integerValidator
()]
...
@@ -709,7 +769,7 @@
...
@@ -709,7 +769,7 @@
orderType
:
{
orderType
:
{
1
:
'租车'
,
1
:
'租车'
,
2
:
'旅游'
,
2
:
'旅游'
,
3
:
'会员
订单
'
3
:
'会员'
},
},
detailsDialogFormVisible
:
false
,
detailsDialogFormVisible
:
false
,
setMemberArea
:
false
,
setMemberArea
:
false
,
...
@@ -730,6 +790,7 @@
...
@@ -730,6 +790,7 @@
userList_btn_del
:
false
,
//删除
userList_btn_del
:
false
,
//删除
admin_btn_user_postion_put
:
false
,
//身份设置
admin_btn_user_postion_put
:
false
,
//身份设置
settingList
:
[],
settingList
:
[],
}
}
},
},
created
()
{
created
()
{
...
@@ -758,6 +819,56 @@
...
@@ -758,6 +819,56 @@
},
},
methods
:
{
methods
:
{
handleOrderDetail
(
row
)
{
if
(
row
.
type
==
"租车"
)
{
this
.
form
=
row
;
this
.
form
.
orderRentVehicleDetail
.
startTime
=
timestamp2Date
(
this
.
form
.
orderRentVehicleDetail
.
startTime
)
this
.
form
.
orderRentVehicleDetail
.
endTime
=
timestamp2Date
(
this
.
form
.
orderRentVehicleDetail
.
endTime
)
this
.
costDetail
=
JSON
.
parse
(
this
.
form
.
orderRentVehicleDetail
.
costDetail
)
var
cost
=
''
;
this
.
costDetail
.
children
.
forEach
(
function
(
a
)
{
var
detail
=
a
.
detail
==
undefined
?
''
:
a
.
detail
cost
+=
a
.
key
+
":"
+
detail
+
" "
})
this
.
rentCostDetail
=
cost
if
(
this
.
form
.
orderRentVehicleDetail
.
driverType
==
1
)
{
this
.
serviceCost
=
this
.
form
.
orderRentVehicleDetail
.
dayNum
*
600
}
this
.
rentDialogVisible
=
true
;
}
if
(
row
.
type
==
"旅游"
)
{
this
.
tourRow
=
row
this
.
tourDialogVisible
=
true
;
}
if
(
row
.
type
==
"会员"
)
{
this
.
memberRow
=
row
;
this
.
memberDialogVisible
=
true
;
}
},
/**
* 租车订单详情弹框关闭
* */
rentOrderDetailDialogEvent
(
e
)
{
this
.
rentDialogVisible
=
false
;
},
/**
* 会员详情弹框关闭
* */
memberOrderDetailDialogEvent
(
e
)
{
this
.
memberDialogVisible
=
false
;
},
/**
* 旅游订单详情弹框关闭
* */
tourOrderDetailDialogEvent
(
e
){
this
.
tourDialogVisible
=
false
;
},
getMembersLevel
()
{
getMembersLevel
()
{
var
_this
=
this
;
var
_this
=
this
;
getMembers
().
then
(
res
=>
{
getMembers
().
then
(
res
=>
{
...
@@ -950,7 +1061,7 @@
...
@@ -950,7 +1061,7 @@
// this.validityType = '无'
// this.validityType = '无'
// }
// }
this
.
validTime
=
response
.
data
.
validTime
;
this
.
validTime
=
response
.
data
.
validTime
;
this
.
userMembershipInformation
.
memberLevel
=
response
.
data
.
memberLevel
?
response
.
data
.
memberLevel
:
''
;
this
.
userMembershipInformation
.
memberLevel
=
response
.
data
.
memberLevel
?
response
.
data
.
memberLevel
:
''
;
this
.
userMembershipInformation
.
validTime
=
response
.
data
.
validTime
;
this
.
userMembershipInformation
.
validTime
=
response
.
data
.
validTime
;
this
.
userMembershipInformation
.
totalNumber
=
response
.
data
.
totalNumber
;
this
.
userMembershipInformation
.
totalNumber
=
response
.
data
.
totalNumber
;
this
.
userMembershipInformation
.
rentFreeDays
=
response
.
data
.
rentFreeDays
;
this
.
userMembershipInformation
.
rentFreeDays
=
response
.
data
.
rentFreeDays
;
...
...
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