Commit 7ac3f95b authored by 黄奎's avatar 黄奎

页面修改

parent 1909916a
...@@ -531,6 +531,9 @@ ...@@ -531,6 +531,9 @@
<span slot="reference" class="price" style="cursor:pointer;text-decoration:underline;">酒店预订状况</span> <span slot="reference" class="price" style="cursor:pointer;text-decoration:underline;">酒店预订状况</span>
</el-popover> </el-popover>
</p> </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> </div>
<div class="el-col" style="width:190px;"> <div class="el-col" style="width:190px;">
...@@ -1265,7 +1268,7 @@ ...@@ -1265,7 +1268,7 @@
}) })
} }
}); });
// console.log('this.queryCommonData', this.queryCommonData.dataList) console.log("this.queryCommonData.dataList",this.queryCommonData.dataList);
} }
}, },
err => {} err => {}
......
...@@ -394,12 +394,12 @@ ...@@ -394,12 +394,12 @@
style="background:#6DD875; border-color:#6DD875"></el-button> style="background:#6DD875; border-color:#6DD875"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip v-if="item.LineId==14 && item.IsOpenHotel==0" class="item" effect="dark" content="关闭酒店操作" placement="top-start"> <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)" <el-button @click="SetIsOpenHotelService(1,item.TCID)"
style="background:#E95252; border-color:#E95252"></el-button> style="background:#E95252; border-color:#E95252" icon="iconfont icon-suo" type="primary"
></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip v-if="item.LineId==14 && item.IsOpenHotel==1" class="item" effect="dark" content="开启酒店操作" placement="top-start"> <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" <el-button icon="iconfont icon-suo1" type="primary" style="background:green; border-color:green" @click="SetIsOpenHotelService(0,item.TCID)"></el-button>
style="background:green; border-color:green" @click="SetIsOpenHotelService(0,item.TCID)"></el-button>
</el-tooltip> </el-tooltip>
</el-button-group> </el-button-group>
</div> </div>
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
:TCNUM="TCNUM" id="firstAnchor" :LineList="LineList"></TravelConfig> :TCNUM="TCNUM" id="firstAnchor" :LineList="LineList"></TravelConfig>
<TravelDaysTripDirect id="secondAnchor" @headCallBack="getDaysTrip" :NoticeParameters="NoticeParameters" <TravelDaysTripDirect id="secondAnchor" @headCallBack="getDaysTrip" :NoticeParameters="NoticeParameters"
:subConfig="journeyList" :isOpenGroup="false" :IsDirect="PostConfig.IsDirect" v-bind:AllCityList="AllCityList" :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" <TravelFeature ref="TravelFeature" id="thirdAnchor" @featureCallBack="getFeature" :FeatureData="FeatureData" :TeamType="TeamType"
:isNewConfig="isNewConfig" @unlockFormCommit="unlockFormCommit"></TravelFeature> :isNewConfig="isNewConfig" @unlockFormCommit="unlockFormCommit"></TravelFeature>
<TravelNotice ref="TravelNotice" id="fourAnchor" @headCallBack="getNotice" :subArray="NoticeParameters" <TravelNotice ref="TravelNotice" id="fourAnchor" @headCallBack="getNotice" :subArray="NoticeParameters"
...@@ -125,6 +125,7 @@ ...@@ -125,6 +125,7 @@
//是否更新酒店库存 //是否更新酒店库存
IsUpdateHotel:0, IsUpdateHotel:0,
OpenTeamDescribe:"",//开团备注 OpenTeamDescribe:"",//开团备注
IsOpenHotel:0,//0可以添加删除酒店,1-不能修改酒店信息
}, },
//行程 //行程
FeatureData: { FeatureData: {
...@@ -652,6 +653,7 @@ ...@@ -652,6 +653,7 @@
//视频地址 //视频地址
this.PostConfig.VideoStr = tempData.VideoStr; this.PostConfig.VideoStr = tempData.VideoStr;
this.PostConfig.OpenTeamDescribe=tempData.OpenTeamDescribe; this.PostConfig.OpenTeamDescribe=tempData.OpenTeamDescribe;
this.PostConfig.IsOpenHotel=tempData.IsOpenHotel;
this.NoticeParameters.ConfigId = tempData.ConfigId; this.NoticeParameters.ConfigId = tempData.ConfigId;
this.NoticeParameters.CountryID = tempData.CountryID; this.NoticeParameters.CountryID = tempData.CountryID;
......
...@@ -864,10 +864,14 @@ ...@@ -864,10 +864,14 @@
</template> </template>
</table> </table>
<div slot="footer" class="dialog-footer"> <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> &nbsp; :class="{'disClick':!isSaved}">{{btnText}}</button> &nbsp;
<button class="hollowFixedBtn" :class="{'disClick':!isSaved}" <button class="hollowFixedBtn" :class="{'disClick':!isSaved}"
@click="cancelHotelUseDetail()">{{$t('pub.cancelBtn')}}</button> @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> </div>
</el-dialog> </el-dialog>
......
...@@ -104,12 +104,13 @@ ...@@ -104,12 +104,13 @@
v-model="HotelChooseArray" v-model="HotelChooseArray"
multiple :multiple-limit="TeamType==0?3:1" @visible-change="getHotelList($event)" multiple :multiple-limit="TeamType==0?3:1" @visible-change="getHotelList($event)"
@change="changeHotelList()" @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"> <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: left">{{ getHotelItemLabel(item) }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.Inventory }}</span> <span style="float: right; color: #8492a6; font-size: 13px">{{ item.Inventory }}</span>
</el-option> </el-option>
</el-select> </el-select>
<span style="color:red;font-weight:bold;" v-if="IsOpenHotel==1">※ 地接已关闭酒店操作,如需修改请联系地接OP.</span>
<span v-if="dayObj.isRead&&IsDirect==1"> <span v-if="dayObj.isRead&&IsDirect==1">
<span v-for="item in hotelArray"> <span v-for="item in hotelArray">
{{item.HotelName}} {{item.HotelName}}
...@@ -129,7 +130,9 @@ ...@@ -129,7 +130,9 @@
</template> </template>
<script> <script>
export default { export default {
props: ["dayObj", "DayList", "CurrentIndex", "WarmTripDescribe", "IsDirect", "subConfig","TeamType"], props: ["dayObj", "DayList", "CurrentIndex", "WarmTripDescribe", "IsDirect", "subConfig","TeamType",
"IsOpenHotel" //0可以添加删除酒店,1-不能修改酒店信息
],
data() { data() {
return { return {
QHotelList: [], QHotelList: [],
......
...@@ -147,6 +147,7 @@ ...@@ -147,6 +147,7 @@
v-bind:subConfig="subConfig" v-bind:subConfig="subConfig"
@change="handlerChangeDateList" @change="handlerChangeDateList"
:TeamType="TeamType" :TeamType="TeamType"
:IsOpenHotel="IsOpenHotel"
></travelDaysTrip> ></travelDaysTrip>
</div> </div>
</div> </div>
...@@ -170,7 +171,8 @@ ...@@ -170,7 +171,8 @@
"AirPickUp", "AirPickUp",
"AirSend", "AirSend",
"NoticeParameters", "NoticeParameters",
"TeamType" "TeamType",
"IsOpenHotel" //0可以添加删除酒店,1-不能修改酒店信息
], ],
data() { data() {
return { return {
......
...@@ -229,7 +229,7 @@ ...@@ -229,7 +229,7 @@
</div> </div>
</div> </div>
<hotelTrip :dayObj="dayObj" :CurrentIndex="CurrentIndex" :DayList="DayList" :WarmTripDescribe="WarmTripDescribe" <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_OperaContent">
<div class="TD_ComIcon"> <div class="TD_ComIcon">
<i v-if="!dayObj.isRead" class="iconfont icon-chakan" @click="getRead"></i> <i v-if="!dayObj.isRead" class="iconfont icon-chakan" @click="getRead"></i>
...@@ -277,7 +277,8 @@ ...@@ -277,7 +277,8 @@
"DayList", //线路行程 "DayList", //线路行程
"NoticeParameters", "NoticeParameters",
"subConfig", "subConfig",
"TeamType" "TeamType",
"IsOpenHotel" //0可以添加删除酒店,1-不能修改酒店信息
], ],
data() { data() {
return { return {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment