Skip to content

S
SuperMan
Commit bd6c1064 authored by 吴春's avatar 吴春
Browse files
Options

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

parents cbd6c44e 7c37236d
Show whitespace changes
Inline Side-by-side
Showing with 101 additions and 80 deletions
src/components/Restaurant/restaurantRankingList.vue
View file @ bd6c1064
...@@ -224,9 +224,11 @@ ...@@ -224,9 +224,11 @@
.restaurantList .comCursorUrl { .restaurantList .comCursorUrl {
cursor: pointer; cursor: pointer;
} }
.restaurantList .el-button{
.restaurantList .el-button {
width: 29px; width: 29px;
} }
/* 餐厅列表 */ /* 餐厅列表 */
</style> </style>
...@@ -237,8 +239,7 @@ ...@@ -237,8 +239,7 @@
<li> <li>
<span> <span>
<em>{{$t('system.quety_area')}}</em> <em>{{$t('system.quety_area')}}</em>
<el-select v-model="msg.PlaceID" class="w150" filterable <el-select v-model="msg.PlaceID" class="w150" filterable :placeholder="$t('hotel.hotel_province')">
:placeholder="$t('hotel.hotel_province')">
<el-option :label="$t('pub.unlimitedSel')" :value="0"> </el-option> <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-option v-for="item in provinceList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select> </el-select>
...@@ -248,17 +249,16 @@ ...@@ -248,17 +249,16 @@
<li> <li>
<span> <span>
<em>使用日期</em> <em>使用日期</em>
<el-date-picker class="w150" type="date" v-model="msg.QStartDate" <el-date-picker class="w150" type="date" v-model="msg.QStartDate" :picker-options="pickerBeginDateBefore"
:picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker> value-format="yyyy-MM-dd" placeholder></el-date-picker>
<el-date-picker class="w150" type="date" v-model="msg.QEndDate" <el-date-picker class="w150" type="date" v-model="msg.QEndDate" :picker-options="pickerBeginDateAfter"
:picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker> value-format="yyyy-MM-dd" placeholder></el-date-picker>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>团队类型</em> <em>团队类型</em>
<el-select class="multiple_input" v-model="msg.TeamType" filterable <el-select class="multiple_input" v-model="msg.TeamType" filterable placeholder="请选择团队类型">
placeholder="请选择团队类型">
<el-option :label="$t('pub.unlimitedSel')" :value="-1"> </el-option> <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 v-for='item in teamList' :key="item.ID" :label="item.Name" :value="item.ID">
</el-option> </el-option>
...@@ -268,10 +268,9 @@ ...@@ -268,10 +268,9 @@
<li> <li>
<span> <span>
<em>出团公司</em> <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 :label="$t('pub.unlimitedSel')" :value="-1"> </el-option>
<el-option v-for="item in CompanyList" :key="item.id" :label="item.bName" <el-option v-for="item in CompanyList" :key="item.id" :label="item.bName" :value="item.id"></el-option>
:value="item.id"></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
...@@ -281,37 +280,57 @@ ...@@ -281,37 +280,57 @@
</li> </li>
</ul> </ul>
</div> </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 prop="NewDinnerName" label="餐厅名称">
</el-table-column> </el-table-column>
<el-table-column prop="DinnerRealName" label="餐厅真实名称"> <el-table-column prop="DinnerRealName" label="餐厅真实名称">
</el-table-column> </el-table-column>
<el-table-column width="150" prop="UserNum" label="使用次数"> <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>
<el-table-column width="150" prop="PriceNormalUseNum" label="常规团使用次数"> <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>
<el-table-column width="150" prop="PriceNormalPeopleNum" label="常规团使用人数"> <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>
<el-table-column width="150" prop="PriceOneDayTripUseNum" label="小包团使用次数"> <el-table-column width="150" prop="PricePacketGroupUseNum" label="小包团使用次数">
</el-table-column> <template slot-scope="scope">
<el-table-column width="150" prop="PriceOneDayTripPeopleNum" label="小包团使用人数"> <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>
<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>
<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>
<el-table-column :label="$t('system.table_operation')" width="80"> <el-table-column width="150" prop="PriceOneDayTripPeopleNum" label="当地游团使用人数">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip class="item" effect="dark" content="餐厅使用详情" placement="top"> <a style="color:blue;text-decoration:underline;cursor:pointer;"
<el-button @click="goUrl('restaurantRankingDetails',scope.row.NewDiningID,scope.row.NewDinnerName,scope.row.DinnerRealName)" type="primary" icon="iconfont icon-menpiao1" circle> @click="goToDetailsUrl(scope.row,3)">{{scope.row.PriceOneDayTripPeopleNum}}</a>
</el-button>
</el-tooltip>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage" <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> :page-size="msg.pageSize" layout="total,prev, pager, next, jumper" :total="msg.total" v-if="tableData.length>0">
<!-- <div v-if="tableData.length===0">{{$t('system.content_noData')}}</div> --> </el-pagination>
</div> </div>
</template> </template>
...@@ -319,15 +338,11 @@ ...@@ -319,15 +338,11 @@
export default { export default {
data() { data() {
return { return {
total: 0,
currentPage: 1,
provinceList: "", provinceList: "",
tableData: [], tableData: [],
CompanyList: [], //出团公司 CompanyList: [], //出团公司
teamList: [],//团队类型 teamList: [], //团队类型
loading: true, loading: true,
defaultImg: 'this.src="' + require("../../assets/img/bg_z1@2x.png") + '"',
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 10, pageSize: 10,
...@@ -336,7 +351,9 @@ ...@@ -336,7 +351,9 @@
OutBranchId: -1, OutBranchId: -1,
PlaceID: 0, PlaceID: 0,
TeamType: -1, TeamType: -1,
DiningId:0, DiningId: 0,
currentPage: 1,
total: 0,
}, },
pickerBeginDateBefore: { pickerBeginDateBefore: {
disabledDate: time => { disabledDate: time => {
...@@ -363,7 +380,7 @@ ...@@ -363,7 +380,7 @@
}, },
resetPageIndex() { resetPageIndex() {
this.msg.pageIndex = 1; this.msg.pageIndex = 1;
this.currentPage = 1; this.msg.currentPage = 1;
}, },
getTeamList() { getTeamList() {
//出团公司 //出团公司
...@@ -373,9 +390,7 @@ ...@@ -373,9 +390,7 @@
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.teamList = res.data.data; this.teamList = res.data.data;
} }
}, });
err => {}
);
}, },
//根据省份获取城市 //根据省份获取城市
getProvinceList(ID, type) { getProvinceList(ID, type) {
...@@ -386,30 +401,18 @@ ...@@ -386,30 +401,18 @@
this.msg.QProvince = ""; this.msg.QProvince = "";
this.msg.QCity = ""; this.msg.QCity = "";
this.msg.QDistrict = ""; 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( this.apipost(
"dict_post_Destination_GetChildList", "dict_post_Destination_GetChildList",
msg, msg,
res => { res => {
if (type == 1) { if (type == 1) {
this.provinceList = res.data.data; this.provinceList = res.data.data;
} else if (type == 2) {
this.cityList = res.data.data;
} else if (type == 3) {
this.district = res.data.data;
} }
}, },
err => {} err => {}
); );
// }
}, },
//获取餐厅使用排行列表 //获取餐厅使用排行列表
selectResource() { selectResource() {
this.loading = true; this.loading = true;
...@@ -427,24 +430,42 @@ ...@@ -427,24 +430,42 @@
null null
); );
}, },
goUrl(path, id,NewDinnerName,DinnerRealName) { //跳转到详情
this.$router.push({ goToDetailsUrl(item, type) {
path: path, let path = 'restaurantRankingDetails';
query: { var qMsg = {
NewDinnerName:NewDinnerName, NewDinnerName: item.NewDinnerName,
DinnerRealName:DinnerRealName, DinnerRealName: item.DinnerRealName,
QStartDate:this.msg.QStartDate, QStartDate: this.msg.QStartDate,
QEndDate: this.msg.QEndDate, QEndDate: this.msg.QEndDate,
OutBranchId: this.msg.OutBranchId, OutBranchId: this.msg.OutBranchId,
PlaceID: this.msg.PlaceID, PlaceID: this.msg.PlaceID,
TeamType: this.msg.TeamType, TeamType: -1,
DiningId:id, DiningId: item.NewDiningID,
blank: 'y', blank: 'y',
tab: '餐厅使用详情' 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() { getSellorCompany() {
//出团公司 //出团公司
this.apipost( this.apipost(
...@@ -460,13 +481,13 @@ ...@@ -460,13 +481,13 @@
}, },
created() { created() {
var myDate = new Date(); 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(); var nowEDate = myDate.getFullYear() + "-" + parseInt(myDate.getMonth() + 1) + "-" + myDate.getDate();
this.msg.QStartDate = nowDate; this.msg.QStartDate = nowDate;
this.msg.QEndDate = nowEDate; this.msg.QEndDate = nowEDate;
}, },
mounted() { mounted() {
this.getProvinceList(651,1); this.getProvinceList(651, 1);
this.getTeamList(); this.getTeamList();
this.getSellorCompany(); this.getSellorCompany();
this.selectResource(); this.selectResource();
......
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