Skip to content

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

地接总表新增酒店使用情况

parent d49e4e9b
Hide whitespace changes
Inline Side-by-side
Showing with 160 additions and 94 deletions
src/components/dmc/manager/dmcTotalTable.vue
View file @ 2f56c8e5
......@@ -2,33 +2,34 @@
<div>
<div class="query-box dmcMain" style="border-bottom: none;">
<ul>
<li>
<span>
<li>
<span>
<em>线路</em>
<el-select v-model="msg.LineId" filterable :placeholder="$t('pub.pleaseSel')" @change="getLinePlaceList()">
<el-option label="不限" :value='0'></el-option>
<el-option v-for="item in queryCommonData.LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'>
<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>
<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>系列</em>
<el-select v-model="msg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')">
<el-option label="不限" :value='0'></el-option>
<el-option v-for="item in queryCommonData.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-select>
</span>
......@@ -40,17 +41,20 @@
</span>
</li>
<li><span><em>日期</em>
<el-date-picker v-model='msg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date" :picker-options="pickerBeginDateBefore"></el-date-picker>
<el-date-picker v-model='msg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date"
:picker-options="pickerBeginDateBefore"></el-date-picker>
-
<el-date-picker v-model='msg.EndDate' class='w135' value-format="yyyy-MM-dd" type="date" :picker-options="pickerBeginDateAfter"></el-date-picker>
<el-date-picker v-model='msg.EndDate' class='w135' value-format="yyyy-MM-dd" type="date"
:picker-options="pickerBeginDateAfter"></el-date-picker>
</span>
</li>
<li><span>
<em>状态</em>
<el-select v-model='msg.PriceStatus'>
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option v-for="team in $tripUtils.TeamStatesList.TeamStates" :label="team.Name" :key="team.Id" :value="team.Id" v-if="team.Id==1 || team.Id==3"></el-option>
</el-select>
<em>状态</em>
<el-select v-model='msg.PriceStatus'>
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option v-for="team in $tripUtils.TeamStatesList.TeamStates" :label="team.Name" :key="team.Id"
:value="team.Id" v-if="team.Id==1 || team.Id==3"></el-option>
</el-select>
</span>
</li>
<li>
......@@ -59,21 +63,21 @@
<el-select v-model="msg.AirLineId" filterable :placeholder="$t('system.ph_buxian')">
<el-option :label="$t('system.ph_buxian')" :value="0">
</el-option>
<el-option v-for="item in queryCommonData.AirlineList" :key="item.AirLineId"
:label="item.AlName" :value="item.AirLineId"></el-option>
<el-option v-for="item in queryCommonData.AirlineList" :key="item.AirLineId" :label="item.AlName"
:value="item.AirLineId"></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>OP</em>
<el-select v-model="msg.CreateBy" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value="0">
</el-option>
<el-option v-for="item in queryCommonData.EmployeeList" :label="item.EmName"
:value="item.EmployeeId" :key="item.EmployeeId"></el-option>
</el-select>
</span>
<el-select v-model="msg.CreateBy" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value="0">
</el-option>
<el-option v-for="item in queryCommonData.EmployeeList" :label="item.EmName" :value="item.EmployeeId"
:key="item.EmployeeId"></el-option>
</el-select>
</span>
</li>
<li>
<span>
......@@ -84,27 +88,29 @@
<li>
<span>
<em>出团公司</em>
<el-select v-model="msg.OutBranchIds" filterable multiple class="multiple_input" :placeholder="$t('pub.pleaseSel')">
<el-select v-model="msg.OutBranchIds" filterable multiple class="multiple_input"
:placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in queryCommonData.BranchList" :label='item.BName' :value='item.Id' :key='item.Id'>
</el-option>
</el-select>
</span>
</li>
<li>
<input type="button" class="normalBtn" value="查询" @click="getList();resetPageIndex()" />
</li>
</ul>
</div>
<div class="mt10 fz14 color333 dmcTotalIconStyle">
已确定:<span style="color:#4BCA81 ;">√</span>待确定:<span style="color: #E95252;">O</span>未处理:<span style="color:#E95252 ;">X</span>
已确定:<span style="color:#4BCA81 ;">√</span>待确定:<span style="color: #E95252;">O</span>未处理:<span
style="color:#E95252 ;">X</span>
</div>
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; margin-top: 10px; " class="ownScrollbarStyle">
<table border="0" cellspacing="1" cellpadding="0" class="dmcTotalTable" v-loading="loading">
<tr>
<th colspan="11">公司通用信息</th>
<th colspan="5">团队需求表</th>
<th colspan="7">地接op操作</th>
<th colspan="8">地接op操作</th>
</tr>
<tr>
<th width="130">序号</th>
......@@ -137,7 +143,7 @@
<td :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
{{outItem.NewCombinationNum}}
</td>
<td>
<td>
{{item.OutBranchName}}
</td>
<td>
......@@ -159,7 +165,8 @@
<td class="_d_name _color_666">
<span v-if="din==0">{{$t('Airticket.Air_go')}}</span>
<span v-else-if="din==item.FlightList.length-1">{{$t('Airticket.Air_returnTrip')}}</span>
<span v-else-if="din>0 && din!=item.FlightList.length-1">{{$t('Airticket.Air_transit')}}</span>
<span
v-else-if="din>0 && din!=item.FlightList.length-1">{{$t('Airticket.Air_transit')}}</span>
</td>
<td>
<div>{{ds.Flight_number}}</div>
......@@ -176,7 +183,8 @@
<td>{{ds.StopoverName}}</td>
</tr>
</table>
<el-button slot="reference" class="normalBtn mt5 restaurantDetails" style='height:20px; padding: 0 8px; background: #2AAEF2; border-color: #2AAEF2;'>详情</el-button>
<el-button slot="reference" class="normalBtn mt5 restaurantDetails"
style='height:20px; padding: 0 8px; background: #2AAEF2; border-color: #2AAEF2;'>详情</el-button>
</el-popover>
</div>
</td>
......@@ -227,7 +235,8 @@
</td>
<td>
<div class="fz16 fbold linkspan">
<span @click="goUrlRR('confirmationOrderDownLoad',item)" style="color: #4BCA81;" v-if="item.ResultReport.LetterDeparture==1">√</span>
<span @click="goUrlRR('confirmationOrderDownLoad',item)" style="color: #4BCA81;"
v-if="item.ResultReport.LetterDeparture==1">√</span>
<span class="colorE95252" v-else>{{item.ResultReport.LetterDeparture=='-1'?"x":"O"}}</span>
</div>
</td>
......@@ -254,6 +263,51 @@
<span style="color: #4BCA81;" v-if="item.ResultReport.HotelResult==1">√</span>
<span class="colorE95252" v-else>{{item.ResultReport.HotelResult=='-1'?"x":"O"}}</span>
</div>
<p v-if="item.LineId==14 && item.CommonReport.PriceHotelResult && item.CommonReport.PriceHotelResult.length>0" style="display:none;">
<el-popover width="600" trigger="click" popper-class="TC_HotelPop">
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
<tr>
<th width="100">日期</th>
<th style="border-right:1px solid #E5E5E5;width:150px;">酒店</th>
<th style="border-right:1px solid #E5E5E5;width:240px;">酒店情况</th>
<th style="border-right:1px solid #E5E5E5;width:100px">占房时间</th>
</tr>
<template v-for="hotelItem in item.CommonReport.PriceHotelResult">
<tr v-for="(hotelSubItem,hotelSubIndex) in hotelItem.SubList">
<td width="100" v-if="hotelSubIndex==0" :rowspan="hotelItem.SubList.length">
{{hotelItem.UseDay}}
</td>
<td style="text-align:left;padding-left:3px;">
{{hotelSubItem.HotelName}}
</td>
<td style="text-align:left;padding-left:3px;">
<a style="color:green" v-if="hotelSubItem.HotelName!='温馨的家'">
【<template v-if="hotelSubItem.OPState==1">
OP-OK
</template>
<template v-else-if="hotelSubItem.OPState==2&&hotelSubItem.DMCState==0">
OP-暂定
</template>
<template v-else>
{{hotelSubItem.DMCState==1?"地接-OK":(hotelSubItem.DMCState==2?"地接-暂定":"地接-未操作")}}
</template>
】
</a>
<a v-if="(hotelSubItem.OPState==1||(hotelSubItem.OPState==2 && hotelSubItem.DMCState==0))&& hotelSubItem.UseCount>0 "
style="color:green">
【使用: {{hotelSubItem.UseCount}} 间 {{hotelSubItem.CostPrice!=0?"价格:"+hotelSubItem.CostPrice:""}} 】
</a>
</td>
<td>
<template v-if="hotelSubItem.OPState==1||(hotelSubItem.OPState==2 && hotelSubItem.DMCState==0)">
{{hotelSubItem.CreateDateStr}}</template>
</td>
</tr>
</template>
</table>
<span slot="reference" class="price" style="cursor:pointer;text-decoration:underline;">酒店信息</span>
</el-popover>
</p>
</td>
<td>
<div class="fz16 fbold linkspan" @click="goUrl('admissionStatisticsDetails',item,outItem,'门票详情')">
......@@ -283,20 +337,24 @@
<div class="w250">
<el-button-group>
<el-tooltip class="item" effect="dark" content="收付款" placement="top-start">
<el-button icon="iconfont icon-shoufukuan" @click="goUrlT('teamRevenueExpenditure',item.TCID,'团队收支')" type="primary" style="background:#00C6FF; border-color:#00C6FF"></el-button>
<el-button icon="iconfont icon-shoufukuan"
@click="goUrlT('teamRevenueExpenditure',item.TCID,'团队收支')" type="primary"
style="background:#00C6FF; border-color:#00C6FF"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="添加备注" placement="top-start">
<el-popover placement="bottom" width="300" trigger="click">
<el-input class='mt10' v-model='remarkString' type='textarea'></el-input>
<p class="alcenter mt10">
<input type="button" value="保存" @click="saveRemark" class="normalBtn" />
</p>
<el-button type="primary" icon="iconfont icon-beizhu" slot="reference" @click='CkedItem(item)' style="background:#AD9AF6; border-color:#AD9AF6; border-radius: 0;"></el-button>
</el-popover>
<el-popover placement="bottom" width="300" trigger="click">
<el-input class='mt10' v-model='remarkString' type='textarea'></el-input>
<p class="alcenter mt10">
<input type="button" value="保存" @click="saveRemark" class="normalBtn" />
</p>
<el-button type="primary" icon="iconfont icon-beizhu" slot="reference" @click='CkedItem(item)'
style="background:#AD9AF6; border-color:#AD9AF6; border-radius: 0;"></el-button>
</el-popover>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="联系OP" placement="top-start">
<el-button @click='openChart(item)' icon="iconfont icon-dianhua" type="primary" style="background:#6DD875; border-color:#6DD875"></el-button>
<el-button @click='openChart(item)' icon="iconfont icon-dianhua" type="primary"
style="background:#6DD875; border-color:#6DD875"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="地接团号" placement="top-start">
<el-popover placement="bottom" width="300" trigger="click">
......@@ -304,7 +362,8 @@
<p class="alcenter mt10">
<input type="button" value="保存" @click="UpdateCombinationNum()" class="normalBtn" />
</p>
<el-button type="primary" icon="iconfont icon-jituan" slot="reference" @click='ClickNumItem(item.DMCNum,outItem.NewCombinationNum,outItem.TCIDs)'
<el-button type="primary" icon="iconfont icon-jituan" slot="reference"
@click='ClickNumItem(item.DMCNum,outItem.NewCombinationNum,outItem.TCIDs)'
style="background:#3333FF; border-color:#AD9AF6; border-radius: 0;"></el-button>
</el-popover>
</el-tooltip>
......@@ -316,10 +375,16 @@
<td colspan="22" style="text-align: left!important;padding:0 20px;">
<div class="link">
<p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')" style="padding-top:4px;">{{item.Titles}}</p>
<div v-if="outItem.StaticsReportList[index].DMCNum && outItem.StaticsReportList[index].DMCNum!=''" class="colorE95252" style="padding-top:5px;">地接备注团号:{{outItem.StaticsReportList[index].DMCNum}}</div>
<div v-show="outItem.StaticsReportList[index].OPInnerRemark!=''" class="colorE95252" style="padding-top:5px;">OP备注:{{outItem.StaticsReportList[index].OPInnerRemark}}</div>
<div v-show="outItem.StaticsReportList[index].OPRemark!=''" class="colorE95252" style="padding-top:5px;">OP对外备注:{{outItem.StaticsReportList[index].OPRemark}}</div>
<div v-show="outItem.StaticsReportList[0].DMCRemark!=''" class="colorE95252" style="padding-top:5px;padding-bottom:4px;">地接备注:{{outItem.StaticsReportList[index].DMCRemark}}</div>
<div v-if="outItem.StaticsReportList[index].DMCNum && outItem.StaticsReportList[index].DMCNum!=''"
class="colorE95252" style="padding-top:5px;">地接备注团号:{{outItem.StaticsReportList[index].DMCNum}}
</div>
<div v-show="outItem.StaticsReportList[index].OPInnerRemark!=''" class="colorE95252"
style="padding-top:5px;">OP备注:{{outItem.StaticsReportList[index].OPInnerRemark}}</div>
<div v-show="outItem.StaticsReportList[index].OPRemark!=''" class="colorE95252"
style="padding-top:5px;">OP对外备注:{{outItem.StaticsReportList[index].OPRemark}}</div>
<div v-show="outItem.StaticsReportList[0].DMCRemark!=''" class="colorE95252"
style="padding-top:5px;padding-bottom:4px;">地接备注:{{outItem.StaticsReportList[index].DMCRemark}}
</div>
</div>
</td>
</tr>
......@@ -327,8 +392,8 @@
</tbody>
</table>
</div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper"
:page-size="msg.pageSize" :total="total"></el-pagination>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total"></el-pagination>
</div>
</template>
<script>
......@@ -356,8 +421,8 @@
PlaceID: 0,
LineteamId: 0,
//航空公司
AirLineId:0,
CreateBy:0,
AirLineId: 0,
CreateBy: 0,
},
thLengthTitle: [],
list: [],
......@@ -367,15 +432,15 @@
DMCNum: "",
TCIDs: ""
},
queryCommonData:{
queryCommonData: {
//公司数据
BranchList: [],
//国家
PlaceList: [],
LineList: [],
LineTeamList: [],
AirlineList:[],
EmployeeList:[],
AirlineList: [],
EmployeeList: [],
},
pickerBeginDateBefore: {
disabledDate: time => {
......@@ -470,15 +535,15 @@
orderId: 0,
vshowA: true, //是否显示基础信息
vshowB: true, //是否显示航班
vshowC: false,//是否显示行程特色
vshowC: false, //是否显示行程特色
vshowD: true,
vshowE: false,//自费、费用包含、费用不含
vshowF: true,//购物说明，购物安排
vshowG: false,//重要提示、温馨提示 [订单须知]
vshowE: false, //自费、费用包含、费用不含
vshowF: true, //购物说明，购物安排
vshowG: false, //重要提示、温馨提示 [订单须知]
vshowH: false, //是否显示签证信息
vshowI: false,//是否显示同行备注
vshowI: false, //是否显示同行备注
vshowJ: false,
vshowK: true,//是否显示行程图片
vshowK: true, //是否显示行程图片
vshowL: false,
vshowM: false,
}
......@@ -495,18 +560,18 @@
}
})
},
goUrlT(path, obj,outItem, title) {
goUrlT(path, obj, outItem, title) {
this.$router.push({
name: path,
query: {
"id": obj,
NewCombinationNum:outItem.NewCombinationNum,
NewCombinationNum: outItem.NewCombinationNum,
blank: 'y',
tab: title
}
})
},
goUrl(path, obj,outItem, title) {
goUrl(path, obj, outItem, title) {
this.$router.push({
name: path,
query: {
......@@ -520,35 +585,35 @@
}
})
},
goUrlBus(path, obj,outItem, title) {
goUrlBus(path, obj, outItem, title) {
this.$router.push({
name: path,
query: {
"TCID": outItem.TCIDs,
StartDate: obj.StartDateStr,
DayNum: obj.DayNum,
TotalNumber: obj.TotalSeat, //机位总数
RealityYSeatNum:obj.CommonReport.HouseStatistics.RealityYSeatNum,
RealityESeatNum:obj.CommonReport.HouseStatistics.RealityESeatNum,
RealityFSeatNum:obj.CommonReport.HouseStatistics.RealityFSeatNum,
LeaderName:obj.LeaderName,
GuideName:obj.GuideName,
TotalNumber: obj.TotalSeat, //机位总数
RealityYSeatNum: obj.CommonReport.HouseStatistics.RealityYSeatNum,
RealityESeatNum: obj.CommonReport.HouseStatistics.RealityESeatNum,
RealityFSeatNum: obj.CommonReport.HouseStatistics.RealityFSeatNum,
LeaderName: obj.LeaderName,
GuideName: obj.GuideName,
NewCombinationNum: outItem.NewCombinationNum,
blank: 'y',
title:obj.Titles,
TCNUMS:obj.TCNUMS,
InOut:obj.InOut,
RealityNum:obj.CommonReport.HouseStatistics.RealityNum,
title: obj.Titles,
TCNUMS: obj.TCNUMS,
InOut: obj.InOut,
RealityNum: obj.CommonReport.HouseStatistics.RealityNum,
tab: title
}
})
},
goUrlLeaderIsApply(path, obj,outItem, title) {
goUrlLeaderIsApply(path, obj, outItem, title) {
this.$router.push({
name: path,
query: {
"id": outItem.TCIDs,
NewCombinationNum:outItem.NewCombinationNum,
NewCombinationNum: outItem.NewCombinationNum,
isUpdate: true,
blank: 'y',
tab: title
......@@ -570,19 +635,17 @@
if (res.data.resultCode == 1) {
this.total = res.data.data.count;
this.list = res.data.data.pageData.data;
console.log("this.List", this.list);
} else {
this.$message.error(res.data.message);
}
}, err => {})
},
ClickNumItem(DMCNum,newCombinationNum, tcids) {
if(DMCNum&& DMCNum!="")
{
this.NumObj.DMCNum = DMCNum;
}
else
{
this.NumObj.DMCNum = newCombinationNum;
ClickNumItem(DMCNum, newCombinationNum, tcids) {
if (DMCNum && DMCNum != "") {
this.NumObj.DMCNum = DMCNum;
} else {
this.NumObj.DMCNum = newCombinationNum;
}
this.NumObj.TCIDs = tcids;
},
......@@ -649,7 +712,7 @@
'admin_get_EmployeeGetList', {},
res => {
if (res.data.resultCode == 1) {
this.queryCommonData.EmployeeList = res.data.data
//this.queryCommonData.EmployeeList = res.data.data
}
},
err => {}
......@@ -676,10 +739,11 @@
</script>
<style>
.restaurantDetails{
color:#fff!important;
margin-bottom:5px;
.restaurantDetails {
color: #fff !important;
margin-bottom: 5px;
}
.dmcTotalSplitTrCss td {
background: #eee !important;
}
......@@ -797,7 +861,9 @@
.dmcTotalTable_tripDetails table tr._color_666 th {
padding: 9px 15px;
}
.dmcMain .el-checkbox+.el-checkbox{
margin-left:5px;
.dmcMain .el-checkbox+.el-checkbox {
margin-left: 5px;
}
</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