Skip to content

S
SuperMan
Commit f1c84b9a authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent d5a17619
Show whitespace changes
Inline Side-by-side
Showing with 285 additions and 205 deletions
src/components/Hotel/roomQuery.vue
View file @ f1c84b9a
......@@ -381,7 +381,6 @@
});
}
this.dataList = sourceData;
console.log("this.dataList",this.dataList)
} else {
this.$message.error(res.data.message)
}
......
src/components/Restaurant/RestaurantSalesBoard.vue
View file @ f1c84b9a
<style>
/* 日期样式开始 */
.RestaurantSalesBoard .month ul {
.RestaurantSalesBoard .month ul {
border-radius: 4px 4px 0 0;
width: 100%;
height: 50px;
......@@ -9,47 +9,56 @@
margin: 0;
padding: 0;
text-align: center;
}
.RestaurantSalesBoard .year-month {
}
.RestaurantSalesBoard .year-month {
flex-direction: column;
align-items: center;
justify-content: space-around;
}
.RestaurantSalesBoard .year-month > input {
}
.RestaurantSalesBoard .year-month>input {
width: 100px;
float: left;
}
.RestaurantSalesBoard .arrow {
}
.RestaurantSalesBoard .arrow {
padding: 10px;
font-style: normal;
cursor: pointer;
}
.RestaurantSalesBoard .monthminus {
}
.RestaurantSalesBoard .monthminus {
position: absolute;
left: 0px;
top: 15px;
}
.RestaurantSalesBoard .monthadd {
}
.RestaurantSalesBoard .monthadd {
position: absolute;
right: 21px;
top: 15px;
}
.RestaurantSalesBoard .month ul li {
}
.RestaurantSalesBoard .month ul li {
font-size: 18px;
color: #fff;
position: relative;
display: inline-block;
letter-spacing: 3px;
}
.RestaurantSalesBoard .month ul li i {
}
.RestaurantSalesBoard .month ul li i {
font-size: 22px;
color: #ff7e7e;
cursor: pointer;
}
.RestaurantSalesBoard .month ul li > input {
}
.RestaurantSalesBoard .month ul li>input {
text-align: center;
}
.RestaurantSalesBoard .weekdays {
}
.RestaurantSalesBoard .weekdays {
margin: 0;
padding: 3px 0;
background-color: #3fa783;
......@@ -58,14 +67,15 @@
flex-wrap: wrap;
color: #fff;
justify-content: space-around;
}
.RestaurantSalesBoard .weekdays li {
}
.RestaurantSalesBoard .weekdays li {
display: inline-block;
width: 14.2857%;
text-align: center;
}
}
.RestaurantSalesBoard .days {
.RestaurantSalesBoard .days {
width: 100%;
padding: 0;
margin: 0;
......@@ -73,8 +83,9 @@
flex-wrap: wrap;
box-sizing: border-box;
justify-content: space-around;
}
.RestaurantSalesBoard .days > li {
}
.RestaurantSalesBoard .days>li {
list-style-type: none;
width: 14.2857%;
height: 140px;
......@@ -86,22 +97,24 @@
box-sizing: border-box;
border-right: 1px solid #ddd;
border-bottom: 1px solid #ddd;
}
.RestaurantSalesBoard .days li > div {
}
.RestaurantSalesBoard .days li>div {
height: 112px;
width: 100%;
overflow-y: auto;
text-align: left;
}
.RestaurantSalesBoard .days li > div > p {
}
.RestaurantSalesBoard .days li>div>p {
border-bottom: 1px dashed #ccc;
height: 28px;
line-height: 28px;
width: 100%;
text-indent: 10px;
}
}
.RestaurantSalesBoard .currentInput {
.RestaurantSalesBoard .currentInput {
width: 120px;
height: 30px;
border-radius: 17px;
......@@ -110,8 +123,9 @@
color: #fff;
background: transparent;
font-size: 18px;
}
.RestaurantSalesBoard .days li .other-month {
}
.RestaurantSalesBoard .days li .other-month {
display: inline-block;
position: absolute;
right: 0;
......@@ -122,9 +136,9 @@
line-height: 17px;
background-color: #cccccc;
color: #fff;
}
}
.RestaurantSalesBoard .ckStyle {
.RestaurantSalesBoard .ckStyle {
width: 100%;
height: 28px;
line-height: 28px;
......@@ -133,25 +147,27 @@
font-weight: bold;
background: #ccc;
color: #000;
}
}
.RestaurantSalesBoard .ckStyleOther {
.RestaurantSalesBoard .ckStyleOther {
background: #dddddd !important;
font-weight: normal !important;
color: #999;
}
}
.RestaurantSalesBoard .Owe_Room {
.RestaurantSalesBoard .Owe_Room {
color: #e95252;
}
.RestaurantSalesBoard .Used_room {
}
.RestaurantSalesBoard .Used_room {
color: #13b0ae;
}
.RestaurantSalesBoard .otherMoth {
}
.RestaurantSalesBoard .otherMoth {
background: #f2f2f2;
}
}
.RestaurantSalesBoard .title {
.RestaurantSalesBoard .title {
height: 14px;
line-height: 14px;
border-left: 3px solid #e95252;
......@@ -159,21 +175,27 @@
color: #333;
text-indent: 10px;
margin: 20px 0;
}
}
.RestaurantSalesBoard .hasStock_1 {
color: #FFFFFF;
background-color: #ff3737;
}
.RestaurantSalesBoard .hasStock_2 {
background-color: #ff99cc;
}
.RestaurantSalesBoard .hasStock_3 {
background-color: #bcd6ee;
}
.RestaurantSalesBoard .hasStock_4 {
background-color: #ffffff;
}
/* 日期样式结束*/
/* 日期样式结束*/
</style>
<template>
<div class="flexOne RestaurantSalesBoard">
......@@ -190,6 +212,7 @@
</li>
<li style="margin-right:50px;">
<button class="normalBtn" type="button" @click="GetHoltelInventory()">{{$t('pub.searchBtn')}}</button>
<button class="normalBtn" type="button" @click="DownLoadDinner()">下载</button>
</li>
</ul>
</div>
......@@ -201,12 +224,14 @@
<ul>
<li>
<i class="el-icon-caret-left monthminus" @click="currentYear-=1,getDateString(),initCalendar(dateString)"></i>
<input type="text" disabled="disabled" v-model="currentYear" class="currentInput" @input="getDateString(),initCalendar(dateString)">年
<input type="text" disabled="disabled" v-model="currentYear" class="currentInput"
@input="getDateString(),initCalendar(dateString)">年
<i class="el-icon-caret-right monthadd" @click="currentYear+=1,getDateString(),initCalendar(dateString)"></i>
</li>
<li>
<i class="el-icon-caret-left monthminus" @click="pickPre(currentYear,currentMonth)"></i>
<input type="text" disabled="disabled" v-model="currentMonth" class="currentInput" @input="getDateString(),initCalendar(dateString)">月
<input type="text" disabled="disabled" v-model="currentMonth" class="currentInput"
@input="getDateString(),initCalendar(dateString)">月
<i class="el-icon-caret-right monthadd" @click="pickNext(currentYear,currentMonth)"></i>
</li>
</ul>
......@@ -223,8 +248,9 @@
</ul>
<ul class="days clearfix" v-loading="msg.loading">
<li v-for="(dayItem,index) in days" :key="dayItem.index">
<p class="ckStyle" :class="{ckStyleOther:dayItem.day.getMonth()+1 != currentMonth}">{{dayItem.day.getDate()}}</p>
<div @click="goUrl('TicketManager',dayItem,'票务管理')" >
<p class="ckStyle" :class="{ckStyleOther:dayItem.day.getMonth()+1 != currentMonth}">{{dayItem.day.getDate()}}
</p>
<div>
<p v-for="item in dayItem.dayValue">
<span class="text_underLine">{{item.DinnerName}}（{{item.DiningNum}}）</span>
</p>
......@@ -270,17 +296,6 @@
} else if (type === 4) {
return 'hasStock_4'
}
},
goUrl(path, obj, name) {
// this.$router.push({
// path: path,
// query: {
// id: obj.AirLineTicketId,
// blank: "y",
// tab: name
// }
// });
},
//格式化日期
getDateString: function () {
......@@ -329,7 +344,7 @@
//点击获取酒店库存数据
GetHoltelInventory() {
this.msg.loading = true;
var that=this;
var that = this;
this.apipost(
"order_post_GetDinnerMonthStatistics",
this.msg,
......@@ -348,8 +363,8 @@
for (var j = 0; j < this.DayData.length; j++) {
if (this.DayData[j].Day == myDate) {
dayItem.dayValue = this.DayData[j].SubList;
this.DayData[j].SubList.forEach(sunItem=>{
that.TotalInventory=parseFloat(this.TotalInventory)+parseFloat(sunItem.DiningNum)
this.DayData[j].SubList.forEach(sunItem => {
that.TotalInventory = parseFloat(this.TotalInventory) + parseFloat(sunItem.DiningNum)
});
}
}
......@@ -370,6 +385,19 @@
},
err => {}
);
},
//餐厅下载
DownLoadDinner() {
this.msg.loading = true;
let qMsg = {
queryMsg: this.msg,
uid: this.getLocalStorage().EmployeeId
};
let fileName = "餐厅下载" + this.$commonUtils.getCurrentDate() + ".xls";
this.GetLocalFile("dinner_get_downloadDinner", qMsg, fileName,
res => {
this.msg.loading = false;
});
}
},
mounted() {
......
src/components/Restaurant/bookDinnerStatistics.vue
View file @ f1c84b9a
......@@ -22,6 +22,14 @@
<el-date-picker v-model='msg.EndDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
</span>
</li>
<li><span><em>餐厅</em>
<el-select v-model="msg.QDiningID" filterable :placeholder="$t('pub.pleaseSel')">
<el-option label="不限" :value='0'></el-option>
<el-option v-for="item in DiningList" :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
</span>
</li>
<li>
<input type="button" class="normalBtn" value="查询" @click="getList();resetPageIndex()" />
</li>
......@@ -175,7 +183,10 @@
EndDate: '',
currentPage: 1,
total: 0,
QDiningID: 0, //餐厅编号
},
//餐厅列表
DiningList: [],
LineList: [],
LineTeamList: [],
thLengthTitle: [],
......@@ -292,6 +303,20 @@
}
}, err => {})
},
//获取餐厅列表
GetDinnerList() {
this.DiningList = [];
this.apipost(
"dining_post_GetList", {
QCountry: 651,
},
res => {
if (res.data.resultCode == 1) {
this.DiningList = res.data.data;
}
}
);
}
},
mounted() {
let myDate = new Date();
......@@ -306,7 +331,8 @@
let height = window.innerHeight - 65 - 164;
this.boxHeight = height;
this.offsetwidth = width;
this.getList()
this.GetDinnerList();
this.getList();
},
}
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ f1c84b9a
......@@ -489,9 +489,13 @@
:href="domainManager().ViittoFileUrl+item.WordPath">{{$t('Operation.Op_downLoadword')}}</a>
</p>
<p class="travelnowrap" v-if="item.ClearOrderHour>0">
<span>已设定清位</span>
<span>同行清位时间</span>
<span class="TCL-greenType">{{item.ClearOrderHour}}小时</span>
</p>
<p class="travelnowrap" v-if="item.SaleClearOrderHour>0">
<span>销售清位时间</span>
<span class="TCL-greenType">{{item.SaleClearOrderHour}}小时</span>
</p>
<p v-if="item.LineID==14 && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
<el-popover width="980" trigger="click" popper-class="TC_HotelPop">
<commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj"
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ f1c84b9a
......@@ -151,7 +151,7 @@
<table border="0" cellspacing="1" cellpadding="0" class="dmcTotalTable" v-loading="loading">
<tr>
<th colspan="11">公司通用信息</th>
<th colspan="5">团队需求表</th>
<th colspan="6">团队需求表</th>
<th colspan="10">地接op操作</th>
</tr>
<tr>
......@@ -168,6 +168,7 @@
<th width="60">导游</th>
<th width="60">已开票</th>
<th width="60">分房表</th>
<th width="60">旅客名单</th>
<th width="60">出团<br />通知书</th>
<th width="60">导游<br />计划表</th>
<th width="60">领队<br />交接表</th>
......@@ -277,6 +278,9 @@
<span class="colorE95252" v-else>{{item.HouseResult=='-1'?"x":"O"}}</span>
</div>
</td>
<td>
<a style="text-decoration:underline;cursor:pointer;" title="点击下载旅客名单" @click="DownLoadGuestList(item)">旅客名单</a>
</td>
<td>
<div class="fz16 fbold linkspan">
<span @click="toTrip(item)" style="color: #4BCA81;" v-if="item.OutNotice==1">√</span>
......@@ -340,8 +344,10 @@
<span class="colorE95252" v-else>{{item.LeaderIsApply=='0'?"x":"O"}}</span>
</div>
</td>
<td :rowspan="2*outItem.PriceCommonList.length" v-if='index==0' >
<div class="fz16 fbold linkspan" @click="goUrlLeaderIsApply('TravelPassengerList3',item,outItem,'合团分房表')" v-if="outItem.PriceCommonList.length > 1">
<td :rowspan="2*outItem.PriceCommonList.length" v-if='index==0'>
<div class="fz16 fbold linkspan"
@click="goUrlLeaderIsApply('TravelPassengerList3',item,outItem,'合团分房表')"
v-if="outItem.PriceCommonList.length > 1">
<span style="color: #4BCA81;" v-if="item.LeaderIsApply==2">√</span>
<span class="colorE95252" v-else>{{item.LeaderIsApply=='0'?"x":"O"}}</span>
</div>
......@@ -477,7 +483,7 @@
<th>团号/时间</th>
<template v-for="(hItem,hIndex) in TeamHotelList">
<th>
{{hItem.TCNUM}}<br/>({{hItem.TCID}})
{{hItem.TCNUM}}<br />({{hItem.TCID}})
</th>
</template>
</tr>
......@@ -505,7 +511,7 @@
</td>
</tr>
<tr>
<td colspan="21" style="text-align: left!important;padding:0 20px;">
<td colspan="22" style="text-align: left!important;padding:0 20px;">
<div class="link">
<p @click="getJourney(item.ConfigID,item.Title)" style="padding-top:4px;">{{item.Title}}</p>
<div v-if="outItem.PriceCommonList[index].DMCNum && outItem.PriceCommonList[index].DMCNum!=''"
......@@ -843,8 +849,8 @@
'NewCombinationNum': outItem.NewCombinationNum,
'LeaderName': obj.LeaderName,
'GuideName': obj.GuideName,
'IsCombine':outItem.PriceCommonList.length>1,
'NewTCIDs':outItem.TCIDS,
'IsCombine': outItem.PriceCommonList.length > 1,
'NewTCIDs': outItem.TCIDS,
blank: 'y',
tab: title
}
......@@ -1017,6 +1023,23 @@
}
}, err => {})
},
//下载旅客名单
DownLoadGuestList(item) {
this.loading = true;
//导出报表
let msg = {
TCID: item.TCID
};
var fileName = "旅客名单.xls";
if (item.TCNUMS != null) {
fileName =
"【" + item.TCNUMS + "】旅客名单.xls";
}
this.GetLocalFile("travel_get_GetTravelGuestExport_V2", msg, fileName,
res => {
this.loading = false;
});
}
},
mounted() {
let myDate = new Date();
......
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