Commit 77035c6f authored by huangyuanyuan's avatar huangyuanyuan
parents f75afc12 38f63ad8
......@@ -299,11 +299,13 @@
pageIndex: 1,
pageSize: 5,
currentPage: 1,
total: 0
total: 0,
OpType:0
},
postMsg: {
Id: 0,
TipContent: ''
TipContent: '',
OpType:0,
},
//默认显示弹窗信息
showHQinfo: true,
......
......@@ -95,11 +95,13 @@
.Supplier_AC_content .w757 {
width: 757px !important;
}
.Supplier_TouSu .el-textarea__inner{
height:300px;
}
</style>
<template>
<div class="Supplier_AC_content">
<div class="Supplier_AC_content Supplier_TouSu">
<div class="Supplier_AC_inputGroup">
<el-input placeholder="请输入团号/编号" class="w757" v-model="QMsg.TCID">
<el-button slot="append" @click="CheckTCID()">验证</el-button>
......@@ -133,9 +135,9 @@
<el-input type="textarea" style="margin-top:10px;" :rows="5" v-model="EditMsg.ComplainContent"
placeholder="具体问题描述"></el-input>
</div>
<p style="text-align: center; margin: 10px 0 15px 0;">
<p style="text-align: center; margin: 35px 0 15px 0;">
<input type="button" class="normalBtn" value="保存" @click="SaveData()" />
<input type="button" class="normalBtn" value="取消" />
<input type="button" class="normalBtn" value="取消" @click="goUrl('roomQuery2')" />
</p>
</div>
</template>
......@@ -260,6 +262,12 @@
this.Error(res.data.message);
}
}, err => {});
},
goUrl(path) {
this.$router.push({
path: path,
query: {}
});
}
},
created() {
......
......@@ -221,7 +221,7 @@
<template>
<div class="flexOne hotelmanagement">
<div class="query-box">
<ul>
<ul style="position:relative;">
<li>
<span class="hotel_name">
<em>{{$t('hotel.hotel_name')}}</em>
......@@ -274,7 +274,7 @@
</el-select>
</span>
</li>
<li>
<li style="position:absolute;top:0;right:10px;">
<button class="hollowFixedBtn" type="button" @click="resetPageIndex(),selectResource()">{{$t('pub.searchBtn')}}</button>
<button class="normalBtn" type="button" @click="goSubInfo('HotelInfo2')">{{$t('pub.addBtn')}}</button>
</li>
......
<template>
<div class="hotelProductManage2">
<div class="hotelProductManage2_btnList">
<div class="btn_check" @click="getMonths()">查询</div>
<div class="btn_check" @click="goEdit('1')">批量编辑</div>
</div>
<div class="hotelProductManage2" style="padding:20px;">
<div class="hotelProductManage2_condition">
<div>
<em>起始月</em>
<el-date-picker v-model="condition.month" type="month" value-format="yyyy-MM" :clearable="false"
placeholder="选择月"></el-date-picker>
</div>
<input type="button" class="normalBtn" value="查询" @click="getMonths()"/>
<input type="button" class="normalBtn" value="批量编辑" style="margin-right:10px;" @click="goEdit('1')"/>
</div>
<div class="hotelProductManage2_tableBox">
<table class="hotelProductManage2_table" border="0" cellspacing="0" cellpadding="0">
......@@ -29,8 +27,8 @@
</tbody>
</table>
</div>
<div class="hotelProductManage2_tableBox">
<span style="color:#000000;background-color: #ff3737;padding:2px 4px;border-radius:5px">红日</span>
<div style="margin-bottom:20px;">
<span style="color:#000000;background-color: #ff3737;padding:2px 4px;border-radius:5px;color:#fff;">红日</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: #DDDDDD;padding:2px 4px;border-radius:5px">淡季</span>
......@@ -268,7 +266,7 @@
</el-form>
</div>
<!-- 弹出编辑 -->
<div class="hotelProductManage2_edit" v-show="editShow">
<div class="hotelProductManage2_edit" v-show="editShow" style="left:0;">
<div class="hotelProductManage2_edit_header">
<div>报价管理</div>
<div>
......@@ -1152,10 +1150,6 @@
</script>
<style>
.hotelProductManage2 {
padding: 20px 0;
}
.hotelproductCkbox {
width: 10%;
height: 30px;
......
<template>
<div>
<div class="hotelQury2">
<div class="query-box" style="border-bottom: none;">
<ul>
<ul style="position:relative;">
<li>
<span>
<em>{{$t('system.quety_area')}}</em>
<em class="HQ_em">{{$t('system.quety_area')}}</em>
<el-select v-model="msg.Province" filterable @change="getProvinceList(msg.Province,2)"
:placeholder="$t('hotel.hotel_province')">
<el-option :key="0" :value="0" label="请选择"></el-option>
......@@ -17,7 +17,7 @@
</span>
</li>
<li>
<span><em>{{$t('admin.admin_company')}}</em>
<span><em class="HQ_em">{{$t('admin.admin_company')}}</em>
<el-select filterable v-model='msg.OutBranchId' :placeholder="$t('pub.unlimitedSel')">
<el-option :label="$t('pub.unlimitedSel')" :value='-1'></el-option>
<el-option v-for='item in companyList' :label='item.BName' :value='item.Id' :key="item.Id">
......@@ -27,8 +27,8 @@
</li>
<li>
<span>
<em>星级</em>
<el-select v-model="msg.Star" :placeholder="$t('pub.pleaseSel')">
<em class="HQ_em">星级</em>
<el-select v-model="msg.Star" class="w150" :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option label="3星或商务" :value='3'></el-option>
<el-option label="4星" :value='4'></el-option>
......@@ -38,7 +38,7 @@
</li>
<li>
<span>
<em>价格区间</em>
<em class="HQ_em">价格区间</em>
<el-select v-model="msg.PriceLevel" :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option label="5000以下" :value='1'></el-option>
......@@ -51,7 +51,7 @@
</el-select>
</span>
</li>
<li><span><em>日期</em>
<li><span><em class="HQ_em">日期</em>
<el-date-picker v-model='msg.StartDate' value-format="yyyy-MM-dd" type="date" :picker-options="beforeCheck">
</el-date-picker>
<el-date-picker v-model='msg.EndDate' value-format="yyyy-MM-dd" type="date" :picker-options="afterCheck">
......@@ -60,25 +60,25 @@
</li>
<li>
<span>
<em>酒店</em>
<em class="HQ_em">酒店</em>
<el-select v-model="msg.HotelChooseArray" :placeholder="$t('pub.pleaseSel')" class="multiple_input w300"
filterable multiple :multiple-limit="3">
<el-option v-for="item in HotelList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
</span>
</li>
<li>
<input type="button" class="normalBtn" value="温馨提示"
<li style="position:absolute;top:0;right:10px;">
<input type="button" class="normalBtn" style="padding:0 12px;margin-left:0" value="温馨提示"
@click="showNotice=true,resetPageIndex(),GetHotelTipList()" />
<input type="button" class="normalBtn" value="查询" @click="getList()" />
<input type="button" class="normalBtn" value="下载" @click="DownLoadHotelQuery()" />
<input type="button" class="normalBtn" value="查询" style="padding:0 12px;margin-left:5px" @click="getList()" />
<input type="button" class="normalBtn" value="下载" style="padding:0 12px;margin-left:5px" @click="DownLoadHotelQuery()" />
</li>
</ul>
</div>
<div style="width: 100%;min-height:200px; overflow-x: auto;padding:0 20px; " class="HotelQueryList"
v-loading="loading">
<div class="hotelProductManage2_tableBox" style="margin-bottom:20px;">
<div style="margin-bottom:20px;">
<span style="color:#fff;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: #bcd6ee;padding:2px 4px;border-radius:5px">平季</span>
......@@ -86,7 +86,7 @@
<span style="color:#000000;background-color: #02F78E;padding:2px 4px;border-radius:5px">特别价</span>
</div>
<template v-if="isShow">
<el-table v-if="dataList.length>0" :data="dataList" style="width:100%" border v-loading='loading' height="500">
<el-table v-if="dataList.length>0" :data="dataList" style="width:100%" border v-loading='loading' :height="tableHeight">
<el-table-column fixed label="酒店名称" min-width="180">
<template slot-scope="scope">
<div style="text-decoration: underline;cursor:pointer">
......@@ -136,7 +136,7 @@
</div>
<div class="combottomDiv HqCom_bottom" v-if="showNotice">
<div class="combottomDiv HqCom_bottom" v-if="showNotice" style="left:0;">
<el-form label-width="80px">
<el-row>
<el-col :span="20">
......@@ -253,6 +253,7 @@
//价格等级
PriceLevel: 0,
},
tableHeight:0,
beforeCheck: {
disabledDate: time => {
if (this.msg.StartDate) {
......@@ -287,11 +288,13 @@
pageIndex: 1,
pageSize: 5,
currentPage: 1,
total: 0
total: 0,
OpType:1,
},
postMsg: {
Id: 0,
TipContent: ''
TipContent: '',
OpType:1
},
//默认显示弹窗信息
showHQinfo: true,
......@@ -557,6 +560,16 @@
this.loading = false;
});
},
com_onresize(){
//clientHeight的值由DIV内容的实际高度和CSS中的padding值决定,
var contentsHeight = document.body.clientHeight;
var h = contentsHeight - 50 - 134 - 50;
if(h < 110){
return;
}
//设置table的行高
this.tableHeight = h;
}
},
mounted() {
this.getBranchList();
......@@ -564,6 +577,10 @@
this.GetHotelList();
this.getList();
this.GetHotelTipList();
this.com_onresize();
window.onresize = () => {
this.com_onresize();
}
},
};
......@@ -695,5 +712,10 @@
.HotelQueryList .el-table td {
padding: 0;
}
.hotelQury2 .w150 .el-input{
width:150px;
}
.HQ_em{
min-width: 75px!important;
}
</style>
......@@ -213,10 +213,10 @@
<template>
<div class="flexOne hotelSalesBoard" style="padding:0 20px;">
<div class="query-box Plan_Query">
<ul>
<ul style="position:relative;">
<li>
<span>
<em>{{$t('system.quety_area')}}</em>
<em style="min-width:60px;">{{$t('system.quety_area')}}</em>
<el-select v-model="msg.Province" filterable @change="getProvinceList(msg.Province,2)"
:placeholder="$t('hotel.hotel_province')">
<el-option :key="0" :value="0" label="请选择"></el-option>
......@@ -229,7 +229,7 @@
</span>
</li>
<li>
<span><em>{{$t('admin.admin_company')}}</em>
<span><em style="min-width:60px;">{{$t('admin.admin_company')}}</em>
<el-select filterable v-model='msg.OutBranchId' :placeholder="$t('pub.unlimitedSel')">
<el-option :label="$t('pub.unlimitedSel')" :value='-1'></el-option>
<el-option v-for='item in companyList' :label='item.BName' :value='item.Id' :key="item.Id">
......@@ -239,7 +239,7 @@
</li>
<li>
<span>
<em>酒店</em>
<em style="min-width:60px;">酒店</em>
<el-select v-model="msg.HotelId" :placeholder="$t('pub.pleaseSel')" filterable>
<el-option :label="$t('pub.unlimitedSel')" :value="defaultSelectValue"></el-option>
<el-option v-for="item in HotelList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
......@@ -256,7 +256,7 @@
</el-select>
</span>
</li>
<li style="margin-right:50px;">
<li style="position:absolute;right:10px;top:0;">
<button class="normalBtn" type="button" @click="GetHoltelInventory()">{{$t('pub.searchBtn')}}</button>
<input type="button" class="normalBtn" value="下载" @click="DownLoadHotelSalesBoard()" />
</li>
......@@ -307,9 +307,10 @@
<p style="word-break:breakall;" :class="stockColor(subItem.InventoryType)"
v-for="subItem in dayItem.dayValue">{{subItem.HotelName}}
(总: {{subItem.Inventory}} &nbsp;&nbsp;
<!--@click="goUrl('roomReservations',subItem,dayItem.DayStr,'订房管理')" text-decoration:underline;-->
<a title="点击跳转到订房管理" v-if="subItem.UseInventory>0"
@click="goUrl('roomReservations',subItem,dayItem.DayStr,'订房管理')"
style="cursor:pointer;text-decoration:underline;"
style="cursor:pointer;"
:class="subItem.InventoryType==4 ? 'stock1' : 'stock2'">已用:{{subItem.UseInventory}}</a>
<span v-else>已用:{{subItem.UseInventory}}</span>
)
......
......@@ -332,10 +332,10 @@
<template>
<div class="flexOne hotelTS">
<div class="query-box">
<ul>
<ul style="position:relative">
<li>
<span>
<em>{{$t('system.quety_area')}}</em>
<em style="min-width:60px;">{{$t('system.quety_area')}}</em>
<el-select v-model="msg.Province" filterable @change="getProvinceList(msg.Province,2)"
:placeholder="$t('hotel.hotel_province')">
<el-option :key="0" :value="0" label="请选择"></el-option>
......@@ -349,7 +349,7 @@
</li>
<li>
<span>
<em>酒店</em>
<em style="min-width:60px;">酒店</em>
<el-select v-model="msg.HotelId" :placeholder="$t('pub.pleaseSel')" filterable>
<el-option :label="$t('pub.unlimitedSel')" :value="DefaultSelectValue"></el-option>
<el-option v-for="item in HotelList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
......@@ -358,7 +358,7 @@
</li>
<li style="display:none;">
<span>
<em>供应商</em>
<em style="min-width:60px;">供应商</em>
<el-select v-model="msg.Supplier" placeholder="请选择">
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option v-for="(item,index) in SupplierList" :key="index" :label="item.Name" :value="item.ID">
......@@ -378,7 +378,7 @@
</el-date-picker>
</div>
</li>
<li>
<li style="position:absolute;right:10px;top:0;">
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()" />
</li>
</ul>
......
<template>
<div>
<div class="query-box" style="border-bottom: none;">
<ul>
<ul style="position:relative;">
<li>
<span>
<em>{{$t('Operation.Op_Country')}}/{{$t('system.query_dest')}}</em>
......@@ -95,7 +95,7 @@
:picker-options="pickerBeginDateAfter"></el-date-picker>
</span>
</li>
<li>
<li style="position:absolute;right:10px;top:0;">
<input type="button" class="normalBtn" value="查询" @click="getList();resetPageIndex()" />
<input type="button" class="normalBtn" value="下载" @click="DownLoadHotel()" />
</li>
......@@ -140,7 +140,10 @@
{{childItem.CheckInDateStr}}
</td>
<td class="tdLeft">
{{childItem.NewHotelName}}
<template v-if="childItem.SupplierId==UserInfo.SupplierId"> {{childItem.NewHotelName}}</template>
<template v-else>
组团社自理
</template>
</td>
<td>
<span style="color:red;">
......@@ -149,9 +152,6 @@
<template v-else>{{childItem.DMCState==1?"[地接-OK]":(childItem.DMCState==0?"[未操作]":"[暂定]")}}
</template>
</template>
<template v-else>
[组团社自理]
</template>
</span>
</td>
<td v-if="childIndex==0" :rowspan="subItem.hotelList.length">
......
......@@ -2,7 +2,7 @@
<div style="position: relative;" ref="firstParent">
<div class="nav">
<div class="nav-left">
<img class="GroupPic" src="../assets/img/default_head_img.jpg" />
<img class="GroupPic" src="../assets/img/daxiang.png" />
</div>
<div class="nav-middle">
<ul class="clearfix" :style="{width:`${allWindowWidth}px`}">
......@@ -19,7 +19,7 @@
<el-dropdown trigger="click">
<div class="el-dropdown-link">
<img src="../assets/img/default_head_img.jpg" />
<span class="name" :title="userInfo.SupplierName">{{userInfo.SupplierName}}</span>
<span class="SupplierName" :title="userInfo.SupplierName">{{userInfo.SupplierName}}</span>
</div>
<el-dropdown-menu slot="dropdown" class="_dropdown _more_dropdown">
<el-dropdown-item class="clearfix _dropdown_other" @click.native="settingSys">
......@@ -63,7 +63,8 @@
<el-select v-model="msg.Province" filterable @change="getProvinceList(msg.Province,2)"
:placeholder="$t('hotel.hotel_province')">
<el-option :key="0" :value="0" label="请选择"></el-option>
<el-option v-for="item in provinceList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
<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.City" filterable :placeholder="$t('hotel.hotel_city')">
<el-option :key="0" :value="0" label="请选择"></el-option>
......@@ -107,17 +108,19 @@
</span>
</li>
<li><span><em>日期</em>
<el-date-picker v-model='msg.StartDate' value-format="yyyy-MM-dd" type="date" :picker-options="beforeCheck">
<el-date-picker v-model='msg.StartDate' value-format="yyyy-MM-dd" type="date"
:picker-options="beforeCheck">
</el-date-picker>
<el-date-picker v-model='msg.EndDate' value-format="yyyy-MM-dd" type="date" :picker-options="afterCheck">
<el-date-picker v-model='msg.EndDate' value-format="yyyy-MM-dd" type="date"
:picker-options="afterCheck">
</el-date-picker>
</span>
</li>
<li>
<span>
<em>酒店</em>
<el-select v-model="msg.HotelChooseArray" :placeholder="$t('pub.pleaseSel')" class="multiple_input w300"
filterable multiple :multiple-limit="3">
<el-select v-model="msg.HotelChooseArray" :placeholder="$t('pub.pleaseSel')"
class="multiple_input w300" filterable multiple :multiple-limit="3">
<el-option v-for="item in HotelList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
</span>
......@@ -141,7 +144,8 @@
<span style="color:#000000;background-color: #02F78E;padding:2px 4px;border-radius:5px">特别价</span>
</div>
<template v-if="isShow">
<el-table v-if="dataList.length>0" :data="dataList" style="width:100%" border v-loading='loading' height="500">
<el-table v-if="dataList.length>0" :data="dataList" style="width:100%" border v-loading='loading'
:height="tableHeight">
<el-table-column fixed label="酒店名称" min-width="180">
<template slot-scope="scope">
<div style="text-decoration: underline;cursor:pointer">
......@@ -156,22 +160,22 @@
<div class="Hotel_kong">超定</div>
</template>
</el-table-column>
<el-table-column v-for='(item,index) in dataList[0].subList' :label="getDateList(item.DateStr)" :key='index'
min-width="120">
<el-table-column v-for='(item,index) in dataList[0].subList' :label="getDateList(item.DateStr)"
:key='index' min-width="120">
<template slot-scope="scope">
<div class="Hotel_kong Com_hoteldiv">
<template v-if="scope.row.subList[index].PriceList.length>0">
<template v-for="childItem in scope.row.subList[index].PriceList">
<div :class="getClass(1,childItem.InventoryType)" style="height:100%;float:left;width:100%"
:style="{width:(100/scope.row.subList[index].PriceList.length)+'%'}">{{childItem.CostPrice}}</div>
:style="{width:(100/scope.row.subList[index].PriceList.length)+'%'}">{{childItem.CostPrice}}
</div>
</template>
</template>
<template v-else>
<div :class="getClass(0,0)" style="width:100%;height:100%">&nbsp;</div>
</template>
</div>
<div class="Hotel_kong Com_hoteldiv Hq_duoge"
>
<div class="Hotel_kong Com_hoteldiv Hq_duoge">
{{scope.row.subList[index].Inventory}}/{{scope.row.subList[index].UseInventory}}/{{scope.row.subList[index].RemainingInventory}}
</div>
<div class="Hotel_kong Com_hoteldiv">
......@@ -242,7 +246,8 @@
<el-button type="primary" icon="el-icon-edit" circle @click="GetHotelTip(item.Id)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<el-button type="danger" icon="el-icon-delete" circle @click="RemoveHotelTip(item.Id)"></el-button>
<el-button type="danger" icon="el-icon-delete" circle @click="RemoveHotelTip(item.Id)">
</el-button>
</el-tooltip>
</td>
</tr>
......@@ -315,8 +320,8 @@
icon: 'this.src="' + require("../assets/img/NotificationIcon.png") + '"',
allWindowWidth: '',
showPage:true,
showPage: true,
tableHeight: 0,
msg: {
//酒店选择数组
HotelChooseArray: [],
......@@ -366,7 +371,8 @@
pageIndex: 1,
pageSize: 5,
currentPage: 1,
total: 0
total: 0,
OpType: 1,
},
postMsg: {
Id: 0,
......@@ -402,13 +408,10 @@
]
}
},
};
},
created() {
this.userInfo = this.getLocalStorageSupplier();
console.log("userInfo",this.userInfo);
let language = localStorage.language;
if (!language) {
this.language = 'zh-CN';
......@@ -446,7 +449,9 @@
this.$store.dispatch("logout")
localStorage.removeItem("userInfo");
localStorage.removeItem("previousPathInfo");
this.$router.push({ path: "/SupplierLogin" });
this.$router.push({
path: "/SupplierLogin"
});
},
settingSys: function () {
this.MsgBus.$emit('settingOpen')
......@@ -682,6 +687,16 @@
this.loading = false;
});
},
com_onresize() {
//clientHeight的值由DIV内容的实际高度和CSS中的padding值决定,
var contentsHeight = document.body.clientHeight;
var h = contentsHeight - 50 - 80;
if (h < 110) {
return;
}
//设置table的行高
this.tableHeight = h;
}
},
mounted() {
document.title = this.userInfo.GroupName;
......@@ -692,17 +707,21 @@
this.GetHotelList();
this.getList();
this.GetHotelTipList();
  var url = window.location.href;
if(String(url).indexOf('SupplierIndex') >= 0){
this.showPage=true;
}else{
this.showPage =false;
var url = window.location.href;
if (String(url).indexOf('SupplierIndex') >= 0) {
this.showPage = true;
} else {
this.showPage = false;
};
this.com_onresize();
window.onresize = () => {
this.com_onresize();
}
},
watch:{
$route(val){
this.showPage =false;
}
watch: {
$route(val) {
this.showPage = false;
}
}
};
......@@ -808,13 +827,13 @@
cursor: pointer;
}
.nav-right ul li.user_head span.name {
.nav-right ul li.user_head span.SupplierName {
color: #99a7b3;
font-size: 12px;
display: inline-block;
margin-left: 10px;
overflow: hidden;
width: 45px;
min-width: 45px;
height: 50px;
}
......@@ -1040,7 +1059,7 @@
}
.Hq_duoge {
.Hq_duoge {
cursor: pointer;
text-decoration: underline;
}
......@@ -1051,7 +1070,7 @@
.classHong {
background-color: rgb(255, 55, 55);
color:#fff;
color: #fff;
}
.classWang {
......@@ -1166,5 +1185,4 @@
padding: 0;
}
</style>
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