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
98415b11
Commit
98415b11
authored
Jun 13, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.oytour.com/luochao/superman
parents
97c83c3a
1b036994
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
612 additions
and
456 deletions
+612
-456
App.vue
src/App.vue
+1
-1
invoicesManagerAdd.vue
src/components/FinancialModule/invoicesManagerAdd.vue
+30
-7
invoicesManagerDetail.vue
src/components/FinancialModule/invoicesManagerDetail.vue
+18
-14
RestaurantPackage.vue
src/components/Restaurant/RestaurantPackage.vue
+389
-360
addPassenger.vue
src/components/SalesModule/addPassenger.vue
+36
-6
TravelControlList.vue
...components/TravelManager/TravelList/TravelControlList.vue
+4
-1
BusInfo.vue
src/components/busManagement/BusInfo.vue
+2
-1
comCheckHotel.vue
src/components/commonPage/comCheckHotel.vue
+86
-54
dmcTotalTable.vue
src/components/dmc/manager/dmcTotalTable.vue
+27
-5
TravelManager2.vue
...ts/newTravelmanager/TravelGroupControl/TravelManager2.vue
+3
-1
TravelPrice.vue
...nents/newTravelmanager/TravelGroupControl/TravelPrice.vue
+5
-1
HotelTrip.vue
src/components/newTravelmanager/travelLineTrip/HotelTrip.vue
+5
-2
TravelDaysTrip_Direct.vue
...newTravelmanager/travelLineTrip/TravelDaysTrip_Direct.vue
+3
-1
travelDaysTrip.vue
...onents/newTravelmanager/travelLineTrip/travelDaysTrip.vue
+3
-2
No files found.
src/App.vue
View file @
98415b11
...
...
@@ -113,7 +113,7 @@ export default {
}
</
script
>
<
style
>
@import
"//at.alicdn.com/t/font_635492_
uiowlzftn6k
.css"
;
@import
"//at.alicdn.com/t/font_635492_
b8jianjuawm
.css"
;
@import
"./assets/css/Semibold.css"
;
@import
"./assets/css/global/config.css"
;
@import
"./assets/css/fileIcon.css"
;
...
...
src/components/FinancialModule/invoicesManagerAdd.vue
View file @
98415b11
...
...
@@ -124,11 +124,11 @@
<!--
<tr>
<td>
应收总额
</td>
<td
class=
"w600 font-weight cursorpointer"
>
<span
@
click=
"goUrlO(orderList.OrderId)"
>
{{
orderList
.
PreferPrice
}}
</span>
<span
@
click=
"goUrlO(orderList.OrderId)"
>
{{
orderList
.
PreferPrice
}}
</span>
</td>
<td>
待收金额
</td>
<td
class=
"w600 font-weight cursorpointer"
>
<span
@
click=
"goUrlO(orderList.OrderId)"
>
{{
orderList
.
DueInMoney
}}
</span>
<span
@
click=
"goUrlO(orderList.OrderId)"
>
{{
orderList
.
DueInMoney
}}
</span>
</td>
</tr>
-->
<tr
class=
"page_iisMgadd_bank"
>
...
...
@@ -146,14 +146,23 @@
<td>
到账日期
</td>
<td>
{{
orderList
.
TradeDateStr
}}
</td>
</tr>
<tr>
<td>
团号
</td>
<td
colspan=
"3"
class=
"w600 text-align-left"
>
{{
msg
.
TCID
}}
</td>
</tr>
<tr>
<td>
{{
msg
.
TCID
}}
</td>
<td>
订单号
</td>
<td
colspan=
"3"
class=
"w600 text-align-left"
>
{{
msg
.
OrderId
}}
</td>
<td>
{{
msg
.
OrderId
}}
</td>
</tr>
<!--
<tr>
-->
<!--
<td>
团号
</td>
-->
<!--
<td
colspan=
"3"
class=
"w600 text-align-left"
>
{{
msg
.
TCID
}}
</td>
-->
<!--
</tr>
-->
<!--
<tr>
-->
<!--
<td>
订单号
</td>
-->
<!--
<td
colspan=
"3"
class=
"w600 text-align-left"
>
{{
msg
.
OrderId
}}
</td>
-->
<!--
</tr>
-->
<tr>
<td
rowspan=
"6"
>
开具内容
</td>
<td>
...
...
@@ -216,12 +225,25 @@
<el-input
placeholder
type=
"number"
v-model=
"msg.BankNo"
></el-input>
</td>
</tr>
<tr>
<td>
备注
</td>
<td
colspan=
"3"
>
<td>
<el-input
type=
"textarea"
placeholder
v-model=
"msg.Remarks"
></el-input>
</td>
<td>
预计到账时间
</td>
<td>
<el-date-picker
v-model=
'msg.AccountingDate'
class=
"w230"
value-format=
"yyyy-MM-dd"
type=
"date"
placeholder=
"选择日期"
></el-date-picker>
</td>
</tr>
<!-- <tr>-->
<!-- <td>备注</td>-->
<!-- <td colspan="3">-->
<!-- <el-input type="textarea" placeholder v-model="msg.Remarks"></el-input>-->
<!-- </td>-->
<!-- </tr>-->
</table>
<div>
<div>
...
...
@@ -289,6 +311,7 @@ export default {
IsDefaultInfo
:
1
,
ApplyPics
:
[],
ID
:
0
,
AccountingDate
:
''
},
DepartName
:
""
,
emName
:
""
,
...
...
src/components/FinancialModule/invoicesManagerDetail.vue
View file @
98415b11
...
...
@@ -246,11 +246,11 @@
<tr>
<td>
应收总额
</td>
<td
class=
"w600 font-weight cursorpointer"
>
<span
@
click=
"goUrlO(detail.OrderId)"
>
{{
detail
.
PreferPrice
}}
</span>
<span
@
click=
"goUrlO(detail.OrderId)"
>
{{
detail
.
PreferPrice
}}
</span>
</td>
<td>
待收金额
</td>
<td
class=
"w600 font-weight cursorpointer"
>
<span
@
click=
"goUrlO(detail.OrderId)"
>
{{
detail
.
DueInMoney
}}
</span>
<span
@
click=
"goUrlO(detail.OrderId)"
>
{{
detail
.
DueInMoney
}}
</span>
</td>
</tr>
<tr
class=
"page_iisMgdetail_bank"
>
...
...
@@ -271,21 +271,21 @@
</tr>
<tr>
<td>
{{
$t
(
'ios.tuanhao'
)
}}
</td>
<td
colspan=
"3"
class=
"w600
text-align-left font-weight cursorpointer"
@
click=
"goUrlT('productQuery', detail.TCNUM, '产品查询')"
>
<td
class=
"
text-align-left font-weight cursorpointer"
@
click=
"goUrlT('productQuery', detail.TCNUM, '产品查询')"
>
{{
detail
.
TCNUM
}}
(
{{
detail
.
TCID
}}
)
</td>
</tr>
<tr>
<td>
{{
$t
(
'ios.ddanhao'
)
}}
</td>
<td
colspan=
"3"
class=
"w600
text-align-left font-weight cursorpointer"
>
<span
@
click=
"goUrlO(detail.OrderId)"
>
{{
detail
.
OrderId
}}
</span>
<td
class=
"
text-align-left font-weight cursorpointer"
>
<span
@
click=
"goUrlO(detail.OrderId)"
>
{{
detail
.
OrderId
}}
</span>
</td>
</tr>
<tr>
<td>
{{
$t
(
'ios.cwdanju'
)
}}
</td>
<td
colspan=
"3"
class=
"w600 text-align-left font-weight cursorpointer"
>
<template
v-for=
"item in orderList.FrIDs"
>
<span
@
click=
"goUrlSFD('SalesFinancialDetail', '销售财务单据', detail.OrderId, detail.TCNUM, detail.TCID)"
>
{{
item
}}
</span>
<span
@
click=
"goUrlSFD('SalesFinancialDetail', '销售财务单据', detail.OrderId, detail.TCNUM, detail.TCID)"
>
{{
item
}}
</span>
</
template
>
<span
v-if=
"orderList.FrIDs && orderList.FrIDs.length<1"
>
{{$t('ios.zanwu')}}
</span>
</td>
...
...
@@ -329,9 +329,13 @@
</tr>
<tr>
<td>
{{$t('hotel.hotel_remark')}}
</td>
<td
colspan=
"3"
>
<td>
{{detail.Remarks}}
</td>
<td>
预计到账时间
</td>
<td
style=
"width: 190px;"
>
{{detail.AccountingDate}}
</td>
</tr>
</table>
<el-dialog
:title=
"$t('pub.hintMsg')"
width=
"400px"
:visible
.
sync=
"dialogFormVisible2"
center
:before-close=
"closeChangeMachie"
>
...
...
@@ -422,7 +426,7 @@
</div>
<div
class=
"shangchuanfujian"
><button
class=
"hollowFixedBtn"
@
click=
"upLoadFuJian"
>
上传附件
</button></div>
</div>
</div>
</div>
<div
class=
"querenhan"
>
<p
>
确认函
</p>
<div
style=
"width:100%;"
>
...
...
@@ -462,7 +466,7 @@
<
script
>
export
default
{
data
()
{
return
{
return
{
detail
:
{},
orderList
:
{},
loading
:
true
,
...
...
@@ -518,7 +522,7 @@ export default {
let
path
=
"/Upload/Temporary/"
this
.
$message
.
info
(
'上传中...'
)
this
.
UploadSelfFileT
(
path
,
newArr
,
x
=>
{
let
fileSize
=
file
.
file
.
size
<
1024
?
file
.
file
.
size
:(
file
.
file
.
size
/
1024
).
toFixed
(
0
);
let
fileSize
=
file
.
file
.
size
<
1024
?
file
.
file
.
size
:(
file
.
file
.
size
/
1024
).
toFixed
(
0
);
this
.
saveMsg
.
push
({
Type
:
fileTypeNumber
,
Content
:
x
.
data
.
FilePath
,
...
...
@@ -569,7 +573,7 @@ export default {
this
.
$router
.
push
({
name
:
'enrollTotal'
,
query
:
{
id
:
OrderId
,
blank
:
'y'
,
tab
:
'报名统计'
}
});
},
goUrlT
:
function
(
path
,
obj
,
title
){
// 跳转团页面
this
.
$router
.
push
({
name
:
path
,
query
:{
"id"
:
obj
,
blank
:
'y'
,
tab
:
title
}})
this
.
$router
.
push
({
name
:
path
,
query
:{
"id"
:
obj
,
blank
:
'y'
,
tab
:
title
}})
},
goSaleFinacial
:
function
()
{
// 跳转销售财务单据
let
obj
=
{
...
...
@@ -604,7 +608,7 @@ export default {
});
},
1000
)
}
}
},
null
)
},
...
...
src/components/Restaurant/RestaurantPackage.vue
View file @
98415b11
This diff is collapsed.
Click to expand it.
src/components/SalesModule/addPassenger.vue
View file @
98415b11
...
...
@@ -140,6 +140,12 @@
element-loading-background=
"rgba(0, 0, 0, 0.7)"
>
<div
class=
"contForm"
>
<el-form
:model=
"addMsg"
ref=
"addMsg"
label-position=
"right"
:rules=
"rules"
label-width=
"100px"
>
<li>
<el-form-item
label=
"身份证号码"
prop=
"IdCard"
>
<el-input
v-model=
"addMsg.IdCard"
type=
"text"
size=
mini
class=
"w230"
maxlength=
"50"
placeholder=
"请填写"
@
blur
.
prevent=
"authentication()"
>
</el-input>
</el-form-item>
</li>
<li>
<el-form-item
label=
"中文姓"
prop=
"SurName"
>
<el-input
v-model=
'addMsg.SurName'
class=
"w230"
@
input=
"Transformation(addMsg.SurName,'SurName')"
...
...
@@ -235,12 +241,7 @@
</el-input>
</el-form-item>
</li>
<li>
<el-form-item
label=
"身份证号码"
prop=
"IdCard"
>
<el-input
v-model=
"addMsg.IdCard"
type=
"text"
size=
mini
class=
"w230"
maxlength=
"50"
placeholder=
"请填写"
>
</el-input>
</el-form-item>
</li>
<li>
<el-form-item
label=
"家庭详细地址"
prop=
"AddressDetail"
>
...
...
@@ -1904,7 +1905,36 @@
err
=>
{}
);
},
authentication
()
{
if
(
this
.
$route
.
query
.
guestId
==
0
)
{
this
.
apipost
(
"sellorder_post_GetGusetByIDCard"
,
{
IdCard
:
this
.
addMsg
.
IdCard
,},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
let
obj
=
res
.
data
.
data
;
this
.
addMsg
=
obj
;
this
.
addMsg
.
Sex
=
obj
.
Sex
.
toString
();
this
.
addMsg
.
Marriage
=
obj
.
Marriage
.
toString
();
if
(
this
.
addMsg
.
Marriage
==
"0"
)
{
this
.
addMsg
.
Marriage
=
""
;
}
this
.
addMsg
.
IsCriminalRecord
=
obj
.
IsCriminalRecord
===
null
?
''
:
obj
.
IsCriminalRecord
.
toString
();
this
.
addMsg
.
IsDepartureRecord
=
obj
.
IsDepartureRecord
.
toString
();
this
.
addMsg
.
Id
=
this
.
$route
.
query
.
guestId
;
this
.
addMsg
.
TCID
=
this
.
$route
.
query
.
TCID
;
this
.
addMsg
.
OrderId
=
this
.
$route
.
query
.
orderId
;
this
.
Roominformation
()
//调取下房间信息
}
else
{
this
.
$message
.
error
(
res
.
data
.
message
);
}
},
err
=>
{
}
);
}
}
},
mounted
()
{
this
.
getCountry
();
...
...
src/components/TravelManager/TravelList/TravelControlList.vue
View file @
98415b11
...
...
@@ -531,6 +531,9 @@
<span
slot=
"reference"
class=
"price"
style=
"cursor:pointer;text-decoration:underline;"
>
酒店预订状况
</span>
</el-popover>
</p>
<p
class=
"travelnowrap"
v-if=
"item.LineID==14 && item.IsOpenHotel==1"
>
<span
style=
"color:red;font-weight:bold;"
>
※ 地接已关闭酒店操作,如需修改请联系地接OP.
</span>
</p>
</div>
</div>
<div
class=
"el-col"
style=
"width:190px;"
>
...
...
@@ -1265,7 +1268,7 @@
})
}
});
// console.log('this.queryCommonData', this.queryCommonData.dataList)
console
.
log
(
"this.queryCommonData.dataList"
,
this
.
queryCommonData
.
dataList
);
}
},
err
=>
{}
...
...
src/components/busManagement/BusInfo.vue
View file @
98415b11
...
...
@@ -559,7 +559,7 @@
}
else
if
(
obj
.
AirportPickUp
==
13
)
{
obj
.
PayType
=
7
;
}
else
{
obj
.
PayType
=
0
;
obj
.
PayType
=
2
;
}
//高速付款方式默认现付
obj
.
HighSpeedPayType
=
1
;
...
...
@@ -781,6 +781,7 @@
.
length
-
1
];
}
let
newPlanData
=
this
.
PlanTableData
[
index
].
BusPlanOrderList
[
subIndex
];
newPlanData
.
AirportPickUp
=
oldPlanData
.
AirportPickUp
;
newPlanData
.
DriverName
=
oldPlanData
.
DriverName
;
newPlanData
.
DriverTel
=
oldPlanData
.
DriverTel
;
newPlanData
.
BusNum
=
oldPlanData
.
BusNum
;
...
...
src/components/commonPage/comCheckHotel.vue
View file @
98415b11
...
...
@@ -4,16 +4,10 @@
border-bottom
:
1px
solid
#d1d1d1
;
}
.comCheckHotel
>
div
{
float
:
left
;
width
:
120px
;
border-right
:
1px
solid
#d1d1d1
;
width
:
100%
;
height
:
200px
;
overflow
:
auto
}
.comCheckHotel
>
div
:last-child
{
width
:
230px
;
border
:
none
;
}
.comCk_list
{
cursor
:
pointer
;
padding
:
0
20px
;
...
...
@@ -42,21 +36,24 @@
<
template
>
<div>
<div
class=
"cm_hotelTitle"
>
酒店信息
</div>
<div
class=
"cm_hotelTitle"
>
<el-select
filterable
v-model=
"selHotelId"
@
change=
"getChangeHotel(selHotelId)"
:placeholder=
"$t('pub.pleaseSel')"
>
<el-option
label=
"不限"
:value=
'0'
></el-option>
<el-option
v-for=
"item in ProvinceList"
:label=
'item.Name'
:value=
'item.ID'
:key=
'item.ID'
>
</el-option>
</el-select>
酒店信息
</div>
<div>
<el-tabs
v-model=
"activeName"
type=
"card"
@
tab-click=
"handleClick"
>
<el-tab-pane
:label=
"item.ProvinceName"
v-for=
"item in dataList"
></el-tab-pane>
</el-tabs>
</div>
<div
class=
"clearfix comCheckHotel"
>
<div>
<div
class=
"comCk_list"
v-for=
"(item,index) in dataList"
:class=
"
{'ckedList':ckindexOne==index}" @click="getCityList(item),ckindexOne=index">
{{
item
.
ProvinceName
}}
</div>
</div>
<div>
<div
class=
"comCk_list"
v-for=
"(item,index) in cityList"
:class=
"
{'ckedList':ckindexTwo==index}" @click="getHotelList(item),ckindexTwo=index">
{{
item
.
CityName
}}
</div>
</div>
<div>
<div
class=
"comCk_list"
v-for=
"item in HotelList"
>
<input
type=
"checkbox"
v-model=
"item.isChecked"
@
click=
"getCheck(item)"
style=
""
/>
<div
class=
"comCk_list"
v-for=
"(item,index) in HotelList"
>
<input
type=
"checkbox"
v-model=
"item.isChecked"
@
click=
"getCheck(item,index)"
style=
""
/>
{{
item
.
Name
}}
<span
class=
"cm_Inventory"
>
{{
item
.
Inventory
}}
</span>
</div>
</div>
...
...
@@ -66,21 +63,22 @@
</
template
>
<
script
>
export
default
{
// props:["sDate"],
data
()
{
return
{
dataList
:[],
cityList
:[],
HotelList
:[],
ckindexOne
:
-
1
,
ckindexTwo
:
-
1
,
ID
:
0
,
HotelName
:
''
HotelName
:
''
,
ProvinceList
:[],
selHotelId
:
0
,
activeName
:
''
,
};
},
methods
:
{
getCheckHotel
(
sDate
){
this
.
$forceUpdate
();
this
.
apipost
(
'hotel_post_GetHasStockHotelList_V2'
,
{
//1-只查询有库存的酒店
IsMoreThanZero
:
0
,
...
...
@@ -88,52 +86,86 @@ export default {
IsAllHotel
:
1
,
sDate
:
sDate
},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
dataList
=
res
.
data
.
data
;
this
.
dataList
.
forEach
(
x
=>
{
x
.
cityList
.
forEach
(
y
=>
{
y
.
HotelList
.
forEach
(
z
=>
{
z
.
isChecked
=
false
;
})
})
})
console
.
log
(
this
.
dataList
,
'子组件'
);
x
.
HotelList
.
forEach
(
y
=>
{
y
.
isChecked
=
false
;
})
})
console
.
log
(
this
.
dataList
,
'datalist'
);
}
else
{
this
.
Error
(
res
.
data
.
message
)
}
},
err
=>
{})
},
getCityList
(
item
){
this
.
cityList
=
item
.
cityList
;
this
.
HotelList
=
[];
},
getHotelList
(
item
){
this
.
HotelList
=
item
.
HotelList
;
},
getCheck
(
item
){
this
.
HotelList
.
forEach
(
x
=>
{
getCheck
(
item
,
index
){
this
.
HotelList
.
forEach
((
x
,
subIndex
)
=>
{
if
(
index
==
subIndex
){
x
.
isChecked
=
!
x
.
isChecked
;
}
else
{
x
.
isChecked
=
false
;
}
})
item
.
isChecked
=
!
item
.
isChecked
;
this
.
$forceUpdate
();
},
//向父组件传递选中酒店
sendCkedHotel
(){
console
.
log
(
this
.
dataList
,
'重选'
)
;
this
.
dataList
.
forEach
(
x
=>
{
x
.
cityList
.
forEach
(
y
=>
{
y
.
HotelList
.
forEach
(
z
=>
{
if
(
z
.
isChecked
){
this
.
ID
=
z
.
ID
;
this
.
HotelName
=
z
.
Name
;
}
})
}
)
var
ckHotelObj
=
{}
;
this
.
HotelList
.
forEach
((
x
,
index
)
=>
{
if
(
x
.
isChecked
)
{
ckHotelObj
.
ID
=
x
.
ID
;
ckHotelObj
.
Address
=
x
.
Address
;
ckHotelObj
.
Inventory
=
x
.
Inventory
;
ckHotelObj
.
Name
=
x
.
Name
;
ckHotelObj
.
PayStyle
=
x
.
PayStyle
;
ckHotelObj
.
Tel
=
x
.
Tel
;
}
})
this
.
$emit
(
"childHotel"
,
this
.
ID
,
this
.
HotelName
);
this
.
$emit
(
"childHotel"
,
ckHotelObj
);
},
//获取日本下面的市->下拉框用
getProvinceList
(){
let
msg
=
{
Id
:
651
};
this
.
apipost
(
"dict_post_Destination_GetChildList"
,
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
){
this
.
ProvinceList
=
res
.
data
.
data
;
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
},
err
=>
{}
);
},
getChangeHotel
(
id
){
let
msg
=
{
Province
:
id
}
this
.
apipost
(
"hotel_post_GetHasStockHotelList_V2"
,
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
){
this
.
dataList
=
res
.
data
.
data
;
this
.
HotelList
=
[];
this
.
dataList
.
forEach
(
x
=>
{
x
.
HotelList
.
forEach
(
y
=>
{
y
.
isChecked
=
false
;
})
})
console
.
log
(
this
.
dataList
,
'dataList'
);
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
},
err
=>
{}
);
},
handleClick
()
{
this
.
HotelList
=
this
.
dataList
[
this
.
activeName
].
HotelList
;
}
},
mounted
(){
mounted
()
{
}
};
...
...
src/components/dmc/manager/dmcTotalTable.vue
View file @
98415b11
...
...
@@ -190,7 +190,7 @@
</td>
<td>
<div
class=
"link"
>
<p
@
click=
"goUrlT('productQuery',item.TCNUMS,'产品查询')"
>
{{
item
.
TCNUMS
}}
</p>
<p
@
click=
"goUrlT('productQuery',item.TCNUMS,'产品查询')"
>
{{
item
.
TCNUMS
}}
(
{{
item
.
TCID
}}
)
</p>
</div>
</td>
<td>
...
...
@@ -390,9 +390,17 @@
style=
"background:#00C6FF; border-color:#00C6FF"
></el-button>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"联系OP"
placement=
"top-start"
>
<el-button
@
click=
'openChart(item)'
icon=
"iconfont icon-
dianhua
"
type=
"primary"
<el-button
@
click=
'openChart(item)'
icon=
"iconfont icon-
wechat
"
type=
"primary"
style=
"background:#6DD875; border-color:#6DD875"
></el-button>
</el-tooltip>
<el-tooltip
v-if=
"item.LineId==14 && item.IsOpenHotel==0"
class=
"item"
effect=
"dark"
content=
"关闭酒店操作"
placement=
"top-start"
>
<el-button
@
click=
"SetIsOpenHotelService(1,item.TCID)"
style=
"background:#E95252; border-color:#E95252"
icon=
"iconfont icon-suo"
type=
"primary"
></el-button>
</el-tooltip>
<el-tooltip
v-if=
"item.LineId==14 && item.IsOpenHotel==1"
class=
"item"
effect=
"dark"
content=
"开启酒店操作"
placement=
"top-start"
>
<el-button
icon=
"iconfont icon-suo1"
type=
"primary"
style=
"background:green; border-color:green"
@
click=
"SetIsOpenHotelService(0,item.TCID)"
></el-button>
</el-tooltip>
</el-button-group>
</div>
</td>
...
...
@@ -522,10 +530,24 @@
saveRemark
()
{
this
.
apipost
(
'dmcstatistics_post_SetDMCRemark'
,
this
.
NumObj
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
$message
.
success
(
res
.
data
.
message
)
this
.
getList
()
this
.
$message
.
success
(
res
.
data
.
message
)
;
this
.
getList
()
;
}
else
{
this
.
$message
.
error
(
res
.
data
.
message
)
this
.
$message
.
error
(
res
.
data
.
message
);
}
},
err
=>
{})
},
//开启关闭酒店操作
SetIsOpenHotelService
(
status
,
TCID
)
{
this
.
apipost
(
'dmcstatistics_post_SetIsOpenHotelService'
,
{
TCID
:
TCID
,
status
:
status
},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
$message
.
success
(
res
.
data
.
message
);
this
.
getList
();
}
else
{
this
.
$message
.
error
(
res
.
data
.
message
);
}
},
err
=>
{})
},
...
...
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @
98415b11
...
...
@@ -34,7 +34,7 @@
:TCNUM=
"TCNUM"
id=
"firstAnchor"
:LineList=
"LineList"
></TravelConfig>
<TravelDaysTripDirect
id=
"secondAnchor"
@
headCallBack=
"getDaysTrip"
:NoticeParameters=
"NoticeParameters"
:subConfig=
"journeyList"
:isOpenGroup=
"false"
:IsDirect=
"PostConfig.IsDirect"
v-bind:AllCityList=
"AllCityList"
v-bind:StartCity=
"StartCity"
:UseTypeArray=
"UseTypeArray"
:AirPickUp=
"AirPickUp"
:AirSend=
"AirSend"
@
change=
"handlerChangeData"
:TeamType=
"TeamType"
></TravelDaysTripDirect>
v-bind:StartCity=
"StartCity"
:UseTypeArray=
"UseTypeArray"
:AirPickUp=
"AirPickUp"
:AirSend=
"AirSend"
@
change=
"handlerChangeData"
:TeamType=
"TeamType"
:IsOpenHotel=
"PostConfig.IsOpenHotel"
></TravelDaysTripDirect>
<TravelFeature
ref=
"TravelFeature"
id=
"thirdAnchor"
@
featureCallBack=
"getFeature"
:FeatureData=
"FeatureData"
:TeamType=
"TeamType"
:isNewConfig=
"isNewConfig"
@
unlockFormCommit=
"unlockFormCommit"
></TravelFeature>
<TravelNotice
ref=
"TravelNotice"
id=
"fourAnchor"
@
headCallBack=
"getNotice"
:subArray=
"NoticeParameters"
...
...
@@ -125,6 +125,7 @@
//是否更新酒店库存
IsUpdateHotel
:
0
,
OpenTeamDescribe
:
""
,
//开团备注
IsOpenHotel
:
0
,
//0可以添加删除酒店,1-不能修改酒店信息
},
//行程
FeatureData
:
{
...
...
@@ -652,6 +653,7 @@
//视频地址
this
.
PostConfig
.
VideoStr
=
tempData
.
VideoStr
;
this
.
PostConfig
.
OpenTeamDescribe
=
tempData
.
OpenTeamDescribe
;
this
.
PostConfig
.
IsOpenHotel
=
tempData
.
IsOpenHotel
;
this
.
NoticeParameters
.
ConfigId
=
tempData
.
ConfigId
;
this
.
NoticeParameters
.
CountryID
=
tempData
.
CountryID
;
...
...
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @
98415b11
...
...
@@ -864,10 +864,14 @@
</template>
</table>
<div
slot=
"footer"
class=
"dialog-footer"
>
<button
class=
"normalBtn"
type=
"primary"
@
click=
"saveHoteluseDetail()"
<button
class=
"normalBtn"
type=
"primary"
@
click=
"saveHoteluseDetail()"
v-if=
"!(priceData.IsOpenHotel&&priceData.IsOpenHotel==1)"
:class=
"{'disClick':!isSaved}"
>
{{btnText}}
</button>
<button
class=
"hollowFixedBtn"
:class=
"{'disClick':!isSaved}"
@
click=
"cancelHotelUseDetail()"
>
{{$t('pub.cancelBtn')}}
</button>
<
template
v-if=
"priceData.IsOpenHotel&&priceData.IsOpenHotel==1"
>
<br/>
<span
style=
"color:red;font-weight:bold;"
>
※ 地接已关闭酒店操作,如需修改请联系地接OP.
</span>
</
template
>
</div>
</el-dialog>
...
...
src/components/newTravelmanager/travelLineTrip/HotelTrip.vue
View file @
98415b11
...
...
@@ -104,12 +104,13 @@
v-model=
"HotelChooseArray"
multiple
:multiple-limit=
"TeamType==0?3:1"
@
visible-change=
"getHotelList($event)"
@
change=
"changeHotelList()"
filterable
placeholder=
"请选择"
>
filterable
placeholder=
"请选择"
:disabled=
"IsOpenHotel==1?true:false"
>
<el-option
v-for=
"item in QHotelList"
:label=
"item.Name"
:value=
"item.ID"
:key=
"item.ID"
>
<span
style=
"float: left"
>
{{
getHotelItemLabel
(
item
)
}}
</span>
<span
style=
"float: right; color: #8492a6; font-size: 13px"
>
{{
item
.
Inventory
}}
</span>
</el-option>
</el-select>
<span
style=
"color:red;font-weight:bold;"
v-if=
"IsOpenHotel==1"
>
※ 地接已关闭酒店操作,如需修改请联系地接OP.
</span>
<span
v-if=
"dayObj.isRead&&IsDirect==1"
>
<span
v-for=
"item in hotelArray"
>
{{
item
.
HotelName
}}
...
...
@@ -129,7 +130,9 @@
</
template
>
<
script
>
export
default
{
props
:
[
"dayObj"
,
"DayList"
,
"CurrentIndex"
,
"WarmTripDescribe"
,
"IsDirect"
,
"subConfig"
,
"TeamType"
],
props
:
[
"dayObj"
,
"DayList"
,
"CurrentIndex"
,
"WarmTripDescribe"
,
"IsDirect"
,
"subConfig"
,
"TeamType"
,
"IsOpenHotel"
//0可以添加删除酒店,1-不能修改酒店信息
],
data
()
{
return
{
QHotelList
:
[],
...
...
src/components/newTravelmanager/travelLineTrip/TravelDaysTrip_Direct.vue
View file @
98415b11
...
...
@@ -147,6 +147,7 @@
v-bind:subConfig=
"subConfig"
@
change=
"handlerChangeDateList"
:TeamType=
"TeamType"
:IsOpenHotel=
"IsOpenHotel"
></travelDaysTrip>
</div>
</div>
...
...
@@ -170,7 +171,8 @@
"AirPickUp"
,
"AirSend"
,
"NoticeParameters"
,
"TeamType"
"TeamType"
,
"IsOpenHotel"
//0可以添加删除酒店,1-不能修改酒店信息
],
data
()
{
return
{
...
...
src/components/newTravelmanager/travelLineTrip/travelDaysTrip.vue
View file @
98415b11
...
...
@@ -229,7 +229,7 @@
</div>
</div>
<hotelTrip
:dayObj=
"dayObj"
:CurrentIndex=
"CurrentIndex"
:DayList=
"DayList"
:WarmTripDescribe=
"WarmTripDescribe"
:IsDirect=
"NoticeParameters.IsDirect"
:subConfig=
"subConfig"
:TeamType=
"TeamType"
></hotelTrip>
:IsDirect=
"NoticeParameters.IsDirect"
:subConfig=
"subConfig"
:TeamType=
"TeamType"
:IsOpenHotel=
"IsOpenHotel"
></hotelTrip>
<div
class=
"TD_OperaContent"
>
<div
class=
"TD_ComIcon"
>
<i
v-if=
"!dayObj.isRead"
class=
"iconfont icon-chakan"
@
click=
"getRead"
></i>
...
...
@@ -277,7 +277,8 @@
"DayList"
,
//线路行程
"NoticeParameters"
,
"subConfig"
,
"TeamType"
"TeamType"
,
"IsOpenHotel"
//0可以添加删除酒店,1-不能修改酒店信息
],
data
()
{
return
{
...
...
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