Skip to content

S
SuperMan
Commit 34ea3c9a authored by 罗超's avatar 罗超
Browse files
Options

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

parents 7f190f64 80e3cc0d
Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 52 deletions
src/components/Hotel/GnHotelInfo.vue
View file @ 34ea3c9a
......@@ -490,18 +490,6 @@
} else {
this.$viewer.view(this.images.indexOf(src))
}
// this.$viewer.show()
// this.images=[];
// let newArr = [];
// if(obj.ImgList && obj.ImgList.length>0){
// obj.ImgList.forEach(x=>{
// newArr.push(this.getIconLink(x.Path));
// })
// this.images= newArr;
// }
// console.log(this.images,'this.images');
// this.$viewer.show()
// this.$viewer.view(index)
},
//保存酒店信息
saveResource() {
......@@ -715,7 +703,6 @@
this.dropdownObj.CityList = res.data.data;
} else if(type==3){
this.dropdownObj.DistrictList = res.data.data;
console.log(res.data.data,'res.data.data');
}
});
}
......
src/components/Hotel/GnHotelManagement.vue
View file @ 34ea3c9a
......@@ -243,9 +243,10 @@
<li>
<span>
<em>{{$t('hotel.hotel_status')}}</em>
<el-select v-model="msg.Status" class="w210" :placeholder="$t('pub.unlimitedSel')">
<el-option :label="$t('pub.unlimitedSel')" value="-1"></el-option>
<el-option v-for="item in status" :key="item.value" :label="item.label" :value="item.value"></el-option>
<el-select v-model="msg.HotelStatus" class="w210" :placeholder="$t('pub.unlimitedSel')">
<el-option :label="$t('pub.unlimitedSel')" :value="-1"></el-option>
<el-option :key="1" label="上架" :value="1"></el-option>
<el-option :key="2" label="下架" :value="2"></el-option>
</el-select>
</span>
</li>
......@@ -300,19 +301,14 @@
</el-table-column>
<el-table-column prop="StarName" label="星级" width="100px">
</el-table-column>
<!-- <el-table-column prop="OpenPlatformList" label="开放平台">
<template slot-scope="scope">
<el-tag v-for="(item,index) in scope.row.OpenPlatformList" size="small" style="margin-right:5px;" :key="index">{{item.Name}}</el-tag>
</template>
</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>
</template>
</el-table-column>
<!-- <el-table-column prop="Tel" label="电话">
</el-table-column> -->
<el-table-column prop="Address" label="地址">
<template slot-scope="scope">
{{scope.row.ProvinceName}}
......@@ -330,6 +326,41 @@
<span v-if="scope.row.HotelStatus==2" style="color:red;">下架</span>
</template>
</el-table-column>
<el-table-column prop="RoomList" label="房型报价">
<template slot-scope="scope">
<el-popover placement="right" width="400" trigger="click">
<table>
<thead>
<tr>
<th style="width:40%">
房型名称
</th>
<th style="width:20%">
报价条数
</th>
<th style="width:40%">
日期
</th>
</tr>
</thead>
<tbody>
<tr v-for="(subItem,subIndex) in scope.row.RoomList">
<td>
{{subItem.Name}}
</td>
<td>
{{subItem.Days}}
</td>
<td>
{{subItem.LDate}}-{{subItem.HDate}}
</td>
</tr>
</tbody>
</table>
<el-button slot="reference">详情</el-button>
</el-popover>
</template>
</el-table-column>
<el-table-column prop="UpdateName" label="操作人">
</el-table-column>
<el-table-column prop="UpdateTimeStr" label="操作时间">
......@@ -392,7 +423,7 @@
QCountry: "2",
QProvince: "",
QCity: "",
Status: "0",
HotelStatus: 1,
HotelPirceType: "-1",
HotelType: "-1",
QDistrict: "",
......@@ -447,6 +478,9 @@
res => {
if (res.data.resultCode == 1) {
this.selectResource();
this.Success(res.data.message);
} else {
this.Error(res.data.message);
}
},
null
......
src/components/Hotel/HotelProductManage.vue
View file @ 34ea3c9a
......@@ -258,8 +258,15 @@
</el-switch>
</el-form-item>
<el-form-item label="是否有窗">
<el-switch v-model="addMsg.HasWindow" :active-value="1" :inactive-value="2">
</el-switch>
<el-select placeholder="是否有窗" class="w300" v-model="addMsg.HasWindow">
<el-option :key="1" label="有窗" :value="1">
</el-option>
<el-option :key="2" label="无窗" :value="2">
</el-option>
<el-option :key="3" label="部分有窗" :value="3">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="免费取消">
<el-switch v-model="addMsg.IsCancel" :active-value="2" :inactive-value="1">
......@@ -306,9 +313,9 @@
<th>床型/早餐</th>
<th>房间信息</th>
<th>是否可取消</th>
<!-- <th>{{$t('scen.sc_bjts')}}</th>
<th>{{$t('scen.sc_bjts')}}</th>
<th>{{$t('scen.sc_dj')}}</th>
<th>{{$t('scen.sc_gj')}}</th> -->
<th>{{$t('scen.sc_gj')}}</th>
<th>{{$t('hotel.hotel_remark')}}</th>
<th>{{$t('hotel.table_operat')}}</th>
</tr>
......@@ -342,7 +349,7 @@
<br /> {{item.CancelTime}} 前
</template>
</td>
<!-- <td class="DaysInfo">
<td class="DaysInfo">
<span><i class="iconfont icon-kaoqintongji"></i>{{item.Days}}{{$t('hotel.hotel_day')}}</span>
</td>
<td>
......@@ -357,7 +364,7 @@
<span class='tit_name HP'>{{item.HPrice}}</span>
</p>
<p class="Ldata">{{item.HDate}}</p>
</td> -->
</td>
<td>
<el-tooltip v-if="item.Description" class="item" effect="dark" :content="item.Description"
placement="top-start" popper-class="max-w250">
......@@ -443,6 +450,9 @@
}, {
Id: 4,
Name: '无早餐'
}, {
Id: 5,
Name: '早晚餐'
}],
//床型下拉
BedTypeList: [{
......
src/components/Restaurant/demesticRestaurantPackage.vue
View file @ 34ea3c9a
......@@ -538,7 +538,7 @@ import MyEdit from "@/components/EditTemplate.vue";
},
methods: {
changearr(){
console.log(this.UsageTimeListArr)
},
getList() {
this.loading = true;
......@@ -598,7 +598,6 @@ import MyEdit from "@/components/EditTemplate.vue";
"appletsmeal_post_Get",
msg,
res => {
console.log(res.data)
if (res.data.resultCode == 1) {
this.addMsg = res.data.data;
if(res.data.data.UsageTime){
......
src/components/Restaurant/demesticRestaurantPrice.vue
View file @ 34ea3c9a
......@@ -473,7 +473,7 @@
</el-form-item>
</div>
<div class="resDiv">
<el-form-item :label="$t('hotel.hotel_Supplier')" v-if="IsSelfBook" prop="Supplier">
<el-form-item :label="$t('hotel.hotel_Supplier')" >
<el-select v-model="addMsg.Supplier" class="w210" filterable :placeholder="$t('hotel.hotel_inputholder')">
<el-option :label='$t("hotel.hotel_inputholder")' :value='defaultSelect'></el-option>
<el-option v-for="item in SupplierList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
......
src/components/TravelManager/Lxy/addCar.vue
View file @ 34ea3c9a
......@@ -188,7 +188,6 @@
UploadImage2(file){
let that = this;
let newArr = [];
console.log(that.addMsg.ColorList[that.Picindex].PicList)
newArr.push(file.file);
let fileName = file.file.name;
var path = "/Upload/DMC/";
......
src/components/TravelManager/Lxy/addCarBrand.vue
View file @ 34ea3c9a
......@@ -84,7 +84,6 @@
},
//图片上传
UploadImage(file) {
console.log(file)
let newArr = [];
newArr.push(file.file);
let fileName = file.file.name;
......@@ -96,7 +95,6 @@
this.addMsg.BrandLogo = imgUrl
});
},
openChangeDig(num) {
this.changeState = true;
......
src/components/TravelManager/Lxy/addGuide.vue
View file @ 34ea3c9a
......@@ -207,14 +207,10 @@
}, res => {
this.loading = false;
this.addMsg = res.data.data;
// if (this.addMsg.Introduction && this.addMsg.Introduction != "") {
// this.defaultMsg = this.addMsg.Introduction;
// }
})
},
//图片上传
UploadImage(file) {
console.log(file)
let newArr = [];
newArr.push(file.file);
let fileName = file.file.name;
......
src/components/TravelManager/Lxy/directorGoodsEdit.vue
View file @ 34ea3c9a
......@@ -1369,13 +1369,11 @@
},
//图片上传
UploadImage(val,file) {
console.log(file)
let newArr = [];
newArr.push(file.file);
let fileName = file.file.name;
var path = "/Upload/DMC/";
this.UploadSelfFileT(path, newArr, x => {
console.log(x)
var str = x.data.FilePath;
var imgUrl = this.domainManager().ViittoFileUrl + x.data.FilePath;
if(val == 1){
......
src/components/TravelManager/customizedcar/carmanageList.vue
View file @ 34ea3c9a
......@@ -147,10 +147,7 @@
this.currentPage = 1
},
Edit(row){
console.log(row)
this.$router.push("/dzaddcar?obj="+encodeURIComponent(JSON.stringify(row)))
},
delete_b(row){
let that=this;
......
src/components/TravelManager/customizedcar/dzaddcar.vue
View file @ 34ea3c9a
......@@ -167,7 +167,6 @@
if(this.$route.query.obj){
var list = decodeURIComponent(this.$route.query.obj);
let data = JSON.parse(list)
console.log(data)
this.addMsg.Id = data.Id;
this.addMsg.CarName = data.CarName;
this.addMsg.CarType = data.CarType;
......@@ -252,7 +251,6 @@
},
//图片上传
UploadImage(file) {
console.log(file)
let newArr = [];
newArr.push(file.file);
let fileName = file.file.name;
......
src/components/TravelManager/customizedcar/dzlineList.vue
View file @ 34ea3c9a
......@@ -364,10 +364,7 @@
this.currentPage = 1
},
Edit(row){
console.log(row)
this.$router.push("/adddzline?ID="+row.Id)
},
baojia(row){
this.$router.push("/lineoffer?id="+row.Id+'&Price='+row.Price)
......
src/components/scenicSpot/domesticScenicSpotInfoManage.vue
View file @ 34ea3c9a
......@@ -1320,8 +1320,7 @@
},
methods: {
handleChange(value) {
console.log(value);
console.log(this.addMsg.FoodType);
},
//得到地图信息
mapEvent(e) {
......
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