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
0f060b6d
Commit
0f060b6d
authored
Aug 27, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
op旅客名单跳转链接修改
parent
05139b39
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
8 deletions
+14
-8
passengerSaleList.vue
src/components/SalesModule/passengerSaleList.vue
+8
-6
RegistrationList.vue
src/components/TravelManager/TravelList/RegistrationList.vue
+6
-2
No files found.
src/components/SalesModule/passengerSaleList.vue
View file @
0f060b6d
<
template
>
<div
class=
"passengerSaleList"
>
<div
class=
"passengerSaleList_topBtn"
>
<div
v-if=
"isOrder==1"
v-show=
"tableList.length
<guestNum
"
@
click=
"goUrlA(0)"
>
新增
</div>
<div
v-if=
"isOrder==1 && isOneDay !== 1"
@
click=
"goUrlP()"
>
分房
</div>
<div
v-if=
"isOrder==1
&& !isDis
"
v-show=
"tableList.length
<guestNum
"
@
click=
"goUrlA(0)"
>
新增
</div>
<div
v-if=
"isOrder==1 && isOneDay !== 1
&& !isDis
"
@
click=
"goUrlP()"
>
分房
</div>
</div>
<div
class=
"passengerSaleList_tableBox"
>
<table
class=
"passengerSaleList_table"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
:loading=
"loading"
>
...
...
@@ -49,15 +49,15 @@
<td>
{{
item
.
VisaState
==
1
?
'拒签'
:
"正常"
}}
</td>
<td>
<el-button-group>
<el-tooltip
v-if=
"isOrder==1"
class=
"item"
effect=
"dark"
content=
"修改"
placement=
"top-start"
>
<el-tooltip
v-if=
"isOrder==1
&& !isDis
"
class=
"item"
effect=
"dark"
content=
"修改"
placement=
"top-start"
>
<el-button
type=
"primary"
style=
'background:#00C6FF; border-color:#00C6FF'
icon=
"iconfont icon-bianji-smal"
@
click=
"goUrlA(item.Id)"
></el-button>
</el-tooltip>
<el-tooltip
v-if=
"isOrder==1"
class=
"item"
effect=
"dark"
content=
"删除"
placement=
"top-start"
>
<el-tooltip
v-if=
"isOrder==1
&& !isDis
"
class=
"item"
effect=
"dark"
content=
"删除"
placement=
"top-start"
>
<el-button
type=
"primary"
style=
'background:#e95252; border-color:#e95252'
icon=
"iconfont icon-shanchu"
@
click=
"pal_del(item)"
></el-button>
</el-tooltip>
<el-tooltip
v-if=
"isOrder==1"
class=
"item"
effect=
"dark"
content=
"下载申请表"
placement=
"top-start"
>
<el-tooltip
v-if=
"isOrder==1
&& !isDis
"
class=
"item"
effect=
"dark"
content=
"下载申请表"
placement=
"top-start"
>
<el-button
type=
"primary"
style=
'background:#9E8DE3; border-color:#9E8DE3'
icon=
"iconfont icon-img_download"
@
click=
"goUrlB(item.Id)"
></el-button>
</el-tooltip>
...
...
@@ -90,7 +90,8 @@
tableList
:
[],
isOneDay
:
0
,
LineId
:
0
,
EndDateStr
:
""
EndDateStr
:
""
,
isDis
:
false
,
};
},
methods
:
{
...
...
@@ -168,6 +169,7 @@
this
.
msg
.
tcid
=
this
.
$route
.
query
.
tcid
===
undefined
?
"0"
:
this
.
$route
.
query
.
tcid
this
.
msg
.
tcnum
=
this
.
$route
.
query
.
tcnum
===
undefined
?
"0"
:
this
.
$route
.
query
.
tcnum
this
.
isOrder
=
this
.
$route
.
query
.
isOrder
===
undefined
?
0
:
this
.
$route
.
query
.
isOrder
this
.
isDis
=
this
.
$route
.
query
.
isDis
?
true
:
false
;
this
.
getData
()
}
};
...
...
src/components/TravelManager/TravelList/RegistrationList.vue
View file @
0f060b6d
...
...
@@ -1772,8 +1772,11 @@
<span
class=
"RL-remarkTitle"
v-if=
"item.GuestList.length>0"
>
名单:
</span>
<p
class=
"RL-redType RL-remarkCon"
v-if=
"item.GuestList.length>0"
>
<span
style=
"color:blue !important"
v-for=
"(childItem) in item.GuestList"
@
click=
"goUrl('TravelPassengerList',msg.TCID,childItem.OrderId,'旅客名单')"
>
{{childItem.userName}}
</span>
@
click=
"goToPassenger(childItem, 2)"
>
{{childItem.userName}}
</span>
<!-- <span style="color:blue !important" v-for="(childItem) in item.GuestList"
@click="goUrl('TravelPassengerList',msg.TCID,childItem.OrderId,'旅客名单')">{{childItem.userName}}</span> -->
</p>
<p
v-if=
"item.CancelGuestList.length>0"
>
<span
class=
""
>
取消名单:
</span>
<span
class=
"RL-redType RL-remarkCon"
>
...
...
@@ -5086,7 +5089,7 @@
});
},
//跳转到旅客名单
goToPassenger
(
item
)
{
goToPassenger
(
item
,
dis
)
{
this
.
$router
.
push
({
name
:
"passengerSaleList"
,
query
:
{
...
...
@@ -5095,6 +5098,7 @@
tcnum
:
this
.
ConfigData
.
Config
.
TCNUM
,
isOrder
:
1
,
blank
:
"y"
,
isDis
:
dis
,
tab
:
"旅客名单"
}
});
...
...
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