Skip to content

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

页面修改

parent ca29e52e
Hide whitespace changes
Inline Side-by-side
Showing with 278 additions and 186 deletions
src/components/Hotel/HotelSalesBoard.vue
View file @ f495610b
......@@ -365,8 +365,9 @@
},
methods: {
getBranchList() {
let userInfo = this.getLocalStorage();
this.apipost('admin_get_BranchGetList', {
RB_Group_Id: '2',
RB_Group_Id: userInfo.RB_Group_id,
Status: 0,
}, res => {
if (res.data.resultCode == 1) {
......@@ -493,7 +494,7 @@
GetHotelList() {
this.apipost(
"hotel_post_GetHasStockHotelList", {
Country: 651,
QCountry: "651,1252",
IsMoreThanZero: 1
},
res => {
......@@ -588,7 +589,7 @@
this.GetHotelList();
this.initCalendar();
this.GetHoltelInventory();
this.getProvinceList(651, 1);
this.getProvinceList("651,1252", 1);
}
};
......
src/components/Hotel/HotelTotalStock.vue
View file @ f495610b
......@@ -494,7 +494,7 @@
GetHotelList() {
this.apipost(
"hotel_post_GetHasStockHotelList", {
Country: 651,
QCountry: "651,1252",
IsMoreThanZero: 1
},
res => {
......@@ -556,7 +556,7 @@
this.msg.HotelId = this.$route.query.HotelId === undefined ? 0 : this.$route.query.HotelId;
this.initSupplier();
this.GetHotelList();
this.getProvinceList(651, 1);
this.getProvinceList("651,1252", 1);
this.getList();
},
}
......
src/components/Hotel/HotelWorkList.vue
View file @ f495610b
......@@ -17,12 +17,15 @@
.HotelWorkList .Hw_tableOne th {
text-align: center;
}
.HotelWorkList .HotelWorkInput .el-input{
width:223px;
.HotelWorkList .HotelWorkInput .el-input {
width: 223px;
}
.HotelWorkList .HworkInput .el-input{
width:110px;
.HotelWorkList .HworkInput .el-input {
width: 110px;
}
</style>
<template>
......@@ -32,8 +35,8 @@
<li>
<span>
<em>{{$t('system.quety_area')}}</em>
<el-select v-model="msg.Province" filterable class="w110 HworkInput" @change="getProvinceList(msg.Province,2)"
:placeholder="$t('hotel.hotel_province')">
<el-select v-model="msg.Province" filterable class="w110 HworkInput"
@change="getProvinceList(msg.Province,2)" :placeholder="$t('hotel.hotel_province')">
<el-option :key="0" :value="0" :label="$t('pub.pleaseSel')"></el-option>
<el-option v-for="item in provinceList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
......@@ -81,7 +84,8 @@
<li>
<span>
<em>{{$t('adm.adm_time')}}</em>
<el-date-picker v-model="msg.YearMonthStr" type="month" value-format="yyyy-MM" :placeholder="$t('ground.xuanzeyue')">
<el-date-picker v-model="msg.YearMonthStr" type="month" value-format="yyyy-MM"
:placeholder="$t('ground.xuanzeyue')">
</el-date-picker>
</span>
</li>
......@@ -113,9 +117,12 @@
</div>
<div class="hotelProductManage2_tableBox" style="margin-bottom: 20px;">
<span style="color:#FFFFFF; background-color:green ; padding: 2px 4px; border-radius: 5px;">OK</span>
<span style="color:#FFFFFF; background-color:#3333CC; padding: 2px 4px; border-radius: 5px;">{{$t('visa.v_zanding')}}</span>
<span style="color:#FFFFFF; background-color:red; padding: 2px 4px; border-radius: 5px;">{{$t('ground.wicaozuo')}}</span>
<span style="color:#FFFFFF; background-color:#000; padding: 2px 4px; border-radius: 5px;">{{$t('ground.wukucun')}}</span>
<span
style="color:#FFFFFF; background-color:#3333CC; padding: 2px 4px; border-radius: 5px;">{{$t('visa.v_zanding')}}</span>
<span
style="color:#FFFFFF; background-color:red; padding: 2px 4px; border-radius: 5px;">{{$t('ground.wicaozuo')}}</span>
<span
style="color:#FFFFFF; background-color:#000; padding: 2px 4px; border-radius: 5px;">{{$t('ground.wukucun')}}</span>
</div>
<template v-if="isShow">
<el-table :data="dataList" style="width:100%" border v-loading='loading' :height="tableHeight">
......@@ -129,25 +136,28 @@
<el-table-column v-for='(item,index) in dataList[0].DayList' :label="item.DateStr" :key='index' min-width="210">
<template slot-scope="scope">
<template v-if="scope.row.DayList[index].IsHaveStock==0">
<div style="background-color:#000!important;width:50px;height:100%;margin:0,padding:0;color:#FFFFFF">{{$t('ground.wukucun')}}
<div style="background-color:#000!important;width:50px;height:100%;margin:0,padding:0;color:#FFFFFF">
{{$t('ground.wukucun')}}
</div>
</template>
<template v-else>
<template
v-if="scope.row.DayList[index].HotelJourneyOrderList&&scope.row.DayList[index].HotelJourneyOrderList.length>0">
<template v-for="(childItem,childIndex) in scope.row.DayList[index].HotelJourneyOrderList">
<div :title="childItem.TCID+'【OK】'" v-if="childItem.DMCState==1||childItem.OPState==1"
<div :title="childItem.TCID+'【OK】'" v-if="childItem.DMCState==1||childItem.OPState==1" :key="childIndex"
slot="reference"
style="white-space:nowrap;color:green;cursor:pointer;text-decoration:underline;display:inline-block"
@click="outerVisible=true,GetClickItem(item.DateAllStr,scope.row.Hotel,childItem.TCID)">
{{childItem.BookGroup}}
{{childItem.BookGroup}}
</div>
<a style="display:inline-block;text-decoration:underline;color:red;cursor:pointer" @click="DeleteHotel(item.DateAllStr,scope.row.Hotel,childItem.TCID)">{{$t('system.table_delete')}}</a>
<a style="display:inline-block;text-decoration:underline;color:red;cursor:pointer" :key="childIndex"
@click="DeleteHotel(item.DateAllStr,scope.row.Hotel,childItem.TCID)">{{$t('system.table_delete')}}</a>
</template>
</template>
<template v-else>
<div slot="reference" class="w80" style="cursor:pointer;text-decoration:underline;"
@click="outerVisible=true,GetClickItem(item.DateAllStr,scope.row.Hotel,0)">{{$t('ground.shezhijiudian')}}
@click="outerVisible=true,GetClickItem(item.DateAllStr,scope.row.Hotel,0)">
{{$t('ground.shezhijiudian')}}
</div>
</template>
</template>
......@@ -161,7 +171,8 @@
</template>
<el-dialog custom-class='HW_hotelDialog' :title="'【'+qMsg.DateStr+'】团期酒店信息列表'" :visible.sync="outerVisible" center>
<div>
{{$t('ground.thdjth')}}:&nbsp;&nbsp;&nbsp;<el-input type="text" v-model="qMsg.TCNUM" maxlength="50" class="w200"></el-input>
{{$t('ground.thdjth')}}:&nbsp;&nbsp;&nbsp;<el-input type="text" v-model="qMsg.TCNUM" maxlength="50"
class="w200"></el-input>
<input type="button" class="normalBtn" :value="$t('pub.searchBtn')" @click="GetChangeHotelList()" />
</div>
<table class="Hw_tableOne" style="margin-top:20px;">
......@@ -195,7 +206,7 @@
<div style="height:400px;overflow:auto;border-bottom:1px solid #d1d1d1;border-left:1px solid #d1d1d1;"
v-loading="changeLoading">
<table style="width:100%;">
<tr v-for="(hItem,hIndex) in MyDataList">
<tr v-for="(hItem,hIndex) in MyDataList" :key="hIndex">
<td style="text-align:center;" width="60">
<el-checkbox :checked="hItem.IsChecked" @change="ChangeStatus(hItem)"></el-checkbox>
</td>
......@@ -231,7 +242,8 @@
</template>
</td>
<td style="text-align:center;" width="90">
<a style="text-decoration:underline;color:blue;cursor:pointer;" @click="DelItem(hItem)">{{$t('system.table_delete')}}</a>
<a style="text-decoration:underline;color:blue;cursor:pointer;"
@click="DelItem(hItem)">{{$t('system.table_delete')}}</a>
</td>
</tr>
</table>
......@@ -244,14 +256,15 @@
</div>
</template>
<script>
export default {
data() {
return {
qCountryId: 0,
userInfo: {}, //当前用户信息
//查询条件
msg: {
YearMonthStr: "",
CountryId: 651, //只查询日本
CountryId: 0, //只查询日本
//酒店选择数组
HotelChooseArray: [],
Province: 0, //省份编号
......@@ -288,7 +301,7 @@
//酒店列表
HotelList: [],
//默认高度
tableHeight:0
tableHeight: 0
};
},
......@@ -359,7 +372,7 @@
});
}
if (newList && newList.length > 0) {
that.apipost("journeyorder_post_SaveWorkHotelOrderService", newList,
that.apipost("journeyorder_post_SaveWorkHotelOrderService", newList,
res => {
if (res.data.resultCode == 1) {
that.Success(res.data.message);
......@@ -451,21 +464,11 @@
}
}, err => {});
},
getBranchList() {
this.apipost('admin_get_BranchGetList', {
RB_Group_Id: '2',
Status: 0,
}, res => {
if (res.data.resultCode == 1) {
this.companyList = res.data.data;
}
}, err => {})
},
//获取酒店列表
GetHotelList() {
this.apipost(
"hotel_post_GetHasStockHotelList", {
Country: 651,
Country: this.qCountryId,
IsMoreThanZero: 1
},
res => {
......@@ -481,7 +484,7 @@
this.loading = true;
let qMsg = {
queryMsg: this.msg,
uid: this.getLocalStorage().EmployeeId
uid: this.userInfo.EmployeeId
};
let fileName = this.$t('ground.jiudiangzb') + this.$commonUtils.getCurrentDate() + ".xls";
this.GetLocalFile("hotel_get_downloadHotelWork", qMsg, fileName,
......@@ -499,33 +502,41 @@
//设置table的行高
this.tableHeight = h;
},
DeleteHotel(DateAllStr,Hotel,TCID)
{
DeleteHotel(DateAllStr, Hotel, TCID) {
var that = this;
var nMsg={
TCID:TCID,
Hotel:Hotel,
UseTime:DateAllStr
var nMsg = {
TCID: TCID,
Hotel: Hotel,
UseTime: DateAllStr
};
that.Confirm(that.$t('ground.shifoushancgjd'), function () {
that.apipost("journeyorder_post_DeleteWorkHotelOrderService", nMsg,
res => {
if (res.data.resultCode == 1) {
that.Success(res.data.message);
that.getList();
} else {
that.Error(res.data.message);
}
},
err => {}
);
});
that.apipost("journeyorder_post_DeleteWorkHotelOrderService", nMsg,
res => {
if (res.data.resultCode == 1) {
that.Success(res.data.message);
that.getList();
} else {
that.Error(res.data.message);
}
},
err => {}
);
});
}
},
mounted() {
this.userInfo = this.getLocalStorage();
if (this.userInfo.RB_Group_id == 2) {
this.qCountryId = 651;
this.msg.CountryId = 651;
} else if (his.userInfo.RB_Group_id == 91) {
this.qCountryId = 1252;
this.msg.CountryId = 1252;
}
this.GetHotelList();
this.msg.YearMonthStr = new Date().Format("yyyy-MM");
this.getProvinceList(651, 1);
this.getProvinceList(this.qCountryId, 1);
this.initSupplier();
this.getList();
//自适应高度调节
......
src/components/Hotel/SupplierHandFee.vue
View file @ f495610b
......@@ -137,13 +137,14 @@
export default {
data() {
return {
userInfo: {}, //用户信息
//请求
msg: {
QMonthStr: "",
Supplier: 0,
PageIndex: 1,
PageSize: 15,
IsSetOut:0,//0-正常发团，1-取消发团
IsSetOut: 0, //0-正常发团，1-取消发团
},
loading: false,
currentPage: 1,
......@@ -151,13 +152,13 @@
dataList: [],
//供应商
SupplierList: [],
totalJap:0,
rmbTotal:0
totalJap: 0,
rmbTotal: 0
}
},
mounted() {
this.userInfo = this.getLocalStorage();
this.initSupplier();
//this.getList();
},
filters: {},
methods: {
......@@ -200,7 +201,7 @@
TCID: item.TCIDS,
Supplier: that.msg.Supplier,
QMonthStr: that.msg.QMonthStr,
IsSetOut:that.msg.IsSetOut,
IsSetOut: that.msg.IsSetOut,
},
res => {
that.loading = false;
......@@ -258,12 +259,12 @@
if (res.data.resultCode == 1) {
this.dataList = res.data.data.pageData;
this.total = res.data.data.count;
this.totalJap=0;
this.rmbTotal=0;
this.dataList.forEach(x=>{
x.SubList.forEach(y=>{
this.totalJap+=y.SubtotalMoney;
this.rmbTotal+=y.RMBMoney;
this.totalJap = 0;
this.rmbTotal = 0;
this.dataList.forEach(x => {
x.SubList.forEach(y => {
this.totalJap += y.SubtotalMoney;
this.rmbTotal += y.RMBMoney;
})
})
} else {
......@@ -279,9 +280,16 @@
},
// 获取供应商
initSupplier() {
var qCountry = 0;
if (this.userInfo.RB_Group_id == 2) {
qCountry = 651;
}
if (this.userInfo.RB_Group_id == 91) {
qCountry = 1252;
}
this.apipost("supplier_post_GetAllList", {
Type: 1,
Country: 651, //日本供应商
Country: qCountry, //日本供应商
}, res => {
if (res.data.resultCode === 1) {
this.SupplierList = res.data.data;
......
src/components/Hotel/roomQuery.vue
View file @ f495610b
......@@ -2,6 +2,17 @@
<div>
<div class="query-box" style="border-bottom: none;">
<ul>
<li>
<span>
<em>{{$t('advmanager.v_line')}}</em>
<el-select v-model="msg.LineId" filterable :placeholder="$t('pub.pleaseSel')" @change="getLinePlaceList()">
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option v-for="item in queryCommonData.LineList" :label='item.LineName' :value='item.LineID'
:key='item.LineID'>
</el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>{{$t('Operation.Op_Country')}}/{{$t('system.query_dest')}}</em>
......@@ -229,6 +240,7 @@
export default {
data() {
return {
userInfo: {}, //用户信息
loading: false,
currentPage: 1,
total: 0,
......@@ -244,7 +256,7 @@
DateStr: "",
//出团公司
OutBranchIds: [],
LineId: 14,
LineId: 0,
PlaceID: 0,
LineteamId: 0,
//航空公司
......@@ -259,9 +271,6 @@
companyList: [],
//酒店类表
HotelList: [],
LineList: [],
LineTeamList: [],
thLengthTitle: [],
dataList: [],
queryCommonData: {
//公司数据
......@@ -295,25 +304,41 @@
getLineList() {
this.apipost("line_post_GetAllList", {}, res => {
if (res.data.resultCode == 1) {
this.LineList = res.data.data;
this.queryCommonData.LineList = res.data.data;
this.queryCommonData.PlaceList = []
this.queryCommonData.LineTeamList = []
} else {
this.Error(res.data.message);
}
});
},
//获取目的地列表
getLinePlaceList() {
this.msg.PlaceID = 0;
this.msg.LineteamId = 0;
let msg = {
lineID: this.msg.LineId,
}
this.apipost('team_post_GetLinePlace', msg, res => {
if (res.data.resultCode == 1) {
this.queryCommonData.PlaceList = res.data.data
this.queryCommonData.LineTeamList = []
}
})
},
//获取系列列表
getLineTeamList(lineId) {
this.LineTeamList = [];
this.apipost(
"team_post_GetList", {
lineID: 14,
isTOOP: 1
},
res => {
if (res.data.resultCode == 1) {
this.msg.LineteamId = "-1";
this.LineTeamList = res.data.data;
}
getLineTeamList() {
this.msg.LineteamId = 0
let msg = {
lineID: this.msg.LineId,
placeID: this.msg.PlaceID,
isTOOP: 1
}
this.apipost('team_post_GetList', msg, res => {
if (res.data.resultCode == 1) {
this.queryCommonData.LineTeamList = res.data.data
}
);
})
},
goUrlR(path, obj, title) {
this.$router.push({
......@@ -390,7 +415,7 @@
GetHotelList() {
this.apipost(
"hotel_post_GetHasStockHotelList", {
Country: 651,
QCountry: "651,1252",
IsMoreThanZero: 1
},
res => {
......@@ -406,7 +431,7 @@
this.loading = true;
let qMsg = {
queryMsg: this.msg,
uid: this.getLocalStorage().EmployeeId
uid: this.userInfo.EmployeeId
};
let fileName = this.$t('ground.dingfangcx') + this.$commonUtils.getCurrentDate() + ".xls";
this.GetLocalFile("hotel_get_downloadHotel", qMsg, fileName,
......@@ -414,34 +439,6 @@
this.loading = false;
});
},
//获取目的地列表
getLinePlaceList() {
this.msg.PlaceID = 0;
this.msg.LineteamId = 0;
let msg = {
lineID: this.msg.LineId,
}
this.apipost('team_post_GetLinePlace', msg, res => {
if (res.data.resultCode == 1) {
this.queryCommonData.PlaceList = res.data.data
this.queryCommonData.LineTeamList = []
}
})
},
//获取系列列表
getLineTeamList() {
this.msg.LineteamId = 0
let msg = {
lineID: this.msg.LineId,
placeID: this.msg.PlaceID,
isTOOP: 1
}
this.apipost('team_post_GetList', msg, res => {
if (res.data.resultCode == 1) {
this.queryCommonData.LineTeamList = res.data.data
}
})
},
//获取航空公司
getAirlineList() {
this.apipost(
......@@ -456,9 +453,8 @@
},
//根据当前员工所在部门获取该部门及子部门员工信息
getEmployeeList() {
let userInfo = this.getLocalStorage()
let msg = {
GroupId: userInfo.RB_Group_id,
GroupId: this.userInfo.RB_Group_id,
BranchId: '-1',
DepartmentId: '-1',
PostId: '-1',
......@@ -476,12 +472,10 @@
},
//初始化公司
getCompanyList() {
let userInfo = this.getLocalStorage()
var RB_Group_id = userInfo.RB_Group_id
let msg = {
Status: 0,
is_show: 0,
RB_Group_Id: RB_Group_id
RB_Group_Id: this.userInfo.RB_Group_id
}
this.apipost(
'admin_get_BranchGetList',
......@@ -496,6 +490,7 @@
},
},
mounted() {
this.userInfo = this.getLocalStorage();
let myDate = new Date();
let nowDate =
myDate.getFullYear() +
......@@ -514,7 +509,10 @@
} else {
this.msg.StartDate = nowDate;
}
this.getLinePlaceList();
if (this.userInfo.RB_Group_id == 2) {
this.msg.LineId = 14;
}
this.getLineList();
this.getAirlineList();
this.getEmployeeList();
this.getCompanyList();
......
src/components/Hotel/roomReservations.vue
View file @ f495610b
......@@ -2,6 +2,17 @@
<div>
<div class="query-box" style="border-bottom: none;">
<ul>
<li>
<span>
<em>{{$t('advmanager.v_line')}}</em>
<el-select v-model="msg.LineId" filterable :placeholder="$t('pub.pleaseSel')" @change="getLinePlaceList()">
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option v-for="item in queryCommonData.LineList" :label='item.LineName' :value='item.LineID'
:key='item.LineID'>
</el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>{{$t('Operation.Op_Country')}}/{{$t('system.query_dest')}}</em>
......@@ -107,7 +118,8 @@
</div>
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle"
:style="{height: boxHeight + 'px'}">
<table border="0" cellspacing="1" cellpadding="0" class="roomReservationsTalbe" style="width:100%" v-loading='loading'>
<table border="0" cellspacing="1" cellpadding="0" class="roomReservationsTalbe" style="width:100%"
v-loading='loading'>
<tr>
<th width="120">{{$t('active.ad_xuhao')}}</th>
<th width="80">{{$t('ground.chufadi')}}</th>
......@@ -134,17 +146,13 @@
v-if="subItem.HotelOrderList.length>0">
<template v-for="(thirdItem,thirdIndex) in subItem.HotelOrderList">
<tr>
<td
:rowspan="outItem.rootRowspan"
v-if='index==0&&subIndex==0&&thirdIndex==0'>
<td :rowspan="outItem.rootRowspan" v-if='index==0&&subIndex==0&&thirdIndex==0'>
{{outItem.NewCombinationNum}}
</td>
<td :rowspan="item.itemRowSpan"
v-if='subIndex==0&&thirdIndex==0'>
<td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
{{item.StartCityNames}}
</td>
<td :rowspan="item.itemRowSpan"
v-if='subIndex==0&&thirdIndex==0'>
<td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
<div class="w150">
{{item.FlightDate}}
<el-popover popper-class="roomReservations_tripDetails" width="550" trigger="click">
......@@ -180,40 +188,36 @@
</tr>
</table>
<el-button slot="reference" class="normalBtn mt5"
style='height:24px; padding: 0 10px; background: #2AAEF2; border-color: #2AAEF2;'>{{$t('fnc.xiangqing')}}
style='height:24px; padding: 0 10px; background: #2AAEF2; border-color: #2AAEF2;'>
{{$t('fnc.xiangqing')}}
</el-button>
</el-popover>
</div>
</td>
<td :rowspan="item.itemRowSpan"
v-if='subIndex==0&&thirdIndex==0'>
<td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
<p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')"
style="cursor:pointer;text-decoration:underline;">
{{item.TCNUMS}}({{item.TCIDS}})
</p>
</td>
<td :rowspan="item.itemRowSpan"
v-if='subIndex==0&&thirdIndex==0'>
<td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
<p @click="goUrlT('RegistrationList',item.TCIDS,'报名清单')"
style="cursor:pointer;text-decoration:underline;">
{{item.TotalSeat}}/{{item.CommonReport.HouseStatistics.RealityYSeatNum}}/{{item.CommonReport.HouseStatistics.RealityESeatNum}}/{{item.CommonReport.HouseStatistics.RealityFSeatNum}}
</p>
</td>
<td :rowspan="item.itemRowSpan"
v-if='subIndex==0&&thirdIndex==0'>
<td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
<p @click="goUrlT('passengerHouse',item.TCIDS,'房间分配')"
style="cursor:pointer;text-decoration:underline;">
{{item.CommonReport.HouseStatistics.NeedBed}}/{{item.CommonReport.HouseStatistics.NoNeedBed}}
</p>
</td>
<td :rowspan="item.itemRowSpan"
v-if='subIndex==0&&thirdIndex==0'>
<td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
{{item.CommonReport.HouseStatistics.RealityRoomNum}}
</td>
<td :rowspan="item.itemRowSpan"
v-if='subIndex==0&&thirdIndex==0'>
<p @click="goUrl('roomReservationsDetails',item,outItem,'订房详情')"
style="cursor:pointer;text-decoration:underline;">{{$t('fnc.xiangqing')}}</p>
<td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
<p @click="goRoomDetails(item,outItem,'订房详情')" style="cursor:pointer;text-decoration:underline;">
{{$t('fnc.xiangqing')}}</p>
</td>
<td :rowspan="subItem.HotelOrderList.length" v-if='thirdIndex==0'>
{{subItem.UseTimeStr}}
......@@ -274,6 +278,7 @@
export default {
data() {
return {
userInfo: {}, //当前登录用户信息
loading: false,
currentPage: 1,
total: 0,
......@@ -289,7 +294,7 @@
DateStr: "",
//出团公司
OutBranchIds: [],
LineId: 14,
LineId: 0,
PlaceID: 0,
LineteamId: 0,
//航空公司
......@@ -351,7 +356,11 @@
}
})
},
goUrl(path, obj, outItem, title) {
goRoomDetails(obj, outItem, title) {
var path = "roomReservationsDetails";
if (this.userInfo.RB_Group_id == 91) {
path = "roomReservationsDetails_swt";
}
this.$router.push({
name: path,
query: {
......@@ -360,8 +369,8 @@
'flightTotal': obj.TotalSeat,
'GuestNum': obj.CommonReport.HouseStatistics.RealityNum,
'NewCombinationNum': outItem.NewCombinationNum,
'LeaderName':obj.LeaderName,
'GuideName':obj.GuideName,
'LeaderName': obj.LeaderName,
'GuideName': obj.GuideName,
blank: 'y',
tab: title
}
......@@ -458,9 +467,8 @@
},
//根据当前员工所在部门获取该部门及子部门员工信息
getEmployeeList() {
let userInfo = this.getLocalStorage()
let msg = {
GroupId: userInfo.RB_Group_id,
GroupId: this.userInfo.RB_Group_id,
BranchId: '-1',
DepartmentId: '-1',
PostId: '-1',
......@@ -478,8 +486,7 @@
},
//初始化公司
getCompanyList() {
let userInfo = this.getLocalStorage()
var RB_Group_id = userInfo.RB_Group_id
var RB_Group_id = this.userInfo.RB_Group_id
let msg = {
Status: 0,
is_show: 0,
......@@ -496,8 +503,20 @@
err => {}
)
},
getLineList() {
this.apipost("line_post_GetAllList", {}, res => {
if (res.data.resultCode == 1) {
this.queryCommonData.LineList = res.data.data;
this.queryCommonData.PlaceList = []
this.queryCommonData.LineTeamList = []
} else {
this.Error(res.data.message);
}
});
},
},
mounted() {
this.userInfo = this.getLocalStorage();
let myDate = new Date();
let nowDate =
myDate.getFullYear() +
......@@ -521,8 +540,10 @@
let height = window.innerHeight - 65 - 164;
this.boxHeight = height;
this.offsetwidth = width;
//this.msg.CombinationNum = "HP20190713TN07A1";
this.getLinePlaceList();
if (this.userInfo.RB_Group_id == 2) {
this.msg.LineId = 14;
}
this.getLineList();
this.getAirlineList();
this.getEmployeeList();
this.getCompanyList();
......
src/components/Restaurant/RestaurantSalesBoard.vue
View file @ f495610b
......@@ -278,6 +278,7 @@
DiningID: 0,
QStatus:0,
loading: false,
uid:0,
},
//餐厅列表
DinnerList: [],
......@@ -392,7 +393,7 @@
GetDinnerList() {
this.apipost(
"dining_post_GetList", {
QCountry: 651
QCountrys: "651,1252"
},
res => {
if (res.data.resultCode == 1) {
......@@ -408,6 +409,7 @@
this.Info(this.$t('sm.qxzcanting'));
return;
}
this.msg.uid=this.getLocalStorage().EmployeeId;
this.msg.loading = true;
let fileName = this.$t('ground.cantxiazai') + this.$commonUtils.getCurrentDate() + ".xls";
this.GetLocalFile("dinner_get_downloadDinnerSalesBoard", this.msg, fileName,
......
src/components/Restaurant/bookDinnerStatistics.vue
View file @ f495610b
......@@ -2,10 +2,34 @@
<div>
<div class="query-box" style="border-bottom: none;">
<ul>
<li><span><em>{{$t('advmanager.v_xilie')}}</em>
<li>
<span>
<em>{{$t('advmanager.v_line')}}</em>
<el-select v-model="msg.LineId" filterable :placeholder="$t('pub.pleaseSel')" @change="getLinePlaceList()">
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option v-for="item in queryCommonData.LineList" :label='item.LineName' :value='item.LineID'
:key='item.LineID'>
</el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>{{$t('Operation.Op_Country')}}/{{$t('system.query_dest')}}</em>
<el-select v-model="msg.PlaceID" filterable :placeholder="$t('pub.pleaseSel')" @change="getLineTeamList()">
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option v-for="item in queryCommonData.PlaceList" :label="item.PlaceName" :value="item.PlaceID"
:key="item.LtID"></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>{{$t('advmanager.v_xilie')}}</em>
<el-select v-model="msg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
<el-option v-for="item in LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'>
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option v-for="item in queryCommonData.LineTeamList" :label='item.LtName' :value='item.LtID'
:key='item.LtID'>
</el-option>
</el-select>
</span>
......@@ -100,7 +124,8 @@
</tr>
</table>
<el-button slot="reference" class="normalBtn mt5"
style='height:24px; padding: 0 10px; background: #2AAEF2; border-color: #2AAEF2;'>{{$t('fnc.xiangqing')}}
style='height:24px; padding: 0 10px; background: #2AAEF2; border-color: #2AAEF2;'>
{{$t('fnc.xiangqing')}}
</el-button>
</el-popover>
</td>
......@@ -142,7 +167,7 @@
</td>
<td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
<div class="w80 link">
<p @click="goUrl('bookDinnerStatisticsDetails',item,outItem,'订餐详情')">{{$t('fnc.xiangqing')}}</p>
<p @click="goDinnerDetails(item,outItem,'订餐详情')">{{$t('fnc.xiangqing')}}</p>
</div>
</td>
</tr>
......@@ -173,13 +198,15 @@
export default {
data() {
return {
userInfo: {}, //用户信息
loading: false,
msg: {
pageIndex: 1,
pageSize: 5,
SelectType: 2,
LineId: 14,
LineteamId: "-1",
LineId: 0,
PlaceID: 0,
LineteamId: 0,
StartDate: '',
EndDate: '',
currentPage: 1,
......@@ -188,11 +215,12 @@
},
//餐厅列表
DiningList: [],
LineList: [],
LineTeamList: [],
thLengthTitle: [],
queryCommonData: {
PlaceList: [],
LineList: [],
LineTeamList: [],
},
DataList: [],
colspanTotal: 0,
boxHeight: 0,
}
},
......@@ -211,27 +239,41 @@
getLineList() {
this.apipost("line_post_GetAllList", {}, res => {
if (res.data.resultCode == 1) {
this.LineList = res.data.data;
this.queryCommonData.LineList = res.data.data;
this.queryCommonData.PlaceList = []
this.queryCommonData.LineTeamList = []
} else {
this.$message.error(res.data.message);
this.Error(res.data.message);
}
});
},
//获取目的地列表
getLinePlaceList() {
this.msg.PlaceID = 0;
this.msg.LineteamId = 0;
let msg = {
lineID: this.msg.LineId,
}
this.apipost('team_post_GetLinePlace', msg, res => {
if (res.data.resultCode == 1) {
this.queryCommonData.PlaceList = res.data.data
this.queryCommonData.LineTeamList = []
}
})
},
//获取系列列表
getLineTeamList(lineId) {
this.LineTeamList = [];
this.apipost(
"team_post_GetList", {
lineID: 14,
isTOOP: 1
},
res => {
if (res.data.resultCode == 1) {
this.msg.LineteamId = "-1";
this.LineTeamList = res.data.data;
}
getLineTeamList() {
this.msg.LineteamId = 0
let msg = {
lineID: this.msg.LineId,
placeID: this.msg.PlaceID,
isTOOP: 1
}
this.apipost('team_post_GetList', msg, res => {
if (res.data.resultCode == 1) {
this.queryCommonData.LineTeamList = res.data.data
}
);
})
},
goUrlR(path, obj, title) {
this.$router.push({
......@@ -253,7 +295,11 @@
}
})
},
goUrl(path, obj, outItem, title) {
goDinnerDetails(obj, outItem, title) {
var path = "bookDinnerStatisticsDetails";
if (this.userInfo.RB_Group_id == 91) {
path = "bookDinnerStatisticsDetails_SWT";
}
this.$router.push({
name: path,
query: {
......@@ -309,7 +355,7 @@
this.DiningList = [];
this.apipost(
"dining_post_GetList", {
QCountry: 651,
QCountrys: "651,1252"
},
res => {
if (res.data.resultCode == 1) {
......@@ -318,12 +364,12 @@
}
);
},
//餐厅下载
//餐厅下载
DownLoadDinner() {
this.loading = true;
let qMsg = {
queryMsg: this.msg,
uid: this.getLocalStorage().EmployeeId
uid: this.userInfo.EmployeeId
};
let fileName = this.$t('ground.cantxiazai') + this.$commonUtils.getCurrentDate() + ".xls";
this.GetLocalFile("dinner_get_downloadDinner", qMsg, fileName,
......@@ -333,6 +379,10 @@
}
},
mounted() {
this.userInfo = this.getLocalStorage();
if (this.userInfo.RB_Group_id == 2) {
this.msg.LineId = 14;
}
let myDate = new Date();
let nowDate =
myDate.getFullYear() +
......@@ -345,6 +395,7 @@
let height = window.innerHeight - 65 - 164;
this.boxHeight = height;
this.offsetwidth = width;
this.getLineList();
this.GetDinnerList();
this.getList();
},
......
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