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
52e408cb
Commit
52e408cb
authored
6 years ago
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增结团
parent
a1977dfc
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
2 deletions
+24
-2
travelFeature2.js
src/assets/utils/travelFeature2.js
+1
-1
TravelControlList.vue
...components/TravelManager/TravelList/TravelControlList.vue
+22
-0
travelFeature3.vue
...lmanager/TravelGroupControl/TravelTemp/travelFeature3.vue
+1
-1
No files found.
src/assets/utils/travelFeature2.js
View file @
52e408cb
...
@@ -56,7 +56,7 @@ let travelFeatureTwo = {
...
@@ -56,7 +56,7 @@ let travelFeatureTwo = {
DinnerInit
:
function
(
index
,
data
)
{
// 餐初始化
DinnerInit
:
function
(
index
,
data
)
{
// 餐初始化
let
list
=
[];
let
list
=
[];
for
(
let
item
of
data
[
index
].
DinnerArray
)
{
for
(
let
item
of
data
[
index
].
DinnerArray
)
{
if
(
item
.
DinnerName
&&
item
.
DinnerName
!==
''
&&
!
(
item
.
DinnerName
==
"酒店内享用早餐"
||
item
.
DinnerName
==
'酒店外享用早餐'
||
item
.
DinnerName
==
'机上
享用早餐'
||
item
.
DinnerName
==
'方便游玩敬请自理'
||
item
.
DinnerName
==
'机上享用
'
||
item
.
DinnerName
==
'酒店享用'
))
{
if
(
item
.
DinnerName
&&
item
.
DinnerName
!==
''
&&
!
(
item
.
DinnerName
==
"酒店内享用早餐"
||
item
.
DinnerName
==
'酒店外享用早餐'
||
item
.
DinnerName
==
'机上
简餐或自理'
||
item
.
DinnerName
==
'方便游玩敬请自理'
||
item
.
DinnerName
==
'机上简餐或自理
'
||
item
.
DinnerName
==
'酒店享用'
))
{
let
obj
=
{
let
obj
=
{
name
:
''
,
name
:
''
,
MD5Sign
:
''
,
MD5Sign
:
''
,
...
...
This diff is collapsed.
Click to expand it.
src/components/TravelManager/TravelList/TravelControlList.vue
View file @
52e408cb
...
@@ -625,6 +625,10 @@
...
@@ -625,6 +625,10 @@
</el-dropdown-item>
</el-dropdown-item>
<el-dropdown-item
v-if=
"item.TCState==3"
@
click
.
native=
"Setshelves(item.TCID)"
>
下架
<el-dropdown-item
v-if=
"item.TCState==3"
@
click
.
native=
"Setshelves(item.TCID)"
>
下架
</el-dropdown-item>
</el-dropdown-item>
<el-dropdown-item
v-if=
"item.Status==1"
@
click
.
native=
"OutGroup(item.TCID,2)"
style=
"display:none"
>
结团
</el-dropdown-item>
<el-dropdown-item
v-if=
"item.Status==2"
@
click
.
native=
"OutGroup(item.TCID,1)"
style=
"display:none"
>
正常
</el-dropdown-item>
<el-dropdown-item
v-if=
"CurrentUserInfo.B2BDomain!=''"
@
click
.
native=
"goB2B(item.ConfigId, item.TCID)"
>
<el-dropdown-item
v-if=
"CurrentUserInfo.B2BDomain!=''"
@
click
.
native=
"goB2B(item.ConfigId, item.TCID)"
>
B2B预览
B2B预览
</el-dropdown-item>
</el-dropdown-item>
...
@@ -1509,6 +1513,24 @@
...
@@ -1509,6 +1513,24 @@
}
}
})
})
},
},
//结团/正常
OutGroup
(
TCID
,
Status
)
{
let
msg
=
{
TCID
:
TCID
,
Status
:
Status
,
}
this
.
apipost
(
'travel_post_SetPriceStatus'
,
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
Success
(
res
.
data
.
message
)
this
.
getControlList
()
this
.
queryCommonData
.
checkDialogAll
=
false
this
.
queryCommonData
.
ckedplat
=
[]
}
else
{
this
.
Info
(
res
.
data
.
message
)
}
})
},
},
},
filters
:
{
filters
:
{
formatStartDate
(
value
)
{
formatStartDate
(
value
)
{
...
...
This diff is collapsed.
Click to expand it.
src/components/newTravelmanager/TravelGroupControl/TravelTemp/travelFeature3.vue
View file @
52e408cb
...
@@ -1953,7 +1953,7 @@
...
@@ -1953,7 +1953,7 @@
let restaurantObj = json.travelFeature2.restaurantObj;
let restaurantObj = json.travelFeature2.restaurantObj;
let list = [];
let list = [];
restaurantObj.list.forEach(item=> { // 餐饮筛选
restaurantObj.list.forEach(item=> { // 餐饮筛选
if (item.DinnerName && item.DinnerName !== '' && !(item.DinnerName=="
酒店内享用早餐
" ||item.DinnerName == '酒店外享用早餐' || item.DinnerName == '机上
享用早餐
' || item.DinnerName == '方便游玩敬请自理' || item.DinnerName == '机上简餐或自理' || item.DinnerName == '酒店享用')) {
if (item.DinnerName && item.DinnerName !== '' && !(item.DinnerName=="
酒店内享用早餐
" ||item.DinnerName == '酒店外享用早餐' || item.DinnerName == '机上
简餐或自理
' || item.DinnerName == '方便游玩敬请自理' || item.DinnerName == '机上简餐或自理' || item.DinnerName == '酒店享用')) {
let obj = {
let obj = {
name: '',
name: '',
MD5Sign: '',
MD5Sign: '',
...
...
This diff is collapsed.
Click to expand it.
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