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
997f788d
Commit
997f788d
authored
May 14, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.oytour.com/luochao/superman
parents
527ff0dd
3e14311e
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
472 additions
and
225 deletions
+472
-225
BasicDocuments.vue
src/components/FinancialModule/BasicDocuments.vue
+11
-11
productQuery.vue
src/components/SalesModule/productQuery.vue
+68
-9
ShoppingReimbursement.vue
src/components/ShoppingStore/ShoppingReimbursement.vue
+0
-5
PassengerList.vue
src/components/Ticketing/PassengerList.vue
+193
-165
flightPerformance.vue
src/components/Ticketing/flightPerformance.vue
+140
-0
TravelControlList.vue
...components/TravelManager/TravelList/TravelControlList.vue
+48
-31
scenicSpotInfoManage.vue
src/components/scenicSpot/scenicSpotInfoManage.vue
+2
-2
scenicSpotList.vue
src/components/scenicSpot/scenicSpotList.vue
+2
-2
config.js
src/router/config.js
+8
-0
No files found.
src/components/FinancialModule/BasicDocuments.vue
View file @
997f788d
...
@@ -1701,7 +1701,7 @@ export default {
...
@@ -1701,7 +1701,7 @@ export default {
if
(
that
.
Ststus
==
1
){
if
(
that
.
Ststus
==
1
){
if
(
this
.
AuditOrRefundMsg
.
Status
==
'5'
){
if
(
this
.
AuditOrRefundMsg
.
Status
==
'5'
){
if
(
that
.
GetDetail
.
AccountNumber
.
indexOf
(
"东航平台"
)
!=-
1
){
if
(
that
.
GetDetail
.
AccountNumber
&&
that
.
GetDetail
.
AccountNumber
.
indexOf
(
"东航平台"
)
!=-
1
){
if
(
this
.
allMoney
==
0
){
if
(
this
.
allMoney
==
0
){
this
.
Error
(
"请将信息填写完整!"
)
this
.
Error
(
"请将信息填写完整!"
)
return
;
return
;
...
@@ -1894,17 +1894,17 @@ export default {
...
@@ -1894,17 +1894,17 @@ export default {
this
.
apipost
(
'AccountType_post_GetList'
,
this
.
queryAccMsg
,
res
=>
{
this
.
apipost
(
'AccountType_post_GetList'
,
this
.
queryAccMsg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
){
if
(
res
.
data
.
resultCode
==
1
){
let
data
=
res
.
data
.
data
;
let
data
=
res
.
data
.
data
;
//
if(this.RB_Post_Id!=5){
if
(
this
.
RB_Post_Id
!=
5
){
//
data.forEach(item=>{
data
.
forEach
(
item
=>
{
//
if(item.Name!="公社资金池" && item.Name!="水口资金池" && item.Name!="橡胶资金池" && item.Name!="地接部专户" && item.Name!="老挝购物店资金池"){
if
(
item
.
Name
!=
"公社资金池"
&&
item
.
Name
!=
"水口资金池"
&&
item
.
Name
!=
"橡胶资金池"
&&
item
.
Name
!=
"地接部专户"
&&
item
.
Name
!=
"老挝购物店资金池"
){
//
this.AccList.push(item);
this
.
AccList
.
push
(
item
);
//
}
}
//
})
})
//
}else{
}
else
{
//
this.AccList = res.data.data;
this
.
AccList
=
res
.
data
.
data
;
//
}
}
this
.
AccList
=
res
.
data
.
data
;
//
this.AccList = res.data.data;
}
else
{
}
else
{
this
.
$message
.
error
(
res
.
data
.
message
);
this
.
$message
.
error
(
res
.
data
.
message
);
}
}
...
...
src/components/SalesModule/productQuery.vue
View file @
997f788d
...
@@ -144,6 +144,17 @@
...
@@ -144,6 +144,17 @@
.PQ_detail
tr
th
,
.v-table-title-cell
{
background
:
#E6E6E6
;
height
:
40px
;
font-size
:
14px
;
border-right
:
1px
solid
#e6e6e6
;
color
:
#333
;}
.PQ_detail
tr
th
,
.v-table-title-cell
{
background
:
#E6E6E6
;
height
:
40px
;
font-size
:
14px
;
border-right
:
1px
solid
#e6e6e6
;
color
:
#333
;}
.PQ_detail
tr
{
background
:
#fff
;
text-align
:
center
;
height
:
40px
;}
.PQ_detail
tr
{
background
:
#fff
;
text-align
:
center
;
height
:
40px
;}
.PQ_detail
tr
td
{
font-size
:
12px
;
border
:
1px
solid
#E5E5E5
;}
.PQ_detail
tr
td
{
font-size
:
12px
;
border
:
1px
solid
#E5E5E5
;}
.TC_HotelPop
>
div
{
overflow
:
auto
;
max-height
:
350px
;
}
.TC_HotelPop
table
td
{
padding
:
5px
0
;
text-align
:
center
;
}
.TC_HotelPop
table
th
{
text-align
:
center
;
}
</
style
>
</
style
>
<
template
>
<
template
>
<div
class=
"flexOne"
>
<div
class=
"flexOne"
>
...
@@ -159,7 +170,7 @@
...
@@ -159,7 +170,7 @@
<el-row
:gutter=
"20"
>
<el-row
:gutter=
"20"
>
<el-col
:span=
"4"
>
<el-col
:span=
"4"
>
<el-form-item
label=
"客户类型"
prop=
"CustomerType"
>
<el-form-item
label=
"客户类型"
prop=
"CustomerType"
>
<el-select
v-model=
'addMsg.CustomerType'
filterable
:placeholder=
"$t('pub.pleaseSel')"
@
change=
'getTypePrice();getDdlyList();getKhmdList();getTotalPrice()'
>
<el-select
v-model=
'addMsg.CustomerType'
filterable
:placeholder=
"$t('pub.pleaseSel')"
@
change=
'getTypePrice()
,resetSelect()
;getDdlyList();getKhmdList();getTotalPrice()'
>
<el-option
v-for=
"item in khlxList"
:label=
'item.Name'
:value=
'item.Id'
:key=
'item.Id'
>
<el-option
v-for=
"item in khlxList"
:label=
'item.Name'
:value=
'item.Id'
:key=
'item.Id'
>
</el-option>
</el-option>
</el-select>
</el-select>
...
@@ -771,6 +782,51 @@
...
@@ -771,6 +782,51 @@
<span
slot=
"reference"
class=
"price"
>
查看价格明细
</span>
<span
slot=
"reference"
class=
"price"
>
查看价格明细
</span>
</el-popover>
</el-popover>
</p>
</p>
<!-- <p v-if="item.LineID==14 && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
<el-popover width="600" trigger="click" popper-class="TC_HotelPop">
<div>
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
<tr>
<th width="100">日期</th>
<th style="border-right:1px solid #E5E5E5">酒店情况</th>
<th width="100" style="border-right:1px solid #E5E5E5">占房时间</th>
</tr>
<tr v-for="subItem in item.HotelOrderListReports">
<td width="100">
{{subItem.UseDay}}
</td>
<td style="text-align:left;padding:3px 10px;">
<template v-if="subItem.SubList">
<div v-if="subItem.SubList.length==1 && subItem.SubList[0].UseCount>0 ">
{{subItem.SubList[0].HotelName}}
<a style="color:green">{{subItem.SubList[0].Status==1?"【OK】":"【暂定】"}}</a>
【<a
style="color:green"> 本团使用库存:{{subItem.SubList[0].UseCount}}
{{subItem.SubList[0].CostPrice!=0?"价格:"+subItem.SubList[0].CostPrice:""}}</a>】</div>
<template v-else v-for="childItem in subItem.SubList">
<div>{{childItem.HotelName}} {{childItem.HotelName!="温馨的家"?"【暂定】":""}}</div>
</template>
</template>
</td>
<td>
<template v-if="subItem.SubList">
<div v-if="subItem.SubList.length==1 && subItem.SubList[0].UseCount>0 ">
{{subItem.SubList[0].CreateDateStr}}
</div>
<template v-else v-for="childItem in subItem.SubList">
<div></div>
</template>
</template>
</td>
</tr>
</table>
</div>
<span slot="reference" class="price">酒店信息</span>
</el-popover>
</p> -->
</div>
</div>
<div
class=
"d5"
>
<div
class=
"d5"
>
<p><i
class=
"iconfont icon-tuanwei"
></i>
团位信息
</p>
<p><i
class=
"iconfont icon-tuanwei"
></i>
团位信息
</p>
...
@@ -1497,21 +1553,24 @@
...
@@ -1497,21 +1553,24 @@
}
}
},
err
=>
{})
},
err
=>
{})
},
},
resetSelect
(){
if
(
this
.
addMsg
.
CustomerType
==
1
)
{
this
.
addMsg
.
CustomerId
=
''
}
if
(
this
.
addMsg
.
CustomerType
==
2
)
{
this
.
addMsg
.
CustomerId
=
''
}
},
getTypePrice
()
{
getTypePrice
()
{
this
.
addMsg
.
ContactName
=
''
this
.
addMsg
.
ContactName
=
''
this
.
addMsg
.
ContactMobile
=
''
this
.
addMsg
.
ContactMobile
=
''
console
.
log
(
'this.addMsg.CustomerType'
,
this
.
addMsg
.
CustomerType
)
if
(
this
.
addMsg
.
CustomerType
==
1
)
{
if
(
this
.
addMsg
.
CustomerType
==
1
)
{
this
.
addMsg
.
TC_Price
=
this
.
addObj
.
B2BMemberPrice
this
.
addMsg
.
TC_Price
=
this
.
addObj
.
B2BMemberPrice
this
.
addMsg
.
Unit_Price
=
this
.
addObj
.
B2BMemberPrice
;
this
.
addMsg
.
Unit_Price
=
this
.
addObj
.
B2BMemberPrice
;
this
.
addMsg
.
CustomerId
=
''
}
}
if
(
this
.
addMsg
.
CustomerType
==
2
)
{
if
(
this
.
addMsg
.
CustomerType
==
2
)
{
this
.
addMsg
.
TC_Price
=
this
.
addObj
.
B2BPrice
this
.
addMsg
.
TC_Price
=
this
.
addObj
.
B2BPrice
this
.
addMsg
.
Unit_Price
=
this
.
addObj
.
B2BPrice
;
this
.
addMsg
.
Unit_Price
=
this
.
addObj
.
B2BPrice
;
this
.
addMsg
.
CustomerId
=
''
}
}
if
(
this
.
addMsg
.
CustomerType
==
3
)
{
if
(
this
.
addMsg
.
CustomerType
==
3
)
{
this
.
addMsg
.
TC_Price
=
this
.
addObj
.
B2CMemberPrice
this
.
addMsg
.
TC_Price
=
this
.
addObj
.
B2CMemberPrice
...
@@ -1990,9 +2049,9 @@
...
@@ -1990,9 +2049,9 @@
for
(
let
i
=
0
;
i
<
res
.
data
.
data
.
pageData
.
length
;
i
++
)
{
for
(
let
i
=
0
;
i
<
res
.
data
.
data
.
pageData
.
length
;
i
++
)
{
res
.
data
.
data
.
pageData
[
i
][
'wxImage'
]
=
''
res
.
data
.
data
.
pageData
[
i
][
'wxImage'
]
=
''
}
}
this
.
list
=
res
.
data
.
data
.
pageData
this
.
list
=
res
.
data
.
data
.
pageData
;
}
else
{
}
else
{
this
.
$message
.
e
rror
(
res
.
data
.
message
)
this
.
E
rror
(
res
.
data
.
message
)
}
}
},
err
=>
{})
},
err
=>
{})
},
},
...
@@ -2010,7 +2069,7 @@
...
@@ -2010,7 +2069,7 @@
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
tripDetails
=
res
.
data
.
data
.
FlightList
this
.
tripDetails
=
res
.
data
.
data
.
FlightList
}
else
{
}
else
{
this
.
$message
.
e
rror
(
res
.
data
.
message
)
this
.
E
rror
(
res
.
data
.
message
)
}
}
},
err
=>
{})
},
err
=>
{})
...
...
src/components/ShoppingStore/ShoppingReimbursement.vue
View file @
997f788d
...
@@ -43,11 +43,6 @@
...
@@ -43,11 +43,6 @@
<div
style=
"width: 100%; overflow-x: auto;padding-bottom: 10px; "
>
<div
style=
"width: 100%; overflow-x: auto;padding-bottom: 10px; "
>
<table
border=
"0"
cellspacing=
"1"
cellpadding=
"0"
class=
"ShoppingTable"
<table
border=
"0"
cellspacing=
"1"
cellpadding=
"0"
class=
"ShoppingTable"
style=
"border: 1px solid rgb(230, 230, 230);min-width: 1600px"
v-loading=
"loading"
>
style=
"border: 1px solid rgb(230, 230, 230);min-width: 1600px"
v-loading=
"loading"
>
<!--
<tr>
<th
colspan=
"2"
>
公司通用信息
</th>
<th
colspan=
"6"
>
导游操作
</th>
<th
colspan=
"9"
>
地接OP
</th>
</tr>
-->
<tr>
<tr>
<th
width=
"115"
>
序号
</th>
<th
width=
"115"
>
序号
</th>
<th
width=
"100"
>
出发地
</th>
<th
width=
"100"
>
出发地
</th>
...
...
src/components/Ticketing/PassengerList.vue
View file @
997f788d
This diff is collapsed.
Click to expand it.
src/components/Ticketing/flightPerformance.vue
0 → 100644
View file @
997f788d
<
style
>
.fpTable
th
{
border-bottom
:
1px
solid
#d1d1d1
;
border-right
:
1px
solid
#d1d1d1
;
}
</
style
>
<
template
>
<div
class=
"flexOne"
>
<div
class=
"query-box"
>
<ul>
<li>
<span>
<em>
操作人
</em>
<el-select
v-model=
"msg.CreateBy"
filterable
:placeholder=
"$t('system.ph_in')"
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
"0"
></el-option>
<el-option
v-for=
"item in EmployeeList"
:label=
"item.EmName"
:value=
"item.EmployeeId"
:key=
"item.EmployeeId"
></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>
月份
</em>
<el-date-picker
v-model=
'msg.QMonth'
value-format=
"yyyy-MM"
type=
"month"
></el-date-picker>
</span>
</li>
<li>
<input
type=
"button"
class=
"hollowFixedBtn"
@
click=
"getList()"
:value=
"$t('pub.searchBtn')"
/>
<input
type=
"button"
class=
"hollowFixedBtn"
@
click=
"DownLoad()"
value=
"导出"
/>
</li>
</ul>
</div>
<table
class=
"singeRowTable fpTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
v-loading=
"loading"
>
<tr>
<th>
团期
</th>
<th>
出团公司
</th>
<th>
线路
</th>
<th>
人数
</th>
<th>
操作人员
</th>
</tr>
<tr
v-for=
"item in dataList"
>
<td>
<a
style=
"color:blue;cursor:pointer"
@
click=
'goUrlT("RegistrationList",item.TCID,"报名清单")'
>
(
{{
item
.
TCID
}}
)
{{
item
.
TCNUM
}}
</a></td>
<td>
{{
item
.
OutBranchName
}}
</td>
<td>
{{
item
.
LineName
}}
</td>
<td>
{{
item
.
TicketNum
}}
</td>
<td>
{{
item
.
CreateByName
}}
</td>
</tr>
</table>
</div>
</
template
>
<
script
>
export
default
{
data
()
{
return
{
msg
:
{
LineId
:
0
,
//线路编号
OutBranchId
:
-
1
,
//出团公司
AirLineID
:
0
,
//航空公司编号
CreateBy
:
0
,
//操作人
QMonth
:
''
,
//月份
},
loading
:
false
,
dataList
:
[],
//航空公司下拉
airlineList
:
[],
//操作人下拉
EmployeeList
:
[],
}
},
mounted
()
{
let
date
=
new
Date
(),
y
=
date
.
getFullYear
(),
m
=
date
.
getMonth
()
<
10
?
"0"
+
(
date
.
getMonth
()
+
1
)
:
date
.
getMonth
()
+
1
;
this
.
msg
.
QMonth
=
y
+
'-'
+
m
;
this
.
initAirlines
();
this
.
getEmployeeList
();
this
.
getList
()
},
methods
:
{
//页面跳转
goUrlT
(
path
,
obj
,
title
)
{
this
.
$router
.
push
({
name
:
path
,
query
:
{
"id"
:
obj
,
blank
:
'y'
,
tab
:
title
}
})
},
//获取列表数据
getList
()
{
this
.
loading
=
true
;
this
.
apipost
(
"AirTicket_get_GetTicketPerformance"
,
this
.
msg
,
res
=>
{
this
.
loading
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
dataList
=
res
.
data
.
data
;
}
});
},
//初始化航空公司下拉
initAirlines
()
{
this
.
apipost
(
"airline_post_GetList"
,
{},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
airlineList
=
res
.
data
.
data
;
}
},
err
=>
{}
);
},
//根据当前员工所在部门获取该部门及子部门员工信息
getEmployeeList
()
{
this
.
apipost
(
"admin_get_GetEmployeeByUserDepartmentId"
,
{},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
EmployeeList
=
res
.
data
.
data
;
}
},
err
=>
{}
);
},
//下载业绩数据
DownLoad
()
{
this
.
loading
=
true
;
var
fileName
=
"机票业绩下载"
+
this
.
msg
.
QMonth
+
".xls"
;
this
.
GetLocalFile
(
"AirTicket_get_DownLoadGetTicketPerformance"
,
this
.
msg
,
fileName
,
res
=>
{
this
.
loading
=
false
;
});
}
}
}
</
script
>
src/components/TravelManager/TravelList/TravelControlList.vue
View file @
997f788d
...
@@ -81,17 +81,21 @@
...
@@ -81,17 +81,21 @@
.TC_Content
.avatar-uploader-icon
{
.TC_Content
.avatar-uploader-icon
{
height
:
auto
;
height
:
auto
;
}
}
.TC_HotelPop
>
div
{
.TC_HotelPop
>
div
{
overflow
:
auto
;
overflow
:
auto
;
max-height
:
350px
;
max-height
:
350px
;
}
}
.TC_HotelPop
table
td
{
padding
:
5px
0
;
.TC_HotelPop
table
td
{
padding
:
5px
0
;
text-align
:
center
;
text-align
:
center
;
}
}
.TC_HotelPop
table
th
{
.TC_HotelPop
table
th
{
text-align
:
center
;
text-align
:
center
;
}
}
</
style
>
</
style
>
<
template
>
<
template
>
<div
class=
"TC_Content"
>
<div
class=
"TC_Content"
>
...
@@ -144,11 +148,11 @@
...
@@ -144,11 +148,11 @@
@
keyup
.
native
.
enter=
"getControlList"
:placeholder=
"$t('pub.pleaseImport')"
></el-input>
@
keyup
.
native
.
enter=
"getControlList"
:placeholder=
"$t('pub.pleaseImport')"
></el-input>
</span>
</span>
</li>
</li>
<li
style=
"display:none;"
>
<li>
<span>
<span>
<em>
{{
$t
(
'hotel.hotel_SerialNumber'
)
}}
</em>
<em>
{{
$t
(
'hotel.hotel_SerialNumber'
)
}}
</em>
<el-input
maxlength=
"50"
v-model=
"queryMsg.TCID"
class=
"permiss-input w150"
<el-input
maxlength=
"50"
v-model=
"queryMsg.TCID"
class=
"permiss-input w150"
@
keyup
.
native
.
enter=
"getControlList"
:placeholder=
"$t('pub.pleaseImport
')"
></el-input>
:placeholder=
"$t('pub.pleaseImport')"
@
keyup
.
native=
"checkInteger(queryMsg,'TCID
')"
></el-input>
</span>
</span>
</li>
</li>
<li>
<li>
...
@@ -552,11 +556,11 @@
...
@@ -552,11 +556,11 @@
<p
v-if=
"item.LineID==14 && item.HotelOrderListReports && item.HotelOrderListReports.length>0 "
>
<p
v-if=
"item.LineID==14 && item.HotelOrderListReports && item.HotelOrderListReports.length>0 "
>
<el-popover
width=
"600"
trigger=
"click"
popper-class=
"TC_HotelPop"
>
<el-popover
width=
"600"
trigger=
"click"
popper-class=
"TC_HotelPop"
>
<table
width=
"100%"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
class=
"singeRowTable"
>
<table
width=
"100%"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
class=
"singeRowTable"
>
<tr>
<tr>
<th
width=
"100"
>
日期
</th>
<th
width=
"100"
>
日期
</th>
<th
style=
"border-right:1px solid #E5E5E5"
>
酒店情况
</th>
<th
style=
"border-right:1px solid #E5E5E5"
>
酒店情况
</th>
<th
style=
"border-right:1px solid #E5E5E5"
>
占房时间
</th>
<th
style=
"border-right:1px solid #E5E5E5"
>
占房时间
</th>
</tr>
</tr>
</table>
</table>
<div>
<div>
<table
width=
"100%"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
class=
"singeRowTable"
>
<table
width=
"100%"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
class=
"singeRowTable"
>
...
@@ -569,8 +573,7 @@
...
@@ -569,8 +573,7 @@
<div
v-if=
"subItem.SubList.length==1 && subItem.SubList[0].UseCount>0 "
>
<div
v-if=
"subItem.SubList.length==1 && subItem.SubList[0].UseCount>0 "
>
{{
subItem
.
SubList
[
0
].
HotelName
}}
{{
subItem
.
SubList
[
0
].
HotelName
}}
<a
style=
"color:green"
>
{{
subItem
.
SubList
[
0
].
Status
==
1
?
"【OK】"
:
"【暂定】"
}}
</a>
<a
style=
"color:green"
>
{{
subItem
.
SubList
[
0
].
Status
==
1
?
"【OK】"
:
"【暂定】"
}}
</a>
【
<a
【
<a
style=
"color:green"
>
本团使用库存:
{{
subItem
.
SubList
[
0
].
UseCount
}}
style=
"color:green"
>
本团使用库存:
{{
subItem
.
SubList
[
0
].
UseCount
}}
{{
subItem
.
SubList
[
0
].
CostPrice
!=
0
?
"价格:"
+
subItem
.
SubList
[
0
].
CostPrice
:
""
}}
</a>
】
</div>
{{
subItem
.
SubList
[
0
].
CostPrice
!=
0
?
"价格:"
+
subItem
.
SubList
[
0
].
CostPrice
:
""
}}
</a>
】
</div>
<template
v-else
v-for=
"childItem in subItem.SubList"
>
<template
v-else
v-for=
"childItem in subItem.SubList"
>
<div>
{{
childItem
.
HotelName
}}
{{
childItem
.
HotelName
!=
"温馨的家"
?
"【暂定】"
:
""
}}
</div>
<div>
{{
childItem
.
HotelName
}}
{{
childItem
.
HotelName
!=
"温馨的家"
?
"【暂定】"
:
""
}}
</div>
...
@@ -580,12 +583,12 @@
...
@@ -580,12 +583,12 @@
<td>
<td>
<
template
v-if=
"subItem.SubList"
>
<
template
v-if=
"subItem.SubList"
>
<div
v-if=
"subItem.SubList.length==1 && subItem.SubList[0].UseCount>0 "
>
<div
v-if=
"subItem.SubList.length==1 && subItem.SubList[0].UseCount>0 "
>
{{
subItem
.
SubList
[
0
].
CreateDateStr
}}
{{
subItem
.
SubList
[
0
].
CreateDateStr
}}
</div>
</div>
<template
v-else
v-for=
"childItem in subItem.SubList"
>
<template
v-else
v-for=
"childItem in subItem.SubList"
>
<div></div>
<div></div>
</
template
>
</
template
>
</template>
</template>
</td>
</td>
</tr>
</tr>
</table>
</table>
...
@@ -627,8 +630,13 @@
...
@@ -627,8 +630,13 @@
</p>
</p>
<p>
<p>
<span>
{{$t('leader.leader_Leader')}}
</span>
<span>
{{$t('leader.leader_Leader')}}
</span>
<span
v-if=
"item.LeaderName==null"
class=
"TCL-redType"
>
{{$t('Operation.Op_nozhipai')}}
</span>
<span
v-if=
"item.LeaderName"
class=
"TCL-greenType"
>
{{item.LeaderName}}
</span>
<span
v-else
class=
"TCL-greenType"
>
{{item.LeaderName}}
</span>
<span
v-else
class=
"TCL-redType"
>
{{$t('Operation.Op_nozhipai')}}
</span>
</p>
<p>
<span>
导游
</span>
<span
v-if=
"item.GuideName"
class=
"TCL-greenType"
>
{{item.GuideName}}
</span>
<span
v-else
class=
"TCL-redType"
>
{{$t('Operation.Op_nozhipai')}}
</span>
</p>
</p>
</div>
</div>
</div>
</div>
...
@@ -647,24 +655,27 @@
...
@@ -647,24 +655,27 @@
<div
class=
"TC_SeatList"
>
{{$t('Airticket.Air_firstClass')}}:{{item.FSeat}}
</div>
<div
class=
"TC_SeatList"
>
{{$t('Airticket.Air_firstClass')}}:{{item.FSeat}}
</div>
<div
class=
"TC_SeatList"
>
{{$t('Airticket.Air_businessClass')}}:{{item.CSeat}}
</div>
<div
class=
"TC_SeatList"
>
{{$t('Airticket.Air_businessClass')}}:{{item.CSeat}}
</div>
<div
class=
"TC_SeatList"
>
{{$t('Airticket.Air_EconomyClass')}}:{{item.YSeat}}
</div>
<div
class=
"TC_SeatList"
>
{{$t('Airticket.Air_EconomyClass')}}:{{item.YSeat}}
</div>
<div
class=
"TC_SeatList"
v-if=
"item.TicketNum>0 && item.TicketList"
>
<div
class=
"TC_SeatList"
v-if=
"item.BindNum>0 && item.TicketList"
>
<el-popover
width=
"340"
trigger=
"click"
popper-class=
"TC_customerInfo"
>
<el-popover
width=
"300"
trigger=
"click"
popper-class=
"TC_customerInfo"
>
<table
width=
"340"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
>
<table
width=
"300"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
>
<tr>
<tr>
<th
width=
"100"
>
绑定数量
</th>
<th
width=
"70"
>
绑定数量
</th>
<th
width=
"100"
>
机票数量
</th>
<th
width=
"70"
>
机票数量
</th>
<th
width=
"100"
>
价格
</th>
<th
width=
"70"
>
价格
</th>
<th
width=
"130"
>
PNR
</th>
</tr>
</tr>
<tr
v-for=
"subItem in item.TicketList"
>
<tr
v-for=
"subItem in item.TicketList"
>
<td>
{{subItem.BindNum}}
</td>
<td>
{{subItem.BindNum}}
</td>
<td>
{{subItem.TicketNum}}
</td>
<td>
{{subItem.TicketNum}}
</td>
<td>
{{subItem.TicketPrice}}
</td>
<td>
{{subItem.TicketPrice}}
</td>
<td>
{{subItem.PNR}}
</td>
</tr>
</tr>
</table>
</table>
<span
slot=
"reference"
class=
"price"
style=
"cursor:pointer"
>
机票信息
</span>
<span
slot=
"reference"
title=
"点击查看详情"
class=
"price"
style=
"cursor:pointer;color:red;text-decoration: underline;"
>
总机位数: {{item.TicketNum}}
</span>
</el-popover>
</el-popover>
</div>
</div>
<div
class=
"TC_SeatList"
v-if=
"item.BindNum>0"
style=
"color:red;"
>
绑定数量: {{item.BindNum}}
</div>
</div>
</div>
</div>
</div>
<div
class=
"el-col"
style=
"width:200px;"
>
<div
class=
"el-col"
style=
"width:200px;"
>
...
@@ -716,7 +727,7 @@
...
@@ -716,7 +727,7 @@
{{item.GroupVisaNum}}
{{item.GroupVisaNum}}
</p>
</p>
<p>
<p>
<span>
出票状态:
</span>
<span>
出票状态:
</span>
<span
class=
"fz16 fbold"
>
<span
class=
"fz16 fbold"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"全部出票"
placement=
"top"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"全部出票"
placement=
"top"
>
<span
style=
"color: #4BCA81;"
v-if=
"item.MakeInvoice==1"
>
√
</span>
<span
style=
"color: #4BCA81;"
v-if=
"item.MakeInvoice==1"
>
√
</span>
...
@@ -1015,7 +1026,7 @@
...
@@ -1015,7 +1026,7 @@
RateOn
:
'-1'
,
RateOn
:
'-1'
,
TeamType
:
0
,
//一般常规团
TeamType
:
0
,
//一般常规团
IsShowUnion
:
-
1
,
IsShowUnion
:
-
1
,
TCID
:
'
0
'
,
TCID
:
''
,
HotelId
:
0
,
//酒店编号
HotelId
:
0
,
//酒店编号
HotelUseTime
:
""
,
//酒店使用时间
HotelUseTime
:
""
,
//酒店使用时间
},
},
...
@@ -1191,12 +1202,18 @@
...
@@ -1191,12 +1202,18 @@
if
(
msg
.
DayNum
==
''
)
{
if
(
msg
.
DayNum
==
''
)
{
msg
.
DayNum
=
-
1
msg
.
DayNum
=
-
1
}
}
this
.
queryCommonData
.
loading
=
true
if
(
msg
.
TCID
==
""
)
{
msg
.
TCID
=
0
;
}
this
.
queryCommonData
.
loading
=
true
;
this
.
apipost
(
this
.
apipost
(
'travel_get_GetTravelPrciePageList'
,
'travel_get_GetTravelPrciePageList'
,
msg
,
msg
,
res
=>
{
res
=>
{
this
.
queryCommonData
.
loading
=
false
this
.
queryCommonData
.
loading
=
false
;
if
(
this
.
queryMsg
.
TCID
==
"0"
)
{
this
.
queryMsg
.
TCID
=
""
;
}
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
queryCommonData
.
dataList
=
res
.
data
.
data
.
pageData
;
this
.
queryCommonData
.
dataList
=
res
.
data
.
data
.
pageData
;
this
.
queryMsg
.
total
=
res
.
data
.
data
.
count
this
.
queryMsg
.
total
=
res
.
data
.
data
.
count
...
...
src/components/scenicSpot/scenicSpotInfoManage.vue
View file @
997f788d
...
@@ -829,11 +829,11 @@
...
@@ -829,11 +829,11 @@
inputVisible2
:
false
,
inputVisible2
:
false
,
inputValue2
:
""
,
inputValue2
:
""
,
IsFreeList
:
[{
IsFreeList
:
[{
value
:
0
,
value
:
1
,
label
:
"是"
label
:
"是"
},
},
{
{
value
:
1
,
value
:
0
,
label
:
"否"
label
:
"否"
}
}
],
],
...
...
src/components/scenicSpot/scenicSpotList.vue
View file @
997f788d
...
@@ -393,11 +393,11 @@
...
@@ -393,11 +393,11 @@
value
:
"-1"
,
value
:
"-1"
,
label
:
"不限"
label
:
"不限"
},{
},{
value
:
"
0
"
,
value
:
"
1
"
,
label
:
"免费"
label
:
"免费"
},
},
{
{
value
:
"
1
"
,
value
:
"
0
"
,
label
:
"有价"
label
:
"有价"
}
}
],
],
...
...
src/router/config.js
View file @
997f788d
...
@@ -791,6 +791,14 @@ export default {
...
@@ -791,6 +791,14 @@ export default {
title
:
'航班管理'
title
:
'航班管理'
},
},
},
},
{
path
:
'/flightPerformance'
,
//机票业绩
name
:
'flightPerformance'
,
component
:
resolve
=>
require
([
'@/components/Ticketing/flightPerformance'
],
resolve
),
meta
:
{
title
:
'机票业绩'
},
},
{
{
path
:
'/flightChild'
,
//航班子表管理
path
:
'/flightChild'
,
//航班子表管理
name
:
'flightChild'
,
name
:
'flightChild'
,
...
...
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