Skip to content

S
SuperMan
Commit e8996745 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

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

parents 011e8c8b 2a896f40
Show whitespace changes
Inline Side-by-side
Showing with 119 additions and 97 deletions
src/components/Hotel/HotelQueryList.vue
View file @ e8996745
...@@ -23,13 +23,13 @@ ...@@ -23,13 +23,13 @@
</ul> </ul>
</div> </div>
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " class="HotelQueryList"> <div style="width: 100%;min-height:200px; overflow-x: auto;padding-bottom: 10px; " class="HotelQueryList" v-loading="loading">
<div class="hotelProductManage2_tableBox"> <div class="hotelProductManage2_tableBox">
<span style="color:#000000;background-color: #ff3737;padding:2px 4px;border-radius:5px" >红日</span> <span style="color:#000000;background-color: #ff3737;padding:2px 4px;border-radius:5px">红日</span>
<span style="color:#000000;background-color: #ff99cc;padding:2px 4px;border-radius:5px" >旺季</span> <span style="color:#000000;background-color: #ff99cc;padding:2px 4px;border-radius:5px">旺季</span>
<span style="color:#000000;background-color: #bcd6ee;padding:2px 4px;border-radius:5px" >平季</span> <span style="color:#000000;background-color: #bcd6ee;padding:2px 4px;border-radius:5px">平季</span>
<span style="color:#000000;background-color: #DDDDDD;padding:2px 4px;border-radius:5px">淡季</span> <span style="color:#000000;background-color: #DDDDDD;padding:2px 4px;border-radius:5px">淡季</span>
<span style="color:#000000;background-color: #02F78E;padding:2px 4px;border-radius:5px" >特别价</span> <span style="color:#000000;background-color: #02F78E;padding:2px 4px;border-radius:5px">特别价</span>
</div> </div>
<table border="0" cellspacing="1" cellpadding="0" class="HouseTypeList" v-if="isShow"> <table border="0" cellspacing="1" cellpadding="0" class="HouseTypeList" v-if="isShow">
<tr> <tr>
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<td v-for="(subItem,subIndex) in item.subList"> <td v-for="(subItem,subIndex) in item.subList">
<div class="Hotel_kong Com_hoteldiv" :class="getClass(subItem)"> <div class="Hotel_kong Com_hoteldiv" :class="getClass(subItem)">
{{subItem.CostPrice}}</div> {{subItem.CostPrice}}</div>
<div class="Hotel_kong Com_hoteldiv Hq_duoge" @click="GotoUrl(item,subIndex)"> <div class="Hotel_kong Com_hoteldiv Hq_duoge" @click="GotoUrl(item,subIndex,subItem.UseInventory)">
{{subItem.Inventory}}/{{subItem.UseInventory}}/{{subItem.RemainingInventory}}</div> {{subItem.Inventory}}/{{subItem.UseInventory}}/{{subItem.RemainingInventory}}</div>
<div class="Hotel_kong Com_hoteldiv"> <div class="Hotel_kong Com_hoteldiv">
<span v-if="subItem.UseInventory-subItem.Inventory>0" style="color:red;"> <span v-if="subItem.UseInventory-subItem.Inventory>0" style="color:red;">
...@@ -76,41 +76,44 @@ ...@@ -76,41 +76,44 @@
export default { export default {
data() { data() {
return { return {
msg:{ msg: {
HotelId:0, HotelId: 0,
StartDate: new Date().Format("yyyy-MM-dd"), StartDate: new Date().Format("yyyy-MM-dd"),
EndDate: this.setEdate(), EndDate: this.setEdate(),
}, },
HotelList: [], HotelList: [],
dataList: [], dataList: [],
isShow:false, isShow: false,
loading:false,
}; };
}, },
methods: { methods: {
GotoUrl(item,subIndex) GotoUrl(item, subIndex, UseInventory) {
{ if (UseInventory > 0) {
this.$router.push({ this.$router.push({
path: "TravelControlList", path: "TravelControlList",
query: { query: {
HotelId: item.HotelId, HotelId: item.HotelId,
HotelUseTime: item.subList[subIndex].DateStr, HotelUseTime: item.subList[subIndex].DateStr,
blank: "y", tab: "团控查询"
tab: name
} }
}); });
}
}, },
getList() { getList() {
this.loading=true;
if (this.msg.StartDate == null) { if (this.msg.StartDate == null) {
this.msg.StartDate = new Date().Format("yyyy-MM-dd") this.msg.StartDate = new Date().Format("yyyy-MM-dd")
} }
if (this.msg.EndDate == null) { if (this.msg.EndDate == null) {
this.msg.EndDate = this.setEdate() this.msg.EndDate = this.setEdate()
} }
this.apipost("dict_post_HotelOffer_GetHotelStatics",this.msg, this.apipost("dict_post_HotelOffer_GetHotelStatics", this.msg,
res => { res => {
this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.dataList = res.data.data; this.dataList = res.data.data;
this.isShow=true; this.isShow = true;
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
...@@ -133,7 +136,7 @@ ...@@ -133,7 +136,7 @@
err => {} err => {}
); );
}, },
setEdate(){ setEdate() {
return this.addMoth(new Date().Format("yyyy-MM-dd"), 1) return this.addMoth(new Date().Format("yyyy-MM-dd"), 1)
}, },
addMoth(d, m) { addMoth(d, m) {
...@@ -145,12 +148,12 @@ ...@@ -145,12 +148,12 @@
return d.toLocaleDateString().match(/\d+/g).join('-') return d.toLocaleDateString().match(/\d+/g).join('-')
}, },
//格式化返回显示日期 //格式化返回显示日期
getDateList(dateStr){ getDateList(dateStr) {
var str = dateStr.split('-'); var str = dateStr.split('-');
return str[1]+'/'+str[2]; return str[1] + '/' + str[2];
}, },
//获取星期几 //获取星期几
getWeek(dateStr){ getWeek(dateStr) {
var weekDay = ["天", "一", "二", "三", "四", "五", "六"]; var weekDay = ["天", "一", "二", "三", "四", "五", "六"];
var myDate = new Date(Date.parse(dateStr)); var myDate = new Date(Date.parse(dateStr));
return weekDay[myDate.getDay()] return weekDay[myDate.getDay()]
...@@ -158,8 +161,8 @@ ...@@ -158,8 +161,8 @@
//获取颜色状态 //获取颜色状态
getClass(subItem) { getClass(subItem) {
var classStr = ""; var classStr = "";
if(subItem.Status==0){ if (subItem.Status == 0) {
classStr='noKucun'; classStr = 'noKucun';
} }
switch (subItem.InventoryType) { switch (subItem.InventoryType) {
case 1: case 1:
...@@ -186,48 +189,60 @@ ...@@ -186,48 +189,60 @@
this.getList(); this.getList();
} }
}; };
</script> </script>
<style> <style>
.Hq_duoge{ .Hq_duoge {
cursor: pointer; cursor: pointer;
text-decoration: underline; text-decoration: underline;
} }
.classHong{
.classHong {
background-color: rgb(255, 55, 55); background-color: rgb(255, 55, 55);
} }
.classWang{
.classWang {
background-color: rgb(255, 153, 204); background-color: rgb(255, 153, 204);
} }
.classPing{
.classPing {
background-color: rgb(188, 214, 238); background-color: rgb(188, 214, 238);
} }
.classDan{
.classDan {
background-color: rgb(221, 221, 221); background-color: rgb(221, 221, 221);
} }
.classTe{
.classTe {
background-color: rgb(2, 247, 142); background-color: rgb(2, 247, 142);
} }
.HouseTypeList { .HouseTypeList {
background: #ccc; background: #ccc;
width:100%; width: 100%;
margin-top:20px; margin-top: 20px;
} }
.Com_hoteldiv{
min-width: 40px; .Com_hoteldiv {
min-width: 70px;
} }
.noKucun{
background-color: black!important; .noKucun {
background-color: black !important;
} }
.Hotel_kong{
width:100%; .Hotel_kong {
height:35px; width: 100%;
height: 35px;
line-height: 35px; line-height: 35px;
border-bottom:1px solid #d1d1d1; border-bottom: 1px solid #d1d1d1;
} }
.Hotel_kong:last-child{
border:0; .Hotel_kong:last-child {
border: 0;
} }
.HouseTypeList tr th { .HouseTypeList tr th {
background: #e6e6e6; background: #e6e6e6;
height: 35px; height: 35px;
...@@ -244,7 +259,9 @@ ...@@ -244,7 +259,9 @@
.HouseTypeList tr td { .HouseTypeList tr td {
font-size: 12px; font-size: 12px;
} }
.hotelProductManage2_tableBox span{
margin:0 10px 10px 0; .hotelProductManage2_tableBox span {
margin: 0 10px 10px 0;
} }
</style> </style>
src/components/scenicSpot/ticketManagement.vue
View file @ e8996745
...@@ -289,24 +289,29 @@ export default { ...@@ -289,24 +289,29 @@ export default {
); );
}, },
isDelete(ID) { isDelete(ID) {
var that = this; this.$confirm('是否删除?', '提示', {
that.Confirm("是否删除?", function() { confirmButtonText: '确定',
let msg = { cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$message({
type: 'success',
message: '删除成功!'
});
this.apipost('ticketcouponsticket_post_Remove', {
ID: ID ID: ID
}; }, res => {
this.apipost(
"ticketcouponsticket_post_Remove",
msg,
res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.Success(res.data.message); this.getList()
this.getList();
} else { } else {
this.Error(res.data.message);
} }
}, }, err => {
null })
); }).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
});
}); });
}, },
goUrl(path, id) { goUrl(path, id) {
......
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