Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
SuperMan
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
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
罗超
SuperMan
Commits
d9798306
Commit
d9798306
authored
Jan 18, 2023
by
liudong1993
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
a17a753a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
2 deletions
+19
-2
OrderList.vue
src/components/scenicSpot/reservation/OrderList.vue
+4
-2
ReservationOrder.vue
src/components/scenicSpot/reservation/ReservationOrder.vue
+15
-0
No files found.
src/components/scenicSpot/reservation/OrderList.vue
View file @
d9798306
...
...
@@ -574,7 +574,8 @@
</
template
>
</el-table>
</div>
<!-- <el-table :data="item.list" style="width:100%" border v-if="item.OrderStatus!=3">
<el-table
:data=
"item.list"
style=
"width:100%"
border
v-if=
"item.OrderStatus!=3"
>
<el-table-column
label=
"实收"
min-width=
"100"
>
<
template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
.
Income
?
scope
.
row
.
Income
:
"-"
}}
</span>
...
...
@@ -597,7 +598,8 @@
<span>
{{
scope
.
row
.
Refund
?
scope
.
row
.
Refund
:
"-"
}}
</span>
</
template
>
</el-table-column>
</el-table> -->
</el-table>
<div
class=
"row justify-sb mt mb20"
>
<div
class=
"column px15 bjFFF3E0 radius5 flex-g pa relative"
>
<div
class=
"fz12 row justify-sb"
>
...
...
src/components/scenicSpot/reservation/ReservationOrder.vue
View file @
d9798306
...
...
@@ -252,6 +252,12 @@ export default {
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
let
data
=
res
.
data
.
data
.
pageData
let
addList
=
function
(
arr
){
arr
.
forEach
(
x
=>
{
x
.
list
=
[]
})
}
addList
(
data
)
data
.
forEach
((
x
)
=>
{
x
.
Money
=
0
x
.
DetailList
.
forEach
((
y
)
=>
{
...
...
@@ -260,6 +266,15 @@ export default {
})
this
.
OrderList
=
data
;
this
.
OrderList
.
forEach
(
item
=>
{
let
datas
=
{
Income
:
item
.
Income
,
CostMoney
:
item
.
CostMoney
,
PlatformTax
:
item
.
PlatformTax
,
Refund
:
item
.
Refund
}
item
.
list
.
push
(
datas
)
})
this
.
total
=
res
.
data
.
data
.
count
;
}
else
{
this
.
Error
(
res
.
data
.
message
);
...
...
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