Commit 5209fd6f authored by 黄奎's avatar 黄奎

页面修改

parent 0599d826
...@@ -433,6 +433,7 @@ ...@@ -433,6 +433,7 @@
</div> </div>
</el-tooltip> </el-tooltip>
<div class="btnList"> <div class="btnList">
<template v-if="userInfo.RB_Group_id==2">
<button @click="goSubInfo('HotelInfo', item.ID)" class="hotelBtnMan"> <button @click="goSubInfo('HotelInfo', item.ID)" class="hotelBtnMan">
{{ $t("pub.updateMsg") }} {{ $t("pub.updateMsg") }}
</button> </button>
...@@ -445,7 +446,7 @@ ...@@ -445,7 +446,7 @@
</button> </button>
<br /> <br />
<button v-if="IsHotelPriceStock==1" style="width: 80px; margin-top: 10px" <button v-if="IsHotelPriceStock==1||userInfo.RB_Group_id!=2" style="width: 80px; margin-top: 10px"
@click="goUrl('HotelProductManage2', item)" class="hotelBtnMan"> @click="goUrl('HotelProductManage2', item)" class="hotelBtnMan">
{{ $t("ground.baojiayukucun") }} {{ $t("ground.baojiayukucun") }}
</button> </button>
...@@ -456,6 +457,19 @@ ...@@ -456,6 +457,19 @@
<template v-if="item.MaxFileDate&&item.MaxFileDate!=''"> <template v-if="item.MaxFileDate&&item.MaxFileDate!=''">
<span style="color:red">最近一次上传时间:{{item.MaxFileDate}}</span> <span style="color:red">最近一次上传时间:{{item.MaxFileDate}}</span>
</template> </template>
</template>
<template v-else>
<button @click="goSubInfo('HotelInfo', item.ID)" class="hotelBtnMan">
{{ $t("pub.updateMsg") }}
</button>
<button @click="CopyHotel(item.ID)" class="hotelBtnMan" v-if="userInfo.RB_Group_id == QjGroupId()">
复制
</button>
<button style="width: 80px; margin-top: 10px" @click="goUrl('HotelProductManage2', item)"
class="hotelBtnMan">
{{ $t("ground.baojiayukucun") }}
</button>
</template>
</div> </div>
</div> </div>
</div> </div>
......
This diff is collapsed.
...@@ -1301,25 +1301,15 @@ export default { ...@@ -1301,25 +1301,15 @@ export default {
if (this.outerVisible) { if (this.outerVisible) {
if (!blo) { if (!blo) {
this.addMsg.AirportList && this.addMsg.AirportList.forEach(x => { this.addMsg.AirportList && this.addMsg.AirportList.forEach(x => {
// x.Id=0,
// x.ProductId= 0//产品id
x.AirportId = x.AirportId ? x.AirportId : ''//机场id x.AirportId = x.AirportId ? x.AirportId : ''//机场id
// x.Lng= ''
// x.Lat= ''
x.Name = x.Name ? x.Name : ''//机场名称 包含IATA x.Name = x.Name ? x.Name : ''//机场名称 包含IATA
// x.Address= ''//详细地址
}) })
} }
this.layer_Departure_airport = res.data.data; this.layer_Departure_airport = res.data.data;
} else { } else {
this.addMsg.AirportList && this.addMsg.AirportList.forEach(x => { this.addMsg.AirportList && this.addMsg.AirportList.forEach(x => {
// x.Id=0,
// x.ProductId= 0//产品id
x.AirportId = x.AirportId ? x.AirportId : ''//机场id x.AirportId = x.AirportId ? x.AirportId : ''//机场id
// x.Lng= ''
// x.Lat= ''
x.Name = x.Name ? x.Name : ''//机场名称 包含IATA x.Name = x.Name ? x.Name : ''//机场名称 包含IATA
// x.Address= ''//详细地址
}) })
this.Departure_airport = res.data.data; this.Departure_airport = res.data.data;
} }
...@@ -1333,15 +1323,6 @@ export default { ...@@ -1333,15 +1323,6 @@ export default {
showImg: function (src) { showImg: function (src) {
this.images = [] this.images = []
this.images = JSON.parse(JSON.stringify(this.addMsg.ImageList)) this.images = JSON.parse(JSON.stringify(this.addMsg.ImageList))
// let srcArr = src.split('?')
// src = srcArr[0]
// let isExsit = false
// this.images.forEach(x => {
// if (x === src)
// isExsit = true
// })
// if (!isExsit)
// this.images.push(src)
this.$viewer.show() this.$viewer.show()
this.$viewer.view(this.images.indexOf(src)) this.$viewer.view(this.images.indexOf(src))
}, },
......
...@@ -226,15 +226,16 @@ ...@@ -226,15 +226,16 @@
/* 景区列表 */ /* 景区列表 */
</style> </style>
<template> <template>
<div class="flexOne scenicSpotList"> <div class="flexOne scenicSpotList">
<div class="query-box"> <div class="query-box">
<ul> <ul>
<li> <li>
<span class="hotel_name"> <span class="hotel_name">
<em>产品名称</em> <em>产品名称</em>
<el-input maxlength="50" clearable @keyup.native.enter="resetPageIndex(),selectResource()" v-model="msg.Name"> <el-input maxlength="50" clearable @keyup.native.enter="resetPageIndex(),selectResource()"
v-model="msg.Name">
</el-input> </el-input>
</span> </span>
</li> </li>
...@@ -250,8 +251,7 @@ ...@@ -250,8 +251,7 @@
<li> <li>
<button class="hollowFixedBtn" type="button" <button class="hollowFixedBtn" type="button"
@click="resetPageIndex(),selectResource()">{{$t('pub.searchBtn')}}</button> @click="resetPageIndex(),selectResource()">{{$t('pub.searchBtn')}}</button>
<button class="normalBtn" type="button" <button class="normalBtn" type="button" @click="goUrl('CharteringInfoManage')">{{$t('pub.addBtn')}}</button>
@click="goUrl('CharteringInfoManage')">{{$t('pub.addBtn')}}</button>
<!-- <button class="hollowFixedBtn" type="button" @click="DownLoadFile()">{{$t('adm.adm_download')}}</button> --> <!-- <button class="hollowFixedBtn" type="button" @click="DownLoadFile()">{{$t('adm.adm_download')}}</button> -->
</li> </li>
</ul> </ul>
...@@ -304,8 +304,8 @@ ...@@ -304,8 +304,8 @@
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage"
:page-size="msg.pageSize" layout="total,prev, pager, next, jumper" :total="msg.total"></el-pagination> :page-size="msg.pageSize" layout="total,prev, pager, next, jumper" :total="msg.total"></el-pagination>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
...@@ -357,12 +357,13 @@ ...@@ -357,12 +357,13 @@
}, },
methods: { methods: {
// 上下架 // 上下架
clickShelf(item){ clickShelf(item) {
var that = this; var that = this;
let text let text
if(item.ProductState==1){ if (item.ProductState == 1) {
text = '下架' text = '下架'
}if(item.ProductState==2){ }
if (item.ProductState == 2) {
text = '上架' text = '上架'
} }
that.Confirm(`是否要${text}该包车产品?`, function () { that.Confirm(`是否要${text}该包车产品?`, function () {
...@@ -527,7 +528,7 @@ ...@@ -527,7 +528,7 @@
); );
}, },
goUrl(path, id) { goUrl(path, id) {
if(id){ if (id) {
this.$store.commit("pageConditionUpdate", this.msg); this.$store.commit("pageConditionUpdate", this.msg);
this.$router.push({ this.$router.push({
path: path, path: path,
...@@ -537,7 +538,7 @@ ...@@ -537,7 +538,7 @@
tab: '修改产品信息' tab: '修改产品信息'
} }
}); });
}else{ } else {
this.$router.push({ this.$router.push({
path: path, path: path,
query: { query: {
...@@ -549,7 +550,7 @@ ...@@ -549,7 +550,7 @@
} }
}, },
goUrlT(path, id,Name) { goUrlT(path, id, Name) {
let data = { let data = {
id: id, id: id,
Name: Name, Name: Name,
...@@ -594,18 +595,18 @@ ...@@ -594,18 +595,18 @@
this.msg = this.$store.state.pageCondition; this.msg = this.$store.state.pageCondition;
} }
} }
if(this.$route.query.StatisticsSTime){ if (this.$route.query.StatisticsSTime) {
this.msg.StatisticsSTime=this.$route.query.StatisticsSTime this.msg.StatisticsSTime = this.$route.query.StatisticsSTime
} }
if(this.$route.query.StatisticsETime){ if (this.$route.query.StatisticsETime) {
this.msg.StatisticsETime=this.$route.query.StatisticsETime this.msg.StatisticsETime = this.$route.query.StatisticsETime
} }
if(this.$route.query.type){ if (this.$route.query.type) {
if(this.$route.query.type==1){ if (this.$route.query.type == 1) {
this.msg.CreateBy =this.$route.query.EmployeeId; this.msg.CreateBy = this.$route.query.EmployeeId;
} }
if(this.$route.query.type==2){ if (this.$route.query.type == 2) {
this.msg.UpdateBy =this.$route.query.EmployeeId; this.msg.UpdateBy = this.$route.query.EmployeeId;
} }
} }
var id = this.$route.query.ID; var id = this.$route.query.ID;
...@@ -616,5 +617,4 @@ ...@@ -616,5 +617,4 @@
} }
}; };
</script> </script>
\ No newline at end of file
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