Skip to content

S
SuperMan
Commit ef27cbf8 authored by liudong1993's avatar liudong1993
Browse files
Options

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

parents 0da79b80 1579ce0b
Show whitespace changes
Inline Side-by-side
Showing with 234 additions and 101 deletions
src/components/Restaurant/restaurantList.vue
View file @ ef27cbf8
......@@ -369,7 +369,7 @@
</font>
</div>
</el-tooltip>
<div class="hotelTitle fz12">最低餐标: <font class="F3">{{item.MinDinnerPrice>0?item.MinDinnerPrice:"/"}}</font>
<div class="hotelTitle fz12">最低餐标: <font class="F3">{{item.UnitPrice>0?item.UnitPrice:"/"}}</font>
</div>
<div style="padding:0 0 15px 15px;margin-top: 5px;">
<i class="iconfont icon-renyuanguanli"></i>
......
src/components/Restaurant/restaurantRankingDetails.vue
View file @ ef27cbf8
......@@ -293,6 +293,8 @@
{{scope.row.TCNUM}}（ {{scope.row.TCID}}）
</template>
</el-table-column>
<el-table-column prop="DMCNum" label="地接团号">
</el-table-column>
<el-table-column prop="TeamTypeStr" label="团队类型">
</el-table-column>
<el-table-column prop="StartDate" label="出发日期">
......@@ -301,12 +303,19 @@
</el-table-column>
<el-table-column prop="DNum" label="大/中/小人数">
<template slot-scope="scope">
{{scope.row.DNum}}/ {{scope.row.ZNum}}/ {{scope.row.XNum}}
<span style="text-decoration:underline;cursor:pointer;" type="info" @click="goUrl('bookDinnerStatisticsDetails',scope.row.TCID)"> {{(scope.row.DNum>0&&scope.row.DUnitPrice>0)?scope.row.DNum:0}}
/{{(scope.row.ZNum>0&&scope.row.ZUnitPrice>0)?scope.row.ZNum:0}}
/{{(scope.row.XNum>0&&scope.row.XUnitPrice>0)?scope.row.XNum:0}}</span>
</template>
</el-table-column>
<el-table-column prop="DUnitPrice" label="大/中/小价格">
<template slot-scope="scope">
{{scope.row.DUnitPrice}}/ {{scope.row.ZUnitPrice}}/{{scope.row.XUnitPrice}}
<span style="text-decoration:underline;cursor:pointer;" type="info" @click="goUrl('bookDinnerStatisticsDetails',scope.row.TCID)">
{{(scope.row.DNum>0&&scope.row.DUnitPrice>0)?scope.row.DUnitPrice:0}}
/{{(scope.row.ZNum>0&&scope.row.ZUnitPrice>0)?scope.row.ZUnitPrice:0}}
/{{(scope.row.XNum>0&&scope.row.XUnitPrice>0)?scope.row.XUnitPrice:0}}
</span>
</template>
</el-table-column>
......@@ -436,7 +445,7 @@
query: {
id: id,
blank: 'y',
tab: '套餐查询'
tab: '餐厅预定详情'
}
});
},
......
src/components/Restaurant/restaurantRankingList.vue
View file @ ef27cbf8
......@@ -224,9 +224,11 @@
.restaurantList .comCursorUrl {
cursor: pointer;
}
.restaurantList .el-button{
.restaurantList .el-button {
width: 29px;
}
}
/* 餐厅列表 */
</style>
......@@ -237,8 +239,7 @@
<li>
<span>
<em>{{$t('system.quety_area')}}</em>
<el-select v-model="msg.PlaceID" class="w150" filterable
:placeholder="$t('hotel.hotel_province')">
<el-select v-model="msg.PlaceID" class="w150" filterable :placeholder="$t('hotel.hotel_province')">
<el-option :label="$t('pub.unlimitedSel')" :value="0"> </el-option>
<el-option v-for="item in provinceList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
......@@ -248,17 +249,16 @@
<li>
<span>
<em>使用日期</em>
<el-date-picker class="w150" type="date" v-model="msg.QStartDate"
:picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker>
<el-date-picker class="w150" type="date" v-model="msg.QEndDate"
:picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker>
<el-date-picker class="w150" type="date" v-model="msg.QStartDate" :picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd" placeholder></el-date-picker>
<el-date-picker class="w150" type="date" v-model="msg.QEndDate" :picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd" placeholder></el-date-picker>
</span>
</li>
<li>
<span>
<em>团队类型</em>
<el-select class="multiple_input" v-model="msg.TeamType" filterable
placeholder="请选择团队类型">
<el-select class="multiple_input" v-model="msg.TeamType" filterable placeholder="请选择团队类型">
<el-option :label="$t('pub.unlimitedSel')" :value="-1"> </el-option>
<el-option v-for='item in teamList' :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
......@@ -268,10 +268,9 @@
<li>
<span>
<em>出团公司</em>
<el-select class=" multiple_input" placeholder="请选择团队类型" v-model="msg.OutBranchId" >
<el-select class=" multiple_input" placeholder="请选择团队类型" v-model="msg.OutBranchId">
<el-option :label="$t('pub.unlimitedSel')" :value="-1"> </el-option>
<el-option v-for="item in CompanyList" :key="item.id" :label="item.bName"
:value="item.id"></el-option>
<el-option v-for="item in CompanyList" :key="item.id" :label="item.bName" :value="item.id"></el-option>
</el-select>
</span>
</li>
......@@ -281,37 +280,57 @@
</li>
</ul>
</div>
<el-table :data="tableData" tooltip-effect="dark" style="width: 100%;min-height:450px;" v-loading="loading" >
<el-table :data="tableData" tooltip-effect="dark" style="width: 100%;min-height:450px;" v-loading="loading">
<el-table-column prop="NewDinnerName" label="餐厅名称">
</el-table-column>
<el-table-column prop="DinnerRealName" label="餐厅真实名称">
</el-table-column>
<el-table-column width="150" prop="UserNum" label="使用次数">
<template slot-scope="scope">
<a style="color:blue;text-decoration:underline;cursor:pointer;"
@click="goToDetailsUrl(scope.row,0)">{{scope.row.UserNum}}</a>
</template>
</el-table-column>
<el-table-column width="150" prop="PriceNormalUseNum" label="常规团使用次数">
<template slot-scope="scope">
<a style="color:blue;text-decoration:underline;cursor:pointer;"
@click="goToDetailsUrl(scope.row,1)">{{scope.row.PriceNormalUseNum}}</a>
</template>
</el-table-column>
<el-table-column width="150" prop="PriceNormalPeopleNum" label="常规团使用人数">
<template slot-scope="scope">
<a style="color:blue;text-decoration:underline;cursor:pointer;"
@click="goToDetailsUrl(scope.row,1)">{{scope.row.PriceNormalPeopleNum}}</a>
</template>
</el-table-column>
<el-table-column width="150" prop="PriceOneDayTripUseNum" label="小包团使用次数">
</el-table-column>
<el-table-column width="150" prop="PriceOneDayTripPeopleNum" label="小包团使用人数">
<el-table-column width="150" prop="PricePacketGroupUseNum" label="小包团使用次数">
<template slot-scope="scope">
<a style="color:blue;text-decoration:underline;cursor:pointer;"
@click="goToDetailsUrl(scope.row,2)">{{scope.row.PricePacketGroupUseNum}}</a>
</template>
</el-table-column>
<el-table-column width="150" prop="PricePacketGroupUseNum" label="当地游团使用次数">
<el-table-column width="150" prop="PricePacketGroupPeopleNum" label="小包团使用人数">
<template slot-scope="scope">
<a style="color:blue;text-decoration:underline;cursor:pointer;"
@click="goToDetailsUrl(scope.row,2)">{{scope.row.PricePacketGroupPeopleNum}}</a>
</template>
</el-table-column>
<el-table-column width="150" prop="PricePacketGroupPeopleNum" label="当地游团使用人数">
<el-table-column width="150" prop="PriceOneDayTripUseNum" label="当地游团使用次数">
<template slot-scope="scope">
<a style="color:blue;text-decoration:underline;cursor:pointer;"
@click="goToDetailsUrl(scope.row,3)">{{scope.row.PriceOneDayTripUseNum}}</a>
</template>
</el-table-column>
<el-table-column :label="$t('system.table_operation')" width="80">
<el-table-column width="150" prop="PriceOneDayTripPeopleNum" label="当地游团使用人数">
<template slot-scope="scope">
<el-tooltip class="item" effect="dark" content="餐厅使用详情" placement="top">
<el-button @click="goUrl('restaurantRankingDetails',scope.row.NewDiningID,scope.row.NewDinnerName,scope.row.DinnerRealName)" type="primary" icon="iconfont icon-menpiao1" circle>
</el-button>
</el-tooltip>
<a style="color:blue;text-decoration:underline;cursor:pointer;"
@click="goToDetailsUrl(scope.row,3)">{{scope.row.PriceOneDayTripPeopleNum}}</a>
</template>
</el-table-column>
</el-table>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage"
:page-size="msg.pageSize" layout="total,prev, pager, next, jumper" :total="msg.total" v-if="tableData.length>0"></el-pagination>
<!-- <div v-if="tableData.length===0">{{$t('system.content_noData')}}</div> -->
:page-size="msg.pageSize" layout="total,prev, pager, next, jumper" :total="msg.total" v-if="tableData.length>0">
</el-pagination>
</div>
</template>
......@@ -319,15 +338,11 @@
export default {
data() {
return {
total: 0,
currentPage: 1,
provinceList: "",
tableData: [],
CompanyList: [], //出团公司
teamList: [],//团队类型
teamList: [], //团队类型
loading: true,
defaultImg: 'this.src="' + require("../../assets/img/bg_z1@2x.png") + '"',
msg: {
pageIndex: 1,
pageSize: 10,
......@@ -336,7 +351,9 @@
OutBranchId: -1,
PlaceID: 0,
TeamType: -1,
DiningId:0,
DiningId: 0,
currentPage: 1,
total: 0,
},
pickerBeginDateBefore: {
disabledDate: time => {
......@@ -363,7 +380,7 @@
},
resetPageIndex() {
this.msg.pageIndex = 1;
this.currentPage = 1;
this.msg.currentPage = 1;
},
getTeamList() {
//出团公司
......@@ -373,9 +390,7 @@
if (res.data.resultCode == 1) {
this.teamList = res.data.data;
}
},
err => {}
);
});
},
//根据省份获取城市
getProvinceList(ID, type) {
......@@ -386,30 +401,18 @@
this.msg.QProvince = "";
this.msg.QCity = "";
this.msg.QDistrict = "";
} else if (type == 2) {
this.msg.QCity = "";
this.msg.QDistrict = "";
} else if (type == 3) {
this.msg.QDistrict = "";
}
// if (this.msg.QCountry !== "") {
this.apipost(
"dict_post_Destination_GetChildList",
msg,
res => {
if (type == 1) {
this.provinceList = res.data.data;
} else if (type == 2) {
this.cityList = res.data.data;
} else if (type == 3) {
this.district = res.data.data;
}
},
err => {}
);
// }
},
//获取餐厅使用排行列表
selectResource() {
this.loading = true;
......@@ -422,34 +425,47 @@
this.total = res.data.data.count;
this.tableData = res.data.data.pageData;
this.msg.total = res.data.data.count;
this.tableData.forEach(x => {
if (x.FoodTag != "") {
x.FoodTagArr = x.FoodTag.split(",").slice(0, 3);
}
});
}
},
null
);
},
goUrl(path, id,NewDinnerName,DinnerRealName) {
this.$router.push({
path: path,
query: {
NewDinnerName:NewDinnerName,
DinnerRealName:DinnerRealName,
QStartDate:this.msg.QStartDate,
//跳转到详情
goToDetailsUrl(item, type) {
let path = 'restaurantRankingDetails';
var qMsg = {
NewDinnerName: item.NewDinnerName,
DinnerRealName: item.DinnerRealName,
QStartDate: this.msg.QStartDate,
QEndDate: this.msg.QEndDate,
OutBranchId: this.msg.OutBranchId,
PlaceID: this.msg.PlaceID,
TeamType: this.msg.TeamType,
DiningId:id,
TeamType: -1,
DiningId: item.NewDiningID,
blank: 'y',
tab: '餐厅使用详情'
};
//总次数
if (type == 0) {
qMsg.TeamType = -1;
}
//常规团
else if (type == 1) {
qMsg.TeamType = 0;
}
//小包团
else if (type == 2) {
qMsg.TeamType = 1;
}
//当地游
else if (type == 3) {
qMsg.TeamType = 2;
}
this.$router.push({
path: path,
query: qMsg
});
},
getSellorCompany() {
//出团公司
this.apipost(
......@@ -465,13 +481,13 @@
},
created() {
var myDate = new Date();
var nowDate = myDate.getFullYear() + "-" + parseInt(myDate.getMonth() ) + "-" + myDate.getDate();
var nowDate = myDate.getFullYear() + "-" + parseInt(myDate.getMonth()) + "-" + myDate.getDate();
var nowEDate = myDate.getFullYear() + "-" + parseInt(myDate.getMonth() + 1) + "-" + myDate.getDate();
this.msg.QStartDate = nowDate;
this.msg.QEndDate = nowEDate;
},
mounted() {
this.getProvinceList(651,1);
this.getProvinceList(651, 1);
this.getTeamList();
this.getSellorCompany();
this.selectResource();
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ ef27cbf8
......@@ -2100,7 +2100,8 @@
this.queryCommonData.dataList = res.data.data.pageData;
this.queryMsg.total = res.data.data.count;
this.queryMsg.noData = !this.queryMsg.total > 0;
this.getDiningDetailsList()
this.getDiningDetailsList();
this.getPriceHotelResultStatisticsList();
if (!this.isCommissionDetails) return
this.getDetailsOfRoyalty()
this.getTravelAccountStatus()
......@@ -2135,9 +2136,13 @@
)
},
getDiningDetailsList() {
let Ids = this.queryCommonData.dataList.map(x => {
return x.TCID
})
let Ids=[];
this.queryCommonData.dataList.forEach((item,index) => {
if((item.LineID==14 || item.LineID==90|| item.LineID==168||item.LineID==118)){
Ids.push(item.TCID)
}
});
if(Ids&&Ids.length>0){
let msg = [...new Set(Ids)]
this.apipost(
"dmcstatistics_get_GetDiningStatisticsList", {
......@@ -2158,6 +2163,37 @@
}
}
)
}
},
getPriceHotelResultStatisticsList() {
let Ids=[];
this.queryCommonData.dataList.forEach((item,index) => {
if((item.LineID==14 || item.LineID==90|| item.LineID==168||item.LineID==118)){
Ids.push(item.TCID)
}
});
if(Ids&&Ids.length>0){
let msg = [...new Set(Ids)]
this.apipost(
"travel_get_GetPriceHotelResultStatisticsList", {
tcids: msg.join(',')
},
res => {
if (res.data.resultCode == 1) {
let DiningStatisticsList = []
DiningStatisticsList = res.data.data
this.queryCommonData.dataList.forEach(x => {
DiningStatisticsList.forEach(y => {
if (x.TCID == y.TCID) {
x.HotelOrderListReports = y.HotelOrderListReports
}
})
})
this.$forceUpdate()
}
}
)
}
},
getTravelAccountStatus() {
let Ids = this.queryCommonData.dataList.map(x => {
......@@ -3106,8 +3142,8 @@
if (routeName == 'TravelControlList2') {
this.queryMsg.TeamType = 0;
}
this.getTeamList();
this.getControlList();
this.getTeamList();
}
};
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ ef27cbf8
......@@ -1555,6 +1555,7 @@
this.queryMsg.total = res.data.data.count;
this.queryMsg.noData = !this.queryMsg.total > 0;
this.getDiningDetailsList();
this.getPriceHotelResultStatisticsList();
if (!this.isCommissionDetails) return
this.getDetailsOfRoyalty();
this.getTravelAccountStatus();
......@@ -1563,10 +1564,44 @@
err => {}
);
},
getDiningDetailsList() {
let Ids = this.queryCommonData.dataList.map(x => {
return x.TCID
getPriceHotelResultStatisticsList() {
let Ids=[];
this.queryCommonData.dataList.forEach((item,index) => {
if((item.LineID==14 || item.LineID==90|| item.LineID==168||item.LineID==118)){
Ids.push(item.TCID)
}
});
if(Ids&&Ids.length>0){
let msg = [...new Set(Ids)]
this.apipost(
"travel_get_GetPriceHotelResultStatisticsList", {
tcids: msg.join(',')
},
res => {
if (res.data.resultCode == 1) {
let DiningStatisticsList = []
DiningStatisticsList = res.data.data
this.queryCommonData.dataList.forEach(x => {
DiningStatisticsList.forEach(y => {
if (x.TCID == y.TCID) {
x.HotelOrderListReports = y.HotelOrderListReports
}
})
})
this.$forceUpdate()
}
}
)
}
},
getDiningDetailsList() {
let Ids=[];
this.queryCommonData.dataList.forEach((item,index) => {
if((item.LineID==14 || item.LineID==90|| item.LineID==168||item.LineID==118)){
Ids.push(item.TCID)
}
});
if(Ids&&Ids.length>0){
let msg = [...new Set(Ids)]
this.apipost(
"dmcstatistics_get_GetDiningStatisticsList", {
......@@ -1587,6 +1622,7 @@
}
}
)
}
},
getDetailsOfRoyalty() {
let Ids = this.queryCommonData.dataList.map(x => {
......
src/components/TravelManager/TravelList/oneDayTrip.vue
View file @ ef27cbf8
......@@ -1462,7 +1462,8 @@
this.queryCommonData.dataList = res.data.data.pageData
this.queryMsg.total = res.data.data.count
this.queryMsg.noData = !this.queryMsg.total > 0;
this.getDiningDetailsList()
this.getDiningDetailsList();
this.getPriceHotelResultStatisticsList();
if (!this.isCommissionDetails) return
this.getDetailsOfRoyalty()
}
......@@ -1471,9 +1472,13 @@
)
},
getDiningDetailsList() {
let Ids = this.queryCommonData.dataList.map(x => {
return x.TCID
})
let Ids=[];
this.queryCommonData.dataList.forEach((item,index) => {
if((item.LineID==14 || item.LineID==90|| item.LineID==168||item.LineID==118)){
Ids.push(item.TCID)
}
});
if(Ids&&Ids.length>0){
let msg = [...new Set(Ids)]
this.apipost(
"dmcstatistics_get_GetDiningStatisticsList", {
......@@ -1494,6 +1499,7 @@
}
}
)
}
},
getDetailsOfRoyalty() {
let Ids = this.queryCommonData.dataList.map(x => {
......@@ -1995,6 +2001,36 @@
this.queryCommonData.UploadWORDTip = true
this.queryCommonData.UploadItem = item
},
getPriceHotelResultStatisticsList() {
let Ids=[];
this.queryCommonData.dataList.forEach((item,index) => {
if((item.LineID==14 || item.LineID==90|| item.LineID==168||item.LineID==118)){
Ids.push(item.TCID)
}
});
if(Ids&&Ids.length>0){
let msg = [...new Set(Ids)]
this.apipost(
"travel_get_GetPriceHotelResultStatisticsList", {
tcids: msg.join(',')
},
res => {
if (res.data.resultCode == 1) {
let DiningStatisticsList = []
DiningStatisticsList = res.data.data
this.queryCommonData.dataList.forEach(x => {
DiningStatisticsList.forEach(y => {
if (x.TCID == y.TCID) {
x.HotelOrderListReports = y.HotelOrderListReports
}
})
})
this.$forceUpdate()
}
}
)
}
},
//保存WORD路劲
UploadAttachment(file) {
var that = this
......
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