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
08ac1174
Commit
08ac1174
authored
Aug 28, 2019
by
黄奎
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.oytour.com/luochao/superman
parents
251c5f72
73dcc146
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
11 deletions
+22
-11
groupTourOrder.vue
src/components/SalesModule/groupTourOrder.vue
+1
-1
groupTourOrderByTuan.vue
src/components/SalesModule/groupTourOrderByTuan.vue
+1
-1
leaderPay2.vue
src/components/leaderPay2.vue
+20
-9
No files found.
src/components/SalesModule/groupTourOrder.vue
View file @
08ac1174
...
@@ -1988,7 +1988,7 @@
...
@@ -1988,7 +1988,7 @@
<div
class=
"needfenshu"
>
<div
class=
"needfenshu"
>
<label>
需要份数:
</label><el-input
type=
"number"
v-model=
"SQPhotoNum"
class=
"w200"
></el-input>
<label>
需要份数:
</label><el-input
type=
"number"
v-model=
"SQPhotoNum"
class=
"w200"
></el-input>
</div>
</div>
<p
style=
"color: red"
>
注:每人每份
10
元
</p>
<p
style=
"color: red"
>
注:每人每份
5
元
</p>
<div
slot=
"footer"
class=
"dialog-footer"
>
<div
slot=
"footer"
class=
"dialog-footer"
>
<button
class=
"hollowFixedBtn"
@
click=
"ShenQingPhotoShow=false"
>
{{
$t
(
'pub.cancelBtn'
)
}}
</button>
<button
class=
"hollowFixedBtn"
@
click=
"ShenQingPhotoShow=false"
>
{{
$t
(
'pub.cancelBtn'
)
}}
</button>
<button
class=
"normalBtn"
type=
"primary"
@
click=
"SQPhoto"
>
{{
$t
(
'pub.sureBtn'
)
}}
</button>
<button
class=
"normalBtn"
type=
"primary"
@
click=
"SQPhoto"
>
{{
$t
(
'pub.sureBtn'
)
}}
</button>
...
...
src/components/SalesModule/groupTourOrderByTuan.vue
View file @
08ac1174
...
@@ -2706,7 +2706,7 @@
...
@@ -2706,7 +2706,7 @@
<div
class=
"needfenshu"
>
<div
class=
"needfenshu"
>
<label>
需要份数:
</label><el-input
type=
"number"
v-model=
"SQPhotoNum"
class=
"w200"
></el-input>
<label>
需要份数:
</label><el-input
type=
"number"
v-model=
"SQPhotoNum"
class=
"w200"
></el-input>
</div>
</div>
<p
style=
"color: red"
>
注:每人每份
10
元
</p>
<p
style=
"color: red"
>
注:每人每份
5
元
</p>
<div
slot=
"footer"
class=
"dialog-footer"
>
<div
slot=
"footer"
class=
"dialog-footer"
>
<button
class=
"hollowFixedBtn"
@
click=
"ShenQingPhotoShow=false"
>
{{$t('pub.cancelBtn')}}
</button>
<button
class=
"hollowFixedBtn"
@
click=
"ShenQingPhotoShow=false"
>
{{$t('pub.cancelBtn')}}
</button>
<button
class=
"normalBtn"
type=
"primary"
@
click=
"SQPhoto"
>
{{$t('pub.sureBtn')}}
</button>
<button
class=
"normalBtn"
type=
"primary"
@
click=
"SQPhoto"
>
{{$t('pub.sureBtn')}}
</button>
...
...
src/components/leaderPay2.vue
View file @
08ac1174
...
@@ -1539,7 +1539,7 @@ export default {
...
@@ -1539,7 +1539,7 @@ export default {
list
.
push
(
ai
)
list
.
push
(
ai
)
}
}
}
}
for
(
let
i
=
0
;
i
<
list
.
length
;
i
++
)
{
for
(
let
i
=
0
;
i
<
list
.
length
;
i
++
)
{
Diningdest
.
push
({
Diningdest
.
push
({
UseTimeStr
:
ai
.
UseTimeStr
,
UseTimeStr
:
ai
.
UseTimeStr
,
DiningID
:
ai
.
DiningID
,
DiningID
:
ai
.
DiningID
,
...
@@ -1577,13 +1577,23 @@ export default {
...
@@ -1577,13 +1577,23 @@ export default {
});
});
Scenicmap
[
ai
.
UseTimeStr
]
=
ai
;
Scenicmap
[
ai
.
UseTimeStr
]
=
ai
;
}
else
{
}
else
{
for
(
var
j
=
0
;
j
<
Scenicdest
.
length
;
j
++
){
let
list
=
[]
var
dj
=
Scenicdest
[
j
];
for
(
var
j
=
0
;
j
<
Scenicdest
.
length
;
j
++
){
if
(
dj
.
UseTimeStr
==
ai
.
UseTimeStr
&&
dj
.
TicketID
==
ai
.
TicketID
){
var
dj
=
Scenicdest
[
j
];
dj
.
data
.
push
(
ai
);
if
(
dj
.
UseTimeStr
==
ai
.
UseTimeStr
&&
dj
.
TicketID
==
ai
.
TicketID
){
break
;
dj
.
data
.
push
(
ai
);
}
break
;
}
}
else
{
list
.
push
(
ai
)
}
}
for
(
let
i
=
0
;
i
<
list
.
length
;
i
++
)
{
Scenicdest
.
push
({
UseTimeStr
:
ai
.
UseTimeStr
,
DiningID
:
ai
.
DiningID
,
data
:
[
ai
]
});
}
}
}
}
}
for
(
var
i
=
0
;
i
<
Scenicdest
.
length
;
i
++
){
for
(
var
i
=
0
;
i
<
Scenicdest
.
length
;
i
++
){
...
@@ -1593,7 +1603,8 @@ export default {
...
@@ -1593,7 +1603,8 @@ export default {
}
}
Scenicdest
[
i
].
row
=
row
Scenicdest
[
i
].
row
=
row
}
}
this
.
ScenicDataList
=
Scenicdest
this
.
ScenicDataList
=
this
.
unique
(
Scenicdest
);
// this.ScenicDataList = Scenicdest
//酒
//酒
let
HotelList
=
[]
let
HotelList
=
[]
for
(
let
i
=
0
;
i
<
res
.
data
.
data
.
HotelOrderListReport
.
length
;
i
++
)
{
for
(
let
i
=
0
;
i
<
res
.
data
.
data
.
HotelOrderListReport
.
length
;
i
++
)
{
...
...
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