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
7ac3f95b
Commit
7ac3f95b
authored
Jun 13, 2019
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
1909916a
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
27 additions
and
12 deletions
+27
-12
TravelControlList.vue
...components/TravelManager/TravelList/TravelControlList.vue
+4
-1
dmcTotalTable.vue
src/components/dmc/manager/dmcTotalTable.vue
+4
-4
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/components/TravelManager/TravelList/TravelControlList.vue
View file @
7ac3f95b
...
...
@@ -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/dmc/manager/dmcTotalTable.vue
View file @
7ac3f95b
...
...
@@ -394,12 +394,12 @@
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
icon=
"iconfont icon-suo1"
type=
"primary"
@
click=
"SetIsOpenHotelService(1,item.TCID)"
style=
"background:#E95252; border-color:#E95252"
></el-button>
<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-suo"
type=
"primary"
style=
"background:green; border-color:green"
@
click=
"SetIsOpenHotelService(0,item.TCID)"
></el-button>
<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>
...
...
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @
7ac3f95b
...
...
@@ -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 @
7ac3f95b
...
...
@@ -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 @
7ac3f95b
...
...
@@ -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 @
7ac3f95b
...
...
@@ -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 @
7ac3f95b
...
...
@@ -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