Skip to content

S
SuperMan
Commit 63b26a1a authored by zhengke's avatar zhengke
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 3501a178 908f9452
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 61 deletions
src/components/Hotel/GnHotelInfo.vue
View file @ 63b26a1a
......@@ -58,18 +58,19 @@
<div>
<div style="float:left;width:550px;">
<el-form-item :label="$t('ground.jiudianmingzi')">
<el-input type="text" v-model="addMsg.HotelRealName" maxlength="100" class="w300"></el-input>
<el-input type="text" v-model="addMsg.HotelRealName" maxlength="100" class="w300"
placeholder="请填写酒店名称:xx酒店"></el-input>
</el-form-item>
<el-form-item :label="$t('hotel.hotel_openplatform')">
<el-select v-model="chooseObj.openplatString" class='multiple_input w300' multiple
:placeholder="$t('pub.pleaseSel')">
placeholder="请选择开放平台">
<el-option v-for="item in dropdownObj.openplatformList" :key="item.ID" :label="item.Name"
:value="item.ID">
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('hotel.hotel_starlevel')">
<el-select class="w300" :placeholder="$t('pub.unlimitedSel')" v-model="addMsg.Star">
<el-select class="w300" v-model="addMsg.Star" placeholder="请选择酒店星级">
<el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option>
<el-option v-for="item in dropdownObj.starslevel" :key="item.ID" :label="item.Name"
:value="item.ID">
......@@ -77,8 +78,8 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('hotel.hotel_province')">
<el-select :placeholder="$t('ground.qingxuanzesheng')" filterable class='multiple_input w300'
v-model="addMsg.Province" @change="GetSubAreaList(addMsg.Province,2)">
<el-select placeholder="请选择所属省份" filterable class='multiple_input w300' v-model="addMsg.Province"
@change="GetSubAreaList(addMsg.Province,2)">
<el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option>
<el-option v-for="childItem in dropdownObj.ProvinceList" :key="childItem.ID" :label="childItem.Name"
:value="childItem.ID">
......@@ -86,8 +87,7 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('hotel.hotel_city')">
<el-select :placeholder="$t('ground.qingxuanzeshi')" filterable class='multiple_input w300'
v-model="addMsg.City">
<el-select placeholder="请选择所属城市" filterable class='multiple_input w300' v-model="addMsg.City">
<el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option>
<el-option v-for="childItem in dropdownObj.CityList" :key="childItem.ID" :label="childItem.Name"
:value="childItem.ID">
......@@ -95,7 +95,7 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('hotel.hotel_detailinfo')">
<el-input type="text" class="w300" v-model="addMsg.Address" size="small">
<el-input type="text" class="w300" v-model="addMsg.Address" size="small" placeholder="请填写详细地址">
<el-button slot="append" @click="getMapShow">地图</el-button>
</el-input>
</el-form-item>
......@@ -113,7 +113,7 @@
</div>
</div>
<el-form-item label="地址说明">
<el-input type="text" class="w300" v-model="addMsg.AddressDes" size="small">
<el-input type="text" class="w300" v-model="addMsg.AddressDes" size="small" placeholder="请填写详细地址">
</el-input>
</el-form-item>
<el-form-item label="标签">
......@@ -130,23 +130,6 @@
<div class="Gnhotel_Right">
<span class="resource-lititle">{{$t('hotel.hotel_imgintroduce')}}</span>
<div class="resource-list">
<!-- <div class="resource-imglist clearfix">
<div class="re-img" v-for="(item,index) in HotelImageArray" :key="item.subCode">
<img :src="item.ShowPath" />
<div class="imgzhe">
<div class="re-delte"><i @click.stop="showImg(item.ShowPath)" class="iconfont icon-img_cz"></i>
</div>
<div class="re-delte" @click="delImg(index)"><i class="iconfont icon-xingzhuang"></i></div>
<div class="re-delte" @click.stop="ExchangeImg(index,0)" v-if="index!=0&&item.ShowPath">
<i class="iconfont icon-zuoyi"></i>
</div>
<div class="re-delte" @click.stop="ExchangeImg(index,1)"
v-if="index!=HotelImageArray.length-1&&item.ShowPath">
<i class="iconfont icon-youyi"></i>
</div>
</div>
</div>
</div> -->
<div class="add-img">
<el-button type="primary" @click="isShowHotelImg=true" icon="el-icon-plus" circle></el-button>
</div>
......@@ -168,10 +151,10 @@
</template>
<template v-if="activeName==2">
<el-form-item label="开业时间">
<el-input placeholder="开业时间" class="w300" v-model="addMsg.HotelInfo.OpenTime"></el-input>
<el-input placeholder="2018年开业" class="w300" v-model="addMsg.HotelInfo.OpenTime"></el-input>
</el-form-item>
<el-form-item label="装修时间">
<el-input placeholder="装修时间" class="w300" v-model="addMsg.HotelInfo.DecorationTime"></el-input>
<el-input placeholder="2017年装修" class="w300" v-model="addMsg.HotelInfo.DecorationTime"></el-input>
</el-form-item>
<el-form-item label="房间数量">
<el-input placeholder="房间数量" class="w300" v-model="addMsg.RoomNumber"></el-input>
......@@ -180,7 +163,8 @@
<el-input placeholder="联系方式" class="w300" v-model="addMsg.Tel"></el-input>
</el-form-item>
<el-form-item label="酒店介绍">
<el-input type="textarea" class="w300" v-model="addMsg.HotelInfo.Into" :rows="9"></el-input>
<el-input type="textarea" class="w300" v-model="addMsg.HotelInfo.Into" :rows="9" placeholder="请填写酒店的介绍信息">
</el-input>
</el-form-item>
</template>
<template v-if="activeName==3">
......@@ -227,12 +211,15 @@
<el-button type="primary" @click="addTraffic()" style="float:right;margin:-53px 165px 50px 0"
icon="el-icon-plus" circle></el-button>
<div style="margin-top:60px;">
<div v-for="(item,index) in addMsg.TrafficInfo" :key="index"
style="position:relative;margin-bottom:20px;">
<el-input type="text" v-model="item.TTitle" class="w400" style="margin-bottom:10px;"
placeholder="地点名称">
</el-input>
<el-input type="text" v-model="item.TSubTitle" class="w400" placeholder="地点介绍"></el-input>
<div v-for="(item,index) in addMsg.TrafficInfo" :key="index" style="position:relative;margin-bottom:20px;">
<el-form-item label="地点名称">
<el-input type="text" v-model="item.TTitle" class="w400"
placeholder="比如:牛王庙地铁站">
</el-input>
</el-form-item>
<el-form-item label="地点介绍">
<el-input type="text" v-model="item.TSubTitle" class="w400" placeholder="比如:距离春熙路步行街2公里"></el-input>
</el-form-item>
<el-button type="danger" class="delTrafic" @click="delTraffic(index)" icon="el-icon-delete" circle>
</el-button>
</div>
......@@ -255,7 +242,7 @@
<div class="btn-list">
<span class="common-lefttit"></span>
<button class="save-Btn" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button>
<button class="cancel-Btn" @click="goUrl('HotelManagement')">{{$t('pub.cancelBtn')}}</button>
<button class="cancel-Btn" @click="goUrl('GnHotelManagement')">{{$t('pub.cancelBtn')}}</button>
</div>
<viewer :images="images" :options='imageOptions' @inited="inited" class="viewer" ref="viewer">
<img v-for="src in images" :src="src" :key="src">
......
src/components/Hotel/GnHotelManagement.vue
View file @ 63b26a1a
......@@ -227,14 +227,14 @@
<span>
<em>{{$t('system.quety_area')}}</em>
<el-select v-model="msg.QProvince" class="w150" filterable @change="getProvinceList(msg.QProvince,2)"
:placeholder="$t('hotel.hotel_province')">
:placeholder="$t('hotel.hotel_province')" clearable>
<el-option v-for="item in provinceList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
<el-select v-model="msg.QCity" class="w150" filterable @change="getProvinceList(msg.QCity,3)"
:placeholder="$t('hotel.hotel_city')">
:placeholder="$t('hotel.hotel_city')" clearable>
<el-option v-for="item in cityList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
<el-select v-model="msg.QDistrict" class="w150" filterable :placeholder="$t('hotel.hotel_area')">
</el-select >
<el-select v-model="msg.QDistrict" class="w150" style="display:none;" filterable clearable :placeholder="$t('hotel.hotel_area')">
<el-option v-for="item in district" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
</span>
......@@ -248,7 +248,7 @@
</el-select>
</span>
</li>
<li>
<li style="display:none;">>
<span>
<em>{{$t('ground.jiudianleixing')}}</em>
<el-select v-model="msg.HotelType" class="w210" :placeholder="$t('pub.unlimitedSel')">
......@@ -257,7 +257,7 @@
</el-select>
</span>
</li>
<li>
<li style="display:none;">
<span>
<em>{{$t('Operation.Op_price')}}</em>
<el-select v-model="msg.HotelPirceType" class="w210" :placeholder="$t('pub.unlimitedSel')">
......@@ -286,7 +286,7 @@
</ul>
</div>
<el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%;min-height:450px;"
@selection-change="handleSelectionChange">
@selection-change="handleSelectionChange" v-loading="loading">
<el-table-column type="selection" width="50px">
</el-table-column>
<el-table-column prop="Name" label="酒店名称">
......@@ -306,36 +306,38 @@
</el-table-column> -->
<el-table-column prop="TagList" label="标签">
<template slot-scope="scope">
<el-tag v-for="(item,index) in scope.row.TagList" size="small" style="margin-right:5px;" :key="index">{{item}}</el-tag>
<el-tag v-for="(item,index) in scope.row.TagList" size="small" style="margin-right:5px;" :key="index">{{item}}
</el-tag>
</template>
</el-table-column>
<el-table-column prop="UpdateName" label="修改人">
</el-table-column>
<el-table-column prop="UpdateTimeStr" label="修改时间">
<el-table-column prop="Tel" label="电话">
</el-table-column>
<el-table-column prop="Address" label="地址">
<template slot-scope="scope">
{{scope.row.ProvinceName}}-{{scope.row.CityName}}
</template>
</el-table-column>
<el-table-column prop="Tel" label="电话">
</el-table-column>
<el-table-column prop="HotelStatus" label="状态">
<template slot-scope="scope">
<span v-if="scope.row.HotelStatus==1" style="color:green;">上架</span>
<span v-if="scope.row.HotelStatus==2" style="color:red;">下架</span>
</template>
</el-table-column>
<el-table-column prop="UpdateName" label="修改人">
</el-table-column>
<el-table-column prop="UpdateTimeStr" label="修改时间">
</el-table-column>
<el-table-column label="操作" width="100">
<template slot-scope="scope">
<!-- <button @click="goSubInfo('GnHotelInfo',scope.row.ID)" class="hotelBtnMan">修改</button> -->
<!-- <button @click="goUrl('HotelProductManage',item)" class="hotelBtnMan">报价与库存</button> -->
<el-tooltip class="item" effect="dark" content="修改" placement="top">
<el-button @click="goSubInfo('GnHotelInfo',scope.row.ID)" type="primary" icon="el-icon-edit" circle></el-button>
<el-button @click="goSubInfo('GnHotelInfo',scope.row.ID)" type="primary" icon="el-icon-edit" circle>
</el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="房型" placement="top">
<el-button @click="goUrl('HotelProductManage',scope.row)" style="font-size:12px;" type="primary" icon="iconfont icon-shouye1-copy" circle></el-button>
<el-button @click="goUrl('HotelProductManage',scope.row)" style="font-size:12px;" type="primary"
icon="iconfont icon-shouye1-copy" circle></el-button>
</el-tooltip>
</template>
</el-table-column>
......@@ -390,25 +392,25 @@
ProductType: 2,
},
multipleSelection: [],
shelveMsg:{
HotelStatus:1, //1上架 2下架
HotelIds:''
shelveMsg: {
HotelStatus: 1, //1上架 2下架
HotelIds: ''
}
};
},
methods: {
//批量上下架
goShelves(type){
if(this.multipleSelection.length==0){
goShelves(type) {
if (this.multipleSelection.length == 0) {
this.Error('请选择酒店');
return
}
this.shelveMsg.HotelStatus=type;
this.shelveMsg.HotelStatus = type;
let Ids = [];
this.multipleSelection.forEach(x=>{
this.multipleSelection.forEach(x => {
Ids.push(x.ID);
})
this.shelveMsg.HotelIds=Ids.toString();
this.shelveMsg.HotelIds = Ids.toString();
this.apipost("hotel_post_SetHotelStatus",
this.shelveMsg,
res => {
......@@ -419,7 +421,7 @@
null
);
},
handleSelectionChange(val){
handleSelectionChange(val) {
this.multipleSelection = val;
},
handleCurrentChange(val) {
......
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