Commit f495610b authored by 黄奎's avatar 黄奎

页面修改

parent ca29e52e
...@@ -365,8 +365,9 @@ ...@@ -365,8 +365,9 @@
}, },
methods: { methods: {
getBranchList() { getBranchList() {
let userInfo = this.getLocalStorage();
this.apipost('admin_get_BranchGetList', { this.apipost('admin_get_BranchGetList', {
RB_Group_Id: '2', RB_Group_Id: userInfo.RB_Group_id,
Status: 0, Status: 0,
}, res => { }, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
...@@ -493,7 +494,7 @@ ...@@ -493,7 +494,7 @@
GetHotelList() { GetHotelList() {
this.apipost( this.apipost(
"hotel_post_GetHasStockHotelList", { "hotel_post_GetHasStockHotelList", {
Country: 651, QCountry: "651,1252",
IsMoreThanZero: 1 IsMoreThanZero: 1
}, },
res => { res => {
...@@ -588,7 +589,7 @@ ...@@ -588,7 +589,7 @@
this.GetHotelList(); this.GetHotelList();
this.initCalendar(); this.initCalendar();
this.GetHoltelInventory(); this.GetHoltelInventory();
this.getProvinceList(651, 1); this.getProvinceList("651,1252", 1);
} }
}; };
......
...@@ -494,7 +494,7 @@ ...@@ -494,7 +494,7 @@
GetHotelList() { GetHotelList() {
this.apipost( this.apipost(
"hotel_post_GetHasStockHotelList", { "hotel_post_GetHasStockHotelList", {
Country: 651, QCountry: "651,1252",
IsMoreThanZero: 1 IsMoreThanZero: 1
}, },
res => { res => {
...@@ -556,7 +556,7 @@ ...@@ -556,7 +556,7 @@
this.msg.HotelId = this.$route.query.HotelId === undefined ? 0 : this.$route.query.HotelId; this.msg.HotelId = this.$route.query.HotelId === undefined ? 0 : this.$route.query.HotelId;
this.initSupplier(); this.initSupplier();
this.GetHotelList(); this.GetHotelList();
this.getProvinceList(651, 1); this.getProvinceList("651,1252", 1);
this.getList(); this.getList();
}, },
} }
......
This diff is collapsed.
...@@ -137,13 +137,14 @@ ...@@ -137,13 +137,14 @@
export default { export default {
data() { data() {
return { return {
userInfo: {}, //用户信息
//请求 //请求
msg: { msg: {
QMonthStr: "", QMonthStr: "",
Supplier: 0, Supplier: 0,
PageIndex: 1, PageIndex: 1,
PageSize: 15, PageSize: 15,
IsSetOut:0,//0-正常发团,1-取消发团 IsSetOut: 0, //0-正常发团,1-取消发团
}, },
loading: false, loading: false,
currentPage: 1, currentPage: 1,
...@@ -151,13 +152,13 @@ ...@@ -151,13 +152,13 @@
dataList: [], dataList: [],
//供应商 //供应商
SupplierList: [], SupplierList: [],
totalJap:0, totalJap: 0,
rmbTotal:0 rmbTotal: 0
} }
}, },
mounted() { mounted() {
this.userInfo = this.getLocalStorage();
this.initSupplier(); this.initSupplier();
//this.getList();
}, },
filters: {}, filters: {},
methods: { methods: {
...@@ -200,7 +201,7 @@ ...@@ -200,7 +201,7 @@
TCID: item.TCIDS, TCID: item.TCIDS,
Supplier: that.msg.Supplier, Supplier: that.msg.Supplier,
QMonthStr: that.msg.QMonthStr, QMonthStr: that.msg.QMonthStr,
IsSetOut:that.msg.IsSetOut, IsSetOut: that.msg.IsSetOut,
}, },
res => { res => {
that.loading = false; that.loading = false;
...@@ -258,12 +259,12 @@ ...@@ -258,12 +259,12 @@
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.dataList = res.data.data.pageData; this.dataList = res.data.data.pageData;
this.total = res.data.data.count; this.total = res.data.data.count;
this.totalJap=0; this.totalJap = 0;
this.rmbTotal=0; this.rmbTotal = 0;
this.dataList.forEach(x=>{ this.dataList.forEach(x => {
x.SubList.forEach(y=>{ x.SubList.forEach(y => {
this.totalJap+=y.SubtotalMoney; this.totalJap += y.SubtotalMoney;
this.rmbTotal+=y.RMBMoney; this.rmbTotal += y.RMBMoney;
}) })
}) })
} else { } else {
...@@ -279,9 +280,16 @@ ...@@ -279,9 +280,16 @@
}, },
// 获取供应商 // 获取供应商
initSupplier() { 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", { this.apipost("supplier_post_GetAllList", {
Type: 1, Type: 1,
Country: 651, //日本供应商 Country: qCountry, //日本供应商
}, res => { }, res => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.SupplierList = res.data.data; this.SupplierList = res.data.data;
......
...@@ -2,6 +2,17 @@ ...@@ -2,6 +2,17 @@
<div> <div>
<div class="query-box" style="border-bottom: none;"> <div class="query-box" style="border-bottom: none;">
<ul> <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> <li>
<span> <span>
<em>{{$t('Operation.Op_Country')}}/{{$t('system.query_dest')}}</em> <em>{{$t('Operation.Op_Country')}}/{{$t('system.query_dest')}}</em>
...@@ -229,6 +240,7 @@ ...@@ -229,6 +240,7 @@
export default { export default {
data() { data() {
return { return {
userInfo: {}, //用户信息
loading: false, loading: false,
currentPage: 1, currentPage: 1,
total: 0, total: 0,
...@@ -244,7 +256,7 @@ ...@@ -244,7 +256,7 @@
DateStr: "", DateStr: "",
//出团公司 //出团公司
OutBranchIds: [], OutBranchIds: [],
LineId: 14, LineId: 0,
PlaceID: 0, PlaceID: 0,
LineteamId: 0, LineteamId: 0,
//航空公司 //航空公司
...@@ -259,9 +271,6 @@ ...@@ -259,9 +271,6 @@
companyList: [], companyList: [],
//酒店类表 //酒店类表
HotelList: [], HotelList: [],
LineList: [],
LineTeamList: [],
thLengthTitle: [],
dataList: [], dataList: [],
queryCommonData: { queryCommonData: {
//公司数据 //公司数据
...@@ -295,25 +304,41 @@ ...@@ -295,25 +304,41 @@
getLineList() { getLineList() {
this.apipost("line_post_GetAllList", {}, res => { this.apipost("line_post_GetAllList", {}, res => {
if (res.data.resultCode == 1) { 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) { getLineTeamList() {
this.LineTeamList = []; this.msg.LineteamId = 0
this.apipost( let msg = {
"team_post_GetList", { lineID: this.msg.LineId,
lineID: 14, placeID: this.msg.PlaceID,
isTOOP: 1 isTOOP: 1
}, }
res => { this.apipost('team_post_GetList', msg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.msg.LineteamId = "-1"; this.queryCommonData.LineTeamList = res.data.data
this.LineTeamList = res.data.data;
}
} }
); })
}, },
goUrlR(path, obj, title) { goUrlR(path, obj, title) {
this.$router.push({ this.$router.push({
...@@ -390,7 +415,7 @@ ...@@ -390,7 +415,7 @@
GetHotelList() { GetHotelList() {
this.apipost( this.apipost(
"hotel_post_GetHasStockHotelList", { "hotel_post_GetHasStockHotelList", {
Country: 651, QCountry: "651,1252",
IsMoreThanZero: 1 IsMoreThanZero: 1
}, },
res => { res => {
...@@ -406,7 +431,7 @@ ...@@ -406,7 +431,7 @@
this.loading = true; this.loading = true;
let qMsg = { let qMsg = {
queryMsg: this.msg, queryMsg: this.msg,
uid: this.getLocalStorage().EmployeeId uid: this.userInfo.EmployeeId
}; };
let fileName = this.$t('ground.dingfangcx') + this.$commonUtils.getCurrentDate() + ".xls"; let fileName = this.$t('ground.dingfangcx') + this.$commonUtils.getCurrentDate() + ".xls";
this.GetLocalFile("hotel_get_downloadHotel", qMsg, fileName, this.GetLocalFile("hotel_get_downloadHotel", qMsg, fileName,
...@@ -414,34 +439,6 @@ ...@@ -414,34 +439,6 @@
this.loading = false; 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() { getAirlineList() {
this.apipost( this.apipost(
...@@ -456,9 +453,8 @@ ...@@ -456,9 +453,8 @@
}, },
//根据当前员工所在部门获取该部门及子部门员工信息 //根据当前员工所在部门获取该部门及子部门员工信息
getEmployeeList() { getEmployeeList() {
let userInfo = this.getLocalStorage()
let msg = { let msg = {
GroupId: userInfo.RB_Group_id, GroupId: this.userInfo.RB_Group_id,
BranchId: '-1', BranchId: '-1',
DepartmentId: '-1', DepartmentId: '-1',
PostId: '-1', PostId: '-1',
...@@ -476,12 +472,10 @@ ...@@ -476,12 +472,10 @@
}, },
//初始化公司 //初始化公司
getCompanyList() { getCompanyList() {
let userInfo = this.getLocalStorage()
var RB_Group_id = userInfo.RB_Group_id
let msg = { let msg = {
Status: 0, Status: 0,
is_show: 0, is_show: 0,
RB_Group_Id: RB_Group_id RB_Group_Id: this.userInfo.RB_Group_id
} }
this.apipost( this.apipost(
'admin_get_BranchGetList', 'admin_get_BranchGetList',
...@@ -496,6 +490,7 @@ ...@@ -496,6 +490,7 @@
}, },
}, },
mounted() { mounted() {
this.userInfo = this.getLocalStorage();
let myDate = new Date(); let myDate = new Date();
let nowDate = let nowDate =
myDate.getFullYear() + myDate.getFullYear() +
...@@ -514,7 +509,10 @@ ...@@ -514,7 +509,10 @@
} else { } else {
this.msg.StartDate = nowDate; this.msg.StartDate = nowDate;
} }
this.getLinePlaceList(); if (this.userInfo.RB_Group_id == 2) {
this.msg.LineId = 14;
}
this.getLineList();
this.getAirlineList(); this.getAirlineList();
this.getEmployeeList(); this.getEmployeeList();
this.getCompanyList(); this.getCompanyList();
......
...@@ -2,6 +2,17 @@ ...@@ -2,6 +2,17 @@
<div> <div>
<div class="query-box" style="border-bottom: none;"> <div class="query-box" style="border-bottom: none;">
<ul> <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> <li>
<span> <span>
<em>{{$t('Operation.Op_Country')}}/{{$t('system.query_dest')}}</em> <em>{{$t('Operation.Op_Country')}}/{{$t('system.query_dest')}}</em>
...@@ -107,7 +118,8 @@ ...@@ -107,7 +118,8 @@
</div> </div>
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle" <div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle"
:style="{height: boxHeight + 'px'}"> :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> <tr>
<th width="120">{{$t('active.ad_xuhao')}}</th> <th width="120">{{$t('active.ad_xuhao')}}</th>
<th width="80">{{$t('ground.chufadi')}}</th> <th width="80">{{$t('ground.chufadi')}}</th>
...@@ -134,17 +146,13 @@ ...@@ -134,17 +146,13 @@
v-if="subItem.HotelOrderList.length>0"> v-if="subItem.HotelOrderList.length>0">
<template v-for="(thirdItem,thirdIndex) in subItem.HotelOrderList"> <template v-for="(thirdItem,thirdIndex) in subItem.HotelOrderList">
<tr> <tr>
<td <td :rowspan="outItem.rootRowspan" v-if='index==0&&subIndex==0&&thirdIndex==0'>
:rowspan="outItem.rootRowspan"
v-if='index==0&&subIndex==0&&thirdIndex==0'>
{{outItem.NewCombinationNum}} {{outItem.NewCombinationNum}}
</td> </td>
<td :rowspan="item.itemRowSpan" <td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
v-if='subIndex==0&&thirdIndex==0'>
{{item.StartCityNames}} {{item.StartCityNames}}
</td> </td>
<td :rowspan="item.itemRowSpan" <td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
v-if='subIndex==0&&thirdIndex==0'>
<div class="w150"> <div class="w150">
{{item.FlightDate}} {{item.FlightDate}}
<el-popover popper-class="roomReservations_tripDetails" width="550" trigger="click"> <el-popover popper-class="roomReservations_tripDetails" width="550" trigger="click">
...@@ -180,40 +188,36 @@ ...@@ -180,40 +188,36 @@
</tr> </tr>
</table> </table>
<el-button slot="reference" class="normalBtn mt5" <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-button>
</el-popover> </el-popover>
</div> </div>
</td> </td>
<td :rowspan="item.itemRowSpan" <td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
v-if='subIndex==0&&thirdIndex==0'>
<p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')" <p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')"
style="cursor:pointer;text-decoration:underline;"> style="cursor:pointer;text-decoration:underline;">
{{item.TCNUMS}}({{item.TCIDS}}) {{item.TCNUMS}}({{item.TCIDS}})
</p> </p>
</td> </td>
<td :rowspan="item.itemRowSpan" <td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
v-if='subIndex==0&&thirdIndex==0'>
<p @click="goUrlT('RegistrationList',item.TCIDS,'报名清单')" <p @click="goUrlT('RegistrationList',item.TCIDS,'报名清单')"
style="cursor:pointer;text-decoration:underline;"> style="cursor:pointer;text-decoration:underline;">
{{item.TotalSeat}}/{{item.CommonReport.HouseStatistics.RealityYSeatNum}}/{{item.CommonReport.HouseStatistics.RealityESeatNum}}/{{item.CommonReport.HouseStatistics.RealityFSeatNum}} {{item.TotalSeat}}/{{item.CommonReport.HouseStatistics.RealityYSeatNum}}/{{item.CommonReport.HouseStatistics.RealityESeatNum}}/{{item.CommonReport.HouseStatistics.RealityFSeatNum}}
</p> </p>
</td> </td>
<td :rowspan="item.itemRowSpan" <td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
v-if='subIndex==0&&thirdIndex==0'>
<p @click="goUrlT('passengerHouse',item.TCIDS,'房间分配')" <p @click="goUrlT('passengerHouse',item.TCIDS,'房间分配')"
style="cursor:pointer;text-decoration:underline;"> style="cursor:pointer;text-decoration:underline;">
{{item.CommonReport.HouseStatistics.NeedBed}}/{{item.CommonReport.HouseStatistics.NoNeedBed}} {{item.CommonReport.HouseStatistics.NeedBed}}/{{item.CommonReport.HouseStatistics.NoNeedBed}}
</p> </p>
</td> </td>
<td :rowspan="item.itemRowSpan" <td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
v-if='subIndex==0&&thirdIndex==0'>
{{item.CommonReport.HouseStatistics.RealityRoomNum}} {{item.CommonReport.HouseStatistics.RealityRoomNum}}
</td> </td>
<td :rowspan="item.itemRowSpan" <td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
v-if='subIndex==0&&thirdIndex==0'> <p @click="goRoomDetails(item,outItem,'订房详情')" style="cursor:pointer;text-decoration:underline;">
<p @click="goUrl('roomReservationsDetails',item,outItem,'订房详情')" {{$t('fnc.xiangqing')}}</p>
style="cursor:pointer;text-decoration:underline;">{{$t('fnc.xiangqing')}}</p>
</td> </td>
<td :rowspan="subItem.HotelOrderList.length" v-if='thirdIndex==0'> <td :rowspan="subItem.HotelOrderList.length" v-if='thirdIndex==0'>
{{subItem.UseTimeStr}} {{subItem.UseTimeStr}}
...@@ -274,6 +278,7 @@ ...@@ -274,6 +278,7 @@
export default { export default {
data() { data() {
return { return {
userInfo: {}, //当前登录用户信息
loading: false, loading: false,
currentPage: 1, currentPage: 1,
total: 0, total: 0,
...@@ -289,7 +294,7 @@ ...@@ -289,7 +294,7 @@
DateStr: "", DateStr: "",
//出团公司 //出团公司
OutBranchIds: [], OutBranchIds: [],
LineId: 14, LineId: 0,
PlaceID: 0, PlaceID: 0,
LineteamId: 0, LineteamId: 0,
//航空公司 //航空公司
...@@ -351,7 +356,11 @@ ...@@ -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({ this.$router.push({
name: path, name: path,
query: { query: {
...@@ -360,8 +369,8 @@ ...@@ -360,8 +369,8 @@
'flightTotal': obj.TotalSeat, 'flightTotal': obj.TotalSeat,
'GuestNum': obj.CommonReport.HouseStatistics.RealityNum, 'GuestNum': obj.CommonReport.HouseStatistics.RealityNum,
'NewCombinationNum': outItem.NewCombinationNum, 'NewCombinationNum': outItem.NewCombinationNum,
'LeaderName':obj.LeaderName, 'LeaderName': obj.LeaderName,
'GuideName':obj.GuideName, 'GuideName': obj.GuideName,
blank: 'y', blank: 'y',
tab: title tab: title
} }
...@@ -458,9 +467,8 @@ ...@@ -458,9 +467,8 @@
}, },
//根据当前员工所在部门获取该部门及子部门员工信息 //根据当前员工所在部门获取该部门及子部门员工信息
getEmployeeList() { getEmployeeList() {
let userInfo = this.getLocalStorage()
let msg = { let msg = {
GroupId: userInfo.RB_Group_id, GroupId: this.userInfo.RB_Group_id,
BranchId: '-1', BranchId: '-1',
DepartmentId: '-1', DepartmentId: '-1',
PostId: '-1', PostId: '-1',
...@@ -478,8 +486,7 @@ ...@@ -478,8 +486,7 @@
}, },
//初始化公司 //初始化公司
getCompanyList() { getCompanyList() {
let userInfo = this.getLocalStorage() var RB_Group_id = this.userInfo.RB_Group_id
var RB_Group_id = userInfo.RB_Group_id
let msg = { let msg = {
Status: 0, Status: 0,
is_show: 0, is_show: 0,
...@@ -496,8 +503,20 @@ ...@@ -496,8 +503,20 @@
err => {} 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() { mounted() {
this.userInfo = this.getLocalStorage();
let myDate = new Date(); let myDate = new Date();
let nowDate = let nowDate =
myDate.getFullYear() + myDate.getFullYear() +
...@@ -521,8 +540,10 @@ ...@@ -521,8 +540,10 @@
let height = window.innerHeight - 65 - 164; let height = window.innerHeight - 65 - 164;
this.boxHeight = height; this.boxHeight = height;
this.offsetwidth = width; this.offsetwidth = width;
//this.msg.CombinationNum = "HP20190713TN07A1"; if (this.userInfo.RB_Group_id == 2) {
this.getLinePlaceList(); this.msg.LineId = 14;
}
this.getLineList();
this.getAirlineList(); this.getAirlineList();
this.getEmployeeList(); this.getEmployeeList();
this.getCompanyList(); this.getCompanyList();
......
...@@ -278,6 +278,7 @@ ...@@ -278,6 +278,7 @@
DiningID: 0, DiningID: 0,
QStatus:0, QStatus:0,
loading: false, loading: false,
uid:0,
}, },
//餐厅列表 //餐厅列表
DinnerList: [], DinnerList: [],
...@@ -392,7 +393,7 @@ ...@@ -392,7 +393,7 @@
GetDinnerList() { GetDinnerList() {
this.apipost( this.apipost(
"dining_post_GetList", { "dining_post_GetList", {
QCountry: 651 QCountrys: "651,1252"
}, },
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
...@@ -408,6 +409,7 @@ ...@@ -408,6 +409,7 @@
this.Info(this.$t('sm.qxzcanting')); this.Info(this.$t('sm.qxzcanting'));
return; return;
} }
this.msg.uid=this.getLocalStorage().EmployeeId;
this.msg.loading = true; this.msg.loading = true;
let fileName = this.$t('ground.cantxiazai') + this.$commonUtils.getCurrentDate() + ".xls"; let fileName = this.$t('ground.cantxiazai') + this.$commonUtils.getCurrentDate() + ".xls";
this.GetLocalFile("dinner_get_downloadDinnerSalesBoard", this.msg, fileName, this.GetLocalFile("dinner_get_downloadDinnerSalesBoard", this.msg, fileName,
......
...@@ -2,10 +2,34 @@ ...@@ -2,10 +2,34 @@
<div> <div>
<div class="query-box" style="border-bottom: none;"> <div class="query-box" style="border-bottom: none;">
<ul> <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-select v-model="msg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option v-for="item in LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'> <el-option v-for="item in queryCommonData.LineTeamList" :label='item.LtName' :value='item.LtID'
:key='item.LtID'>
</el-option> </el-option>
</el-select> </el-select>
</span> </span>
...@@ -100,7 +124,8 @@ ...@@ -100,7 +124,8 @@
</tr> </tr>
</table> </table>
<el-button slot="reference" class="normalBtn mt5" <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-button>
</el-popover> </el-popover>
</td> </td>
...@@ -142,7 +167,7 @@ ...@@ -142,7 +167,7 @@
</td> </td>
<td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'> <td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
<div class="w80 link"> <div class="w80 link">
<p @click="goUrl('bookDinnerStatisticsDetails',item,outItem,'订餐详情')">{{$t('fnc.xiangqing')}}</p> <p @click="goDinnerDetails(item,outItem,'订餐详情')">{{$t('fnc.xiangqing')}}</p>
</div> </div>
</td> </td>
</tr> </tr>
...@@ -173,13 +198,15 @@ ...@@ -173,13 +198,15 @@
export default { export default {
data() { data() {
return { return {
userInfo: {}, //用户信息
loading: false, loading: false,
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 5, pageSize: 5,
SelectType: 2, SelectType: 2,
LineId: 14, LineId: 0,
LineteamId: "-1", PlaceID: 0,
LineteamId: 0,
StartDate: '', StartDate: '',
EndDate: '', EndDate: '',
currentPage: 1, currentPage: 1,
...@@ -188,11 +215,12 @@ ...@@ -188,11 +215,12 @@
}, },
//餐厅列表 //餐厅列表
DiningList: [], DiningList: [],
LineList: [], queryCommonData: {
LineTeamList: [], PlaceList: [],
thLengthTitle: [], LineList: [],
LineTeamList: [],
},
DataList: [], DataList: [],
colspanTotal: 0,
boxHeight: 0, boxHeight: 0,
} }
}, },
...@@ -211,27 +239,41 @@ ...@@ -211,27 +239,41 @@
getLineList() { getLineList() {
this.apipost("line_post_GetAllList", {}, res => { this.apipost("line_post_GetAllList", {}, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.LineList = res.data.data; this.queryCommonData.LineList = res.data.data;
this.queryCommonData.PlaceList = []
this.queryCommonData.LineTeamList = []
} else { } 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) { getLineTeamList() {
this.LineTeamList = []; this.msg.LineteamId = 0
this.apipost( let msg = {
"team_post_GetList", { lineID: this.msg.LineId,
lineID: 14, placeID: this.msg.PlaceID,
isTOOP: 1 isTOOP: 1
}, }
res => { this.apipost('team_post_GetList', msg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.msg.LineteamId = "-1"; this.queryCommonData.LineTeamList = res.data.data
this.LineTeamList = res.data.data;
}
} }
); })
}, },
goUrlR(path, obj, title) { goUrlR(path, obj, title) {
this.$router.push({ this.$router.push({
...@@ -253,7 +295,11 @@ ...@@ -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({ this.$router.push({
name: path, name: path,
query: { query: {
...@@ -309,7 +355,7 @@ ...@@ -309,7 +355,7 @@
this.DiningList = []; this.DiningList = [];
this.apipost( this.apipost(
"dining_post_GetList", { "dining_post_GetList", {
QCountry: 651, QCountrys: "651,1252"
}, },
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
...@@ -318,12 +364,12 @@ ...@@ -318,12 +364,12 @@
} }
); );
}, },
//餐厅下载 //餐厅下载
DownLoadDinner() { DownLoadDinner() {
this.loading = true; this.loading = true;
let qMsg = { let qMsg = {
queryMsg: this.msg, queryMsg: this.msg,
uid: this.getLocalStorage().EmployeeId uid: this.userInfo.EmployeeId
}; };
let fileName = this.$t('ground.cantxiazai') + this.$commonUtils.getCurrentDate() + ".xls"; let fileName = this.$t('ground.cantxiazai') + this.$commonUtils.getCurrentDate() + ".xls";
this.GetLocalFile("dinner_get_downloadDinner", qMsg, fileName, this.GetLocalFile("dinner_get_downloadDinner", qMsg, fileName,
...@@ -333,6 +379,10 @@ ...@@ -333,6 +379,10 @@
} }
}, },
mounted() { mounted() {
this.userInfo = this.getLocalStorage();
if (this.userInfo.RB_Group_id == 2) {
this.msg.LineId = 14;
}
let myDate = new Date(); let myDate = new Date();
let nowDate = let nowDate =
myDate.getFullYear() + myDate.getFullYear() +
...@@ -345,6 +395,7 @@ ...@@ -345,6 +395,7 @@
let height = window.innerHeight - 65 - 164; let height = window.innerHeight - 65 - 164;
this.boxHeight = height; this.boxHeight = height;
this.offsetwidth = width; this.offsetwidth = width;
this.getLineList();
this.GetDinnerList(); this.GetDinnerList();
this.getList(); 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