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
26d896c6
Commit
26d896c6
authored
Jul 25, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增联盟页面 未绑定数据。
parent
ff800269
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
522 additions
and
13 deletions
+522
-13
TravelPassengerList2.vue
...ponents/TravelManager/TravelList/TravelPassengerList2.vue
+26
-8
TravelPassengerList3.vue
...ponents/TravelManager/TravelList/TravelPassengerList3.vue
+397
-0
LianMengManagement.vue
src/components/administrative/LianMengManagement.vue
+71
-0
dmcTotalTable.vue
src/components/dmc/manager/dmcTotalTable.vue
+8
-1
config.js
src/router/config.js
+20
-4
No files found.
src/components/TravelManager/TravelList/TravelPassengerList2.vue
View file @
26d896c6
...
...
@@ -108,18 +108,18 @@
<td
width=
"80"
>
<el-select
v-model=
"subItem.HouseNo"
placeholder=
"请选择"
@
change=
"sortNumberN(subItem, subIndex)"
>
<el-option
:disabled=
"subItem.SingleRoomType!=subItem.HouseType"
v-for=
"(hs, hsIndex) in numberList"
:key=
"hs"
:label=
"hs"
:value=
"hs"
>
:disabled=
"(subItem.HouseType == 1 && IsLeaderGuide == 1) || hs.dis"
:key=
"hs.name"
:label=
"hs.name"
:value=
"hs.name"
>
</el-option>
</el-select>
</td>
<td>
<el-select
v-model=
"subItem.HouseType"
placeholder=
"请选择"
@
change=
"changeRmType(subItem, subIndex)"
>
<el-option
:disabled=
"subItem.
SingleRoomType!=subItem.HouseType
"
:disabled=
"subItem.
HouseType == 1 && IsLeaderGuide == 1
"
v-for=
"(hs, hsIndex) in HouseTypeList"
:key=
"hsIndex"
:label=
"hs.HouseName"
...
...
@@ -327,11 +327,26 @@ export default {
this
.
QueryMsg
.
loading
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
let
list
=
res
.
data
.
data
.
pageData
.
result
;
this
.
dataList
=
list
// this.setDataList(list)
this
.
IsHaveLeader
=
res
.
data
.
data
.
pageData
.
IsHaveLeader
;
this
.
IsLeaderGuide
=
res
.
data
.
data
.
pageData
.
IsLeaderGuide
;
this
.
houseList
=
res
.
data
.
data
.
pageData
.
houseList
;
let
disNum
=
[],
numberList
=
this
.
numberList
;
list
.
map
(
x
=>
{
if
(
x
.
HouseType
==
1
&&
this
.
IsLeaderGuide
==
1
){
disNum
.
push
(
x
.
HouseNo
)
}
})
for
(
let
i
=
0
;
i
<
disNum
.
length
;
i
++
){
for
(
let
o
=
0
;
o
<
numberList
.
length
;
o
++
){
if
(
disNum
[
i
]
==
numberList
[
o
].
name
){
numberList
[
o
].
dis
=
true
}
}
}
this
.
dataList
=
list
this
.
numberList
=
numberList
// this.setDataList(list)
}
},
err
=>
{}
...
...
@@ -370,7 +385,10 @@ export default {
mounted
()
{
let
numberList
=
[]
for
(
let
i
=
0
;
i
<
99
;
i
++
)
{
numberList
.
push
(
`
${
i
+
1
}
`
)
numberList
.
push
({
name
:
`
${
i
+
1
}
`
,
dis
:
false
,
})
}
this
.
numberList
=
numberList
this
.
TCID
=
this
.
$route
.
query
.
id
;
...
...
src/components/TravelManager/TravelList/TravelPassengerList3.vue
0 → 100644
View file @
26d896c6
This diff is collapsed.
Click to expand it.
src/components/administrative/LianMengManagement.vue
0 → 100644
View file @
26d896c6
<
style
>
</
style
>
<
template
>
<div
class=
"LianMengManagement"
>
<div
class=
"query-box"
>
<ul>
<li>
<span>
<em>
名称
</em>
<el-input
v-model=
"msg.name"
maxlength=
"50"
class=
"w150"
></el-input>
</span>
</li>
<li>
<input
type=
"button"
class=
"hollowFixedBtn"
:value=
"$t('pub.searchBtn')"
@
click=
"getList()"
/>
</li>
</ul>
</div>
<table
class=
"singeRowTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
v-loading=
"loading"
>
<tr>
<th>
名称
</th>
<th>
门店数
</th>
<th>
总金额
</th>
<th>
收客数
</th>
</tr>
<tr
v-for=
"item in dataList"
>
<td>
{{
item
.
OrderID
}}
</td>
<td>
{{
item
.
GuestName
}}
</td>
<td>
{{
item
.
ScoreNum
}}
</td>
<td>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"查看问券"
placement=
"top"
>
<el-button
type=
"primary"
icon=
"iconfont icon-sousuo"
circle
@
click=
"dialogTitle = '游客问券', showID = item.ID, DiaoChaShow = true"
></el-button>
</el-tooltip>
</td>
</tr>
</table>
<div
class=
"noDataNotice"
v-if=
"dataList.length
<1
"
>
<i
class=
"iconfont icon-kong"
></i>
<p>
{{
$t
(
"active.ld_noData"
)
}}
</p>
</div>
</div>
</
template
>
<
script
>
export
default
{
data
(){
return
{
loading
:
false
,
dataList
:
[],
DiaoChaShow
:
false
,
YouJiShow
:
false
,
showID
:
0
,
dialogTitle
:
''
,
}
},
mounted
()
{
// this.getList();
},
methods
:
{
getList
:
function
()
{
this
.
apipost
(
''
,
{
TCID
:
TCID
,
OrderID
:
OrderID
},
res
=>
{
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
dataList
=
res
.
data
.
data
;
}
},
null
)
}
}
}
</
script
>
src/components/dmc/manager/dmcTotalTable.vue
View file @
26d896c6
...
...
@@ -152,7 +152,7 @@
<tr>
<th
colspan=
"11"
>
公司通用信息
</th>
<th
colspan=
"5"
>
团队需求表
</th>
<th
colspan=
"
9
"
>
地接op操作
</th>
<th
colspan=
"
10
"
>
地接op操作
</th>
</tr>
<tr>
<th
width=
"130"
>
序号
</th>
...
...
@@ -177,6 +177,7 @@
<th
width=
"60"
>
餐食
</th>
<th
width=
"60"
>
车辆
</th>
<th
width=
"60"
>
领队
<br
/>
报账
</th>
<th
width=
"60"
>
合团分房
</th>
<th
width=
"60"
>
领队人头费
</th>
<th
width=
"120"
>
操作
</th>
</tr>
...
...
@@ -339,6 +340,12 @@
<span
class=
"colorE95252"
v-else
>
{{
item
.
LeaderIsApply
==
'0'
?
"x"
:
"O"
}}
</span>
</div>
</td>
<td
:rowspan=
"2*outItem.PriceCommonList.length"
v-if=
'index==0'
>
<div
class=
"fz16 fbold linkspan"
@
click=
"goUrlLeaderIsApply('TravelPassengerList3',item,outItem,'合团分房表')"
v-if=
"outItem.PriceCommonList.length > 1"
>
<span
style=
"color: #4BCA81;"
v-if=
"item.LeaderIsApply==2"
>
√
</span>
<span
class=
"colorE95252"
v-else
>
{{
item
.
LeaderIsApply
==
'0'
?
"x"
:
"O"
}}
</span>
</div>
</td>
<td
:rowspan=
"2*outItem.PriceCommonList.length"
v-if=
'index==0'
style=
"width: 150px;"
>
<el-popover
width=
"100"
trigger=
"click"
popper-class=
"DMC_HotelPop"
>
<table
style=
"width: 100%;"
border=
"0"
cellspacing=
"1"
class=
"dmcTotalTable"
>
...
...
src/router/config.js
View file @
26d896c6
...
...
@@ -542,6 +542,14 @@ export default {
title
:
'审批统计'
},
},
{
path
:
'/LianMengManagement'
,
//联盟管理
name
:
'LianMengManagement'
,
component
:
resolve
=>
require
([
'@/components/administrative/LianMengManagement'
],
resolve
),
meta
:
{
title
:
'联盟管理'
},
},
{
path
:
'/statisticsDetail'
,
//每日
name
:
'statisticsDetail'
,
...
...
@@ -1809,17 +1817,25 @@ export default {
title
:
'领队用款'
},
},
{
path
:
'/TravelPassengerList'
,
//旅客名单
path
:
'/TravelPassengerList'
,
//旅客名单
可分房
name
:
'TravelPassengerList'
,
component
:
resolve
=>
require
([
'@/components/TravelManager/TravelList/TravelPassengerList'
],
resolve
),
component
:
resolve
=>
require
([
'@/components/TravelManager/TravelList/TravelPassengerList
2
'
],
resolve
),
meta
:
{
title
:
'旅客名单'
},
},
{
path
:
'/TravelPassengerList2'
,
//旅客名单
path
:
'/TravelPassengerList2'
,
//旅客名单
不能分房
name
:
'TravelPassengerList2'
,
component
:
resolve
=>
require
([
'@/components/TravelManager/TravelList/TravelPassengerList2'
],
resolve
),
component
:
resolve
=>
require
([
'@/components/TravelManager/TravelList/TravelPassengerList'
],
resolve
),
meta
:
{
title
:
'旅客名单'
},
},
{
path
:
'/TravelPassengerList3'
,
//旅客名单 合团分房
name
:
'TravelPassengerList3'
,
component
:
resolve
=>
require
([
'@/components/TravelManager/TravelList/TravelPassengerList3'
],
resolve
),
meta
:
{
title
:
'旅客名单'
},
...
...
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