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
49ae46b3
Commit
49ae46b3
authored
Sep 18, 2019
by
hanfeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改订单详情
parent
b603274f
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
141 additions
and
37 deletions
+141
-37
tourOrderDetailModal.vue
src/views/order/modal/tourOrderDetailModal.vue
+29
-9
index.vue
src/views/order/rentVehicleInfo/index.vue
+40
-9
tourOrderDetailModal.vue
src/views/userManagement/model/tourOrderDetailModal.vue
+30
-9
index.vue
src/views/userManagement/userList/index.vue
+42
-10
No files found.
src/views/order/modal/tourOrderDetailModal.vue
View file @
49ae46b3
...
...
@@ -199,8 +199,10 @@
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
.
form
.
orderTourDetail
.
startTime
=
a
.
orderTourDetail
.
startTime
?
timestamp2Date
(
a
.
orderTourDetail
.
startTime
):
''
this
.
form
.
orderTourDetail
.
endTime
=
a
.
orderTourDetail
.
endTime
?
timestamp2Date
(
a
.
orderTourDetail
.
endTime
):
''
if
(
a
.
orderTourDetail
.
costDetail
){
try
{
this
.
costDetail
=
JSON
.
parse
(
a
.
orderTourDetail
.
costDetail
)
var
cost
=
''
;
if
(
this
.
costDetail
.
children
){
...
...
@@ -209,6 +211,11 @@
cost
+=
a1
.
key
+
":"
+
detail
+
" "
})
}
}
catch
(
e
)
{
this
.
templateModel
()
}
}
if
(
this
.
form
.
status
==
2
)
{
this
.
form
.
ststusName
=
'取消'
;
}
...
...
@@ -239,6 +246,19 @@
this
.
$emit
(
"tourOrderDetailDialogEvent"
,
false
);
}
});
},
templateModel
(){
this
.
costDetail
=
{
key
:
undefined
,
val
:
undefined
,
children
:
[
{
key
:
undefined
,
detail
:
undefined
,
val
:
undefined
}
]
}
}
}
}
...
...
src/views/order/rentVehicleInfo/index.vue
View file @
49ae46b3
...
...
@@ -504,6 +504,17 @@
vehicleDetail
:
false
,
//交还车信息,默认全部显示
order_btn_order_violcation_save
:
false
,
depositDetail
:
false
,
costDetail
:{
key
:
undefined
,
val
:
undefined
,
children
:[
{
key
:
undefined
,
detail
:
undefined
,
val
:
undefined
}
]
},
}
},
created
()
{
...
...
@@ -547,16 +558,23 @@
if
(
this
.
form
.
status
==
6
)
{
this
.
form
.
ststusName
=
'已完成'
;
}
this
.
form
.
orderRentVehicleDetail
.
startTime
=
timestamp2Date
(
this
.
form
.
orderRentVehicleDetail
.
startTime
)
this
.
form
.
orderRentVehicleDetail
.
endTime
=
timestamp2Date
(
this
.
form
.
orderRentVehicleDetail
.
endTime
)
this
.
form
.
orderRentVehicleDetail
.
startTime
=
this
.
form
.
orderRentVehicleDetail
.
startTime
?
timestamp2Date
(
this
.
form
.
orderRentVehicleDetail
.
startTime
):
''
this
.
form
.
orderRentVehicleDetail
.
endTime
=
this
.
form
.
orderRentVehicleDetail
.
endTime
?
timestamp2Date
(
this
.
form
.
orderRentVehicleDetail
.
endTime
):
''
if
(
this
.
form
.
orderRentVehicleDetail
.
costDetail
){
try
{
this
.
costDetail
=
JSON
.
parse
(
this
.
form
.
orderRentVehicleDetail
.
costDetail
)
var
cost
=
''
;
if
(
this
.
costDetail
.
children
)
{
if
(
this
.
costDetail
.
children
)
{
this
.
costDetail
.
children
.
forEach
(
function
(
a
)
{
var
detail
=
a
.
detail
==
undefined
?
''
:
a
.
detail
cost
+=
a
.
key
+
":"
+
detail
+
" "
})
}
}
catch
(
e
)
{
this
.
templateModel
()
}
}
this
.
tourCostDetail
=
cost
if
(
this
.
form
.
orderRentVehicleDetail
.
driverType
==
1
)
{
this
.
serviceCost
=
this
.
form
.
orderRentVehicleDetail
.
dayNum
*
600
...
...
@@ -908,6 +926,19 @@
handleCurrentChange
(
val
)
{
this
.
listQuery
.
page
=
val
;
this
.
getList
();
},
templateModel
(){
this
.
costDetail
=
{
key
:
undefined
,
val
:
undefined
,
children
:
[
{
key
:
undefined
,
detail
:
undefined
,
val
:
undefined
}
]
}
}
}
}
...
...
src/views/userManagement/model/tourOrderDetailModal.vue
View file @
49ae46b3
...
...
@@ -216,16 +216,23 @@
// if (res.status == 200) {
let
a
=
this
.
tourRow
;
this
.
form
=
a
;
this
.
form
.
orderTourDetail
.
startTime
=
timestamp2Date
(
a
.
orderTourDetail
.
startTime
)
this
.
form
.
orderTourDetail
.
endTime
=
timestamp2Date
(
a
.
orderTourDetail
.
endTime
)
this
.
form
.
orderTourDetail
.
startTime
=
a
.
orderTourDetail
.
startTime
?
timestamp2Date
(
a
.
orderTourDetail
.
startTime
)
:
''
this
.
form
.
orderTourDetail
.
endTime
=
a
.
orderTourDetail
.
endTime
?
timestamp2Date
(
a
.
orderTourDetail
.
endTime
)
:
''
if
(
a
.
orderTourDetail
.
costDetail
)
{
try
{
this
.
costDetail
=
JSON
.
parse
(
a
.
orderTourDetail
.
costDetail
)
var
cost
=
''
;
if
(
this
.
costDetail
.
children
)
{
if
(
this
.
costDetail
.
children
)
{
this
.
costDetail
.
children
.
forEach
(
function
(
a1
)
{
var
detail
=
a1
.
detail
==
undefined
?
''
:
a1
.
detail
cost
+=
a1
.
key
+
":"
+
detail
+
" "
})
}
}
catch
(
e
)
{
this
.
templateModel
()
}
}
// if (this.form.status == 2) {
// this.form.ststusName = '取消';
// }
...
...
@@ -256,7 +263,21 @@
// this.$emit("tourOrderDetailDialogEvent", false);
// }
// });
},
templateModel
(){
this
.
costDetail
=
{
key
:
undefined
,
val
:
undefined
,
children
:
[
{
key
:
undefined
,
detail
:
undefined
,
val
:
undefined
}
]
}
}
}
}
</
script
>
...
...
src/views/userManagement/userList/index.vue
View file @
49ae46b3
...
...
@@ -791,7 +791,17 @@
userList_btn_del
:
false
,
//删除
admin_btn_user_postion_put
:
false
,
//身份设置
settingList
:
[],
costDetail
:{
key
:
undefined
,
val
:
undefined
,
children
:[
{
key
:
undefined
,
detail
:
undefined
,
val
:
undefined
}
]
},
}
},
created
()
{
...
...
@@ -824,9 +834,12 @@
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
.
form
.
orderRentVehicleDetail
.
startTime
=
this
.
form
.
orderRentVehicleDetail
.
startTime
?
timestamp2Date
(
this
.
form
.
orderRentVehicleDetail
.
startTime
):
''
this
.
form
.
orderRentVehicleDetail
.
endTime
=
this
.
form
.
orderRentVehicleDetail
.
endTime
?
timestamp2Date
(
this
.
form
.
orderRentVehicleDetail
.
endTime
):
''
if
(
this
.
form
.
orderRentVehicleDetail
.
costDetail
){
try
{
this
.
costDetail
=
JSON
.
parse
(
this
.
form
.
orderRentVehicleDetail
.
costDetail
)
var
cost
=
''
;
if
(
this
.
costDetail
.
children
)
{
...
...
@@ -835,6 +848,12 @@
cost
+=
a
.
key
+
":"
+
detail
+
" "
})
}
}
catch
(
e
)
{
this
.
templateModel
()
}
}
this
.
rentCostDetail
=
cost
if
(
this
.
form
.
orderRentVehicleDetail
.
driverType
==
1
)
{
this
.
serviceCost
=
this
.
form
.
orderRentVehicleDetail
.
dayNum
*
600
...
...
@@ -1401,6 +1420,19 @@
trigger
:
'blur'
};
},
templateModel
(){
this
.
costDetail
=
{
key
:
undefined
,
val
:
undefined
,
children
:
[
{
key
:
undefined
,
detail
:
undefined
,
val
:
undefined
}
]
}
}
}
}
</
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