Skip to content

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

页面修改

parent 679e0c1d
Hide whitespace changes
Inline Side-by-side
Showing with 91 additions and 89 deletions
src/components/dmc/manager/dmcTotalTable.vue
View file @ f81b2151
......@@ -98,7 +98,8 @@
<li>
<span>
<em>领队类型</em>
<el-select v-model="msg.LeaderType" class="multiple_input" :placeholder="$t('pub.pleaseSel')" @change="GetLeaderList()">
<el-select v-model="msg.LeaderType" class="multiple_input" :placeholder="$t('pub.pleaseSel')"
@change="GetLeaderList()">
<el-option label='请选择' :value='0' :key='0'>
</el-option>
<el-option label='领队' :value='1' :key='1'>
......@@ -163,16 +164,16 @@
<th width="120">操作</th>
</tr>
<tbody v-for="(outItem,outindex) in list" :class="{dmcTotalSplitTrCss:outindex%2!=0}">
<template v-for="(item,index) in outItem.StaticsReportList">
<template v-for="(item,index) in outItem.PriceCommonList">
<tr>
<td :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<td :rowspan="2*outItem.PriceCommonList.length" v-if='index==0'>
{{outItem.NewCombinationNum}}
</td>
<td>
{{item.OutBranchName}}
</td>
<td>
{{item.StartCityNames}}
{{item.StartCityName}}
</td>
<td>
<div class="w120">
......@@ -198,7 +199,7 @@
<div style="margin-top:5px;">{{ds.AlName}}</div>
</td>
<td>
<div>{{ds.FlightDate}} {{ds.Departure_time}}</div>
<div>{{ds.FlightDateStr}} {{ds.Departure_time}}</div>
<div style="margin-top:5px;">{{ds.dName}}</div>
</td>
<td>
......@@ -225,12 +226,12 @@
{{item.InOut}}
</td>
<td>
{{item.CommonReport.HouseStatistics.RealityNum}}
{{item.OrderGuestNum}}
</td>
<td>
<div class="link">
<p @click="goUrlT('RegistrationList',item.TCIDS,'报名清单')">
{{item.TotalSeat}}/{{item.CommonReport.HouseStatistics.RealityYSeatNum}}/{{item.CommonReport.HouseStatistics.RealityESeatNum}}/{{item.CommonReport.HouseStatistics.RealityFSeatNum}}/{{item.CommonReport.HouseStatistics.SingleDMNum}}
{{item.TotalSeat}}/{{item.YSeatNum}}/{{item.ESeatNum}}/{{item.FSeatNum}}/{{item.SingleDMNum}}
</p>
</div>
</td>
......@@ -248,77 +249,77 @@
</td>
<td>
<div class="fz16 fbold">
<span style="color: #4BCA81;" v-if="item.ResultReport.MakeInvoice==1">√</span>
<span class="colorE95252" v-else>{{item.ResultReport.MakeInvoice=='-1'?"x":"O"}}</span>
<span style="color: #4BCA81;" v-if="item.MakeInvoice==1">√</span>
<span class="colorE95252" v-else>{{item.MakeInvoice=='-1'?"x":"O"}}</span>
</div>
</td>
<td>
<div class="fz16 fbold linkspan" @click="goUrlT('TravelPassengerList',item.TCID,'旅客名单')">
<span style="color: #4BCA81;" v-if="item.ResultReport.HouseResult==1">√</span>
<span class="colorE95252" v-else>{{item.ResultReport.HouseResult=='-1'?"x":"O"}}</span>
<span style="color: #4BCA81;" v-if="item.HouseResult==1">√</span>
<span class="colorE95252" v-else>{{item.HouseResult=='-1'?"x":"O"}}</span>
</div>
</td>
<td>
<div class="fz16 fbold linkspan">
<span @click="toTrip(item)" style="color: #4BCA81;"
v-if="item.ResultReport.LetterDeparture==1">√</span>
<span class="colorE95252" @click="toTrip(item)" v-else>{{item.ResultReport.LetterDeparture=='-1'?"x":"O"}}</span>
<span @click="toTrip(item)" style="color: #4BCA81;" v-if="item.OutNotice==1">√</span>
<span class="colorE95252" @click="toTrip(item)" v-else>{{item.OutNotice=='-1'?"x":"O"}}</span>
</div>
</td>
<td>
<div class="fz16 fbold linkspan" @click="goUrlT('groundOperation',outItem.TCIDs,'导游计划表')">
<span style="color: #4BCA81;" v-if="item.ResultReport.LeaderPlan==1">√</span>
<span class="colorE95252" v-else>{{item.ResultReport.LeaderPlan=='-1'?"x":"O"}}</span>
<div class="fz16 fbold linkspan" @click="goUrlT('groundOperation',outItem.TCIDS,outItem,'导游计划表')">
<span style="color: #4BCA81;" v-if="item.LeaderPlan==1">√</span>
<span class="colorE95252" v-else>{{item.LeaderPlan=='-1'?"x":"O"}}</span>
</div>
</td>
<td>
<div class="fz16 fbold linkspan" @click="goUrlT('LeaderHander',item.TCID,outItem,'领队交接表')">
<span style="color: #4BCA81;" v-if="item.ResultReport.Associate==1">√</span>
<span class="colorE95252" v-else>{{item.ResultReport.Associate=='-1'?"x":"O"}}</span>
<span style="color: #4BCA81;" v-if="item.Associate==1">√</span>
<span class="colorE95252" v-else>{{item.Associate=='-1'?"x":"O"}}</span>
</div>
</td>
<td>
<div class="fz16 fbold linkspan" @click="goUrlLeaderIsApply('leaderReimbursement',item,outItem,'用款计划')">
<span style="color: #4BCA81;" v-if="item.ResultReport.UseMoney==1">√</span>
<span class="colorE95252" v-else>{{item.ResultReport.UseMoney=='-1'?"x":"O"}}</span>
<span style="color: #4BCA81;" v-if="item.UseMoney==1">√</span>
<span class="colorE95252" v-else>{{item.UseMoney=='-1'?"x":"O"}}</span>
</div>
</td>
<td>
<div class="fz16 fbold linkspan" @click="goUrl('roomReservationsDetails',item,outItem,'订房详情')">
<span style="color: #4BCA81;" v-if="item.ResultReport.HotelResult==1">√</span>
<span class="colorE95252" v-else>{{item.ResultReport.HotelResult=='-1'?"x":"O"}}</span>
<span style="color: #4BCA81;" v-if="item.HotelResult==1">√</span>
<span class="colorE95252" v-else>{{item.HotelResult=='-1'?"x":"O"}}</span>
</div>
<p
v-if="item.LineId==14 && item.CommonReport.PriceHotelResult && item.CommonReport.PriceHotelResult.length>0">
<p v-if="item.LineId==14 && item.PriceHotelResult && item.PriceHotelResult.length>0">
<el-popover width="900" trigger="click" popper-class="DMC_HotelPop">
<commonHotelInfo :HotelObj="item.CommonReport.PriceHotelResult" :showHotelObj="showHotelObj"
:TCID="item.TCID" :DMCNum="item.DMCNum" :TCNUM="item.TCNUMS" @SetShouPeiShu="SetShouPeiShu(item.TCID,item.ShouPeiStatus)"></commonHotelInfo>
<commonHotelInfo :HotelObj="item.PriceHotelResult" :showHotelObj="showHotelObj" :TCID="item.TCID"
:DMCNum="item.DMCNum" :TCNUM="item.TCNUMS"
@SetShouPeiShu="SetShouPeiShu(item.TCID,item.ShouPeiStatus)"></commonHotelInfo>
<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,'门票详情')">
<span style="color: #4BCA81;" v-if="item.ResultReport.TicketsResult==1">√</span>
<span class="colorE95252" v-else>{{item.ResultReport.TicketsResult=='-1'?"x":"O"}}</span>
<span style="color: #4BCA81;" v-if="item.TicketsResult==1">√</span>
<span class="colorE95252" v-else>{{item.TicketsResult=='-1'?"x":"O"}}</span>
</div>
</td>
<td>
<div class="fz16 fbold linkspan" @click="goUrl('bookDinnerStatisticsDetails',item,outItem,'餐厅详情')">
<span style="color: #4BCA81;" v-if="item.ResultReport.FoodsResult==1">√</span>
<span class="colorE95252" v-else>{{item.ResultReport.FoodsResult=='-1'?"x":"O"}}</span>
<span style="color: #4BCA81;" v-if="item.FoodsResult==1">√</span>
<span class="colorE95252" v-else>{{item.FoodsResult=='-1'?"x":"O"}}</span>
</div>
</td>
<td>
<div class="fz16 fbold linkspan" @click="goUrlBus('BusInfo',item,outItem,'车配信息')">
<span style="color: #4BCA81;" v-if="item.ResultReport.BusResult==1">√</span>
<span class="colorE95252" v-else>{{item.ResultReport.BusResult=='-1'?"x":"O"}}</span>
<span style="color: #4BCA81;" v-if="item.BusResult==1">√</span>
<span class="colorE95252" v-else>{{item.BusResult=='-1'?"x":"O"}}</span>
</div>
</td>
<td>
<div class="fz16 fbold linkspan" @click="goUrlLeaderIsApply('leaderPay2',item,outItem,'领队报账')">
<span style="color: #4BCA81;" v-if="item.ResultReport.LeaderIsApply==2">√</span>
<span class="colorE95252" v-else>{{item.ResultReport.LeaderIsApply=='0'?"x":"O"}}</span>
<span style="color: #4BCA81;" v-if="item.LeaderIsApply==2">√</span>
<span class="colorE95252" v-else>{{item.LeaderIsApply=='0'?"x":"O"}}</span>
</div>
</td>
<td>
......@@ -376,7 +377,7 @@
<input type="button" value="保存" @click="saveRemark" class="normalBtn" />
</p>
<el-button type="primary" icon="iconfont icon-beizhu" slot="reference"
@click='CkedItem(item,outItem.TCIDs)'
@click='CkedItem(item,outItem.TCIDS)'
style="background:#AD9AF6; border-color:#AD9AF6; border-radius: 0;"></el-button>
</el-popover>
</el-tooltip>
......@@ -433,26 +434,25 @@
<tr>
<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> -->
<p @click="getJourney(item.ConfigID,item.Titles)" 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 v-if="outItem.PriceCommonList[index].DMCNum && outItem.PriceCommonList[index].DMCNum!=''"
class="colorE95252" style="padding-top:5px;">地接备注团号:{{outItem.PriceCommonList[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 v-show="outItem.PriceCommonList[index].OPInnerRemark!=''" class="colorE95252"
style="padding-top:5px;">OP备注:{{outItem.PriceCommonList[index].OPInnerRemark}}</div>
<div v-show="outItem.PriceCommonList[index].OPRemark!=''" class="colorE95252"
style="padding-top:5px;">OP对外备注:{{outItem.PriceCommonList[index].OPRemark}}</div>
<div v-show="outItem.PriceCommonList[0].DMCRemark!=''" class="colorE95252"
style="padding-top:5px;padding-bottom:4px;">地接备注:{{outItem.PriceCommonList[index].DMCRemark}}
</div>
<div v-show="outItem.StaticsReportList[0].SupplierRemarks!=''" class="colorE95252"
<div v-show="outItem.PriceCommonList[0].SupplierRemarks!=''" class="colorE95252"
style="padding-top:5px;padding-bottom:4px;">
地接对供应商备注:{{outItem.StaticsReportList[index].SupplierRemarks}}
地接对供应商备注:{{outItem.PriceCommonList[index].SupplierRemarks}}
</div>
<div v-show="outItem.StaticsReportList[0].SupplierToDmcRemarks!=''" class="colorE95252"
<div v-show="outItem.PriceCommonList[0].SupplierToDmcRemarks!=''" class="colorE95252"
style="padding-top:5px;padding-bottom:4px;">
供应商对地接备注:{{outItem.StaticsReportList[index].SupplierToDmcRemarks}}
供应商对地接备注:{{outItem.PriceCommonList[index].SupplierToDmcRemarks}}
</div>
</div>
</td>
......@@ -469,9 +469,9 @@
</tripDownLoadCommon>
</el-dialog>
<el-dialog custom-class='ComTeamPlan_info_box' :title="tripTitle" :visible.sync="teamVisible" center>
<commonTeamInfo ref="comTeam"></commonTeamInfo>
</el-dialog>
<el-dialog custom-class='ComTeamPlan_info_box' :title="tripTitle" :visible.sync="teamVisible" center>
<commonTeamInfo ref="comTeam"></commonTeamInfo>
</el-dialog>
</div>
</template>
......@@ -486,7 +486,7 @@
currentPage: 1,
total: 0,
travelControlTripLayerShow: false,
tripTitle:'',
tripTitle: '',
teamVisible: false,
msg: {
StartDate: '',
......@@ -506,8 +506,8 @@
//航空公司
AirLineId: 0,
CreateBy: 0,
LeaderType:0,//领队导游类型
QLeaderId:0,//领队导游编号
LeaderType: 0, //领队导游类型
QLeaderId: 0, //领队导游编号
},
CheckedVaule: 1,
UnCheckedVaule: 0,
......@@ -554,9 +554,9 @@
showZhan: true,
showBtnList: true,
showCaozuoTime: true,
ShowShouPeiStatus:true,//显示手配置暂定确定按钮
ShowTaxType:true, //显示税入税别
ShowRebateRatio:true, //显示返佣比列
ShowShouPeiStatus: true, //显示手配置暂定确定按钮
ShowTaxType: true, //显示税入税别
ShowRebateRatio: true, //显示返佣比列
},
pickerBeginDateBefore: {
disabledDate: time => {
......@@ -599,13 +599,13 @@
},
methods: {
getJourney(id, title) {
var that = this;
this.tripTitle = title;
this.$nextTick(() => {
that.$refs.comTeam.GetTrip(id);
});
that.teamVisible = true;
},
var that = this;
this.tripTitle = title;
this.$nextTick(() => {
that.$refs.comTeam.GetTrip(id);
});
that.teamVisible = true;
},
openChart(obj) {
this.MsgBus.$emit('openChat', {
account: obj.CreateByAccount,
......@@ -753,7 +753,7 @@
"id": obj.TCIDS,
'TCNUM': obj.TCNUMS,
'flightTotal': obj.TotalSeat,
'GuestNum': obj.CommonReport.HouseStatistics.RealityNum,
'GuestNum': obj.OrderGuestNum,
'NewCombinationNum': outItem.NewCombinationNum,
blank: 'y',
tab: title
......@@ -764,21 +764,21 @@
this.$router.push({
name: path,
query: {
"TCID": outItem.TCIDs,
"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,
RealityYSeatNum: obj.YSeatNum,
RealityESeatNum: obj.ESeatNum,
RealityFSeatNum: obj.FSeatNum,
LeaderName: obj.LeaderName,
GuideName: obj.GuideName,
NewCombinationNum: outItem.NewCombinationNum,
blank: 'y',
title: obj.Titles,
title: obj.Title,
TCNUMS: obj.TCNUMS,
InOut: obj.InOut,
RealityNum: obj.CommonReport.HouseStatistics.RealityNum,
RealityNum: obj.OrderGuestNum,
tab: title
}
})
......@@ -787,7 +787,7 @@
this.$router.push({
name: path,
query: {
"id": outItem.TCIDs,
"id": outItem.TCIDS,
NewCombinationNum: outItem.NewCombinationNum,
isUpdate: true,
blank: 'y',
......@@ -805,14 +805,16 @@
},
getList() {
this.loading = true;
this.apipost('dmcstatistics_post_GetUniteCombinationNumService', this.msg, res => {
this.apipost('dmcstatistics_get_GetDmcTotalTablePageList', this.msg, res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.total = res.data.data.count;
this.list = res.data.data.pageData.data;
if (this.list.StaticsReportList) {
this.list.StaticsReportList.forEach(x => {
x.isShowPop = false
this.list = res.data.data.pageData;
if (this.list) {
this.list.forEach(x => {
x.PriceCommonList.forEach(subItem => {
subItem.isShowPop = false
})
});
}
} else {
......@@ -875,7 +877,7 @@
toTrip: function (obj) {
this.tripObj.tcid = obj.TCID;
this.tripObj.configId = obj.ConfigID;
this.tripObj.cityId = obj.StartCityIdS;
this.tripObj.cityId = obj.StartCityId;
this.tripObj.orderId = 0;
this.travelControlTripLayerShow = true;
},
......@@ -884,8 +886,8 @@
},
//获取领队和导游
GetLeaderList() {
this.LeaderList=[];
this.msg.QLeaderId=0;
this.LeaderList = [];
this.msg.QLeaderId = 0;
let msg = {
Type: this.msg.LeaderType,
}
......@@ -900,14 +902,12 @@
)
},
//更新手配书状态
SetShouPeiShu(TCID,ShouPeiStatus)
{
var msg=
{
TCID:TCID,
ShouPeiStatus:(ShouPeiStatus==0?1:0)
SetShouPeiShu(TCID, ShouPeiStatus) {
var msg = {
TCID: TCID,
ShouPeiStatus: (ShouPeiStatus == 0 ? 1 : 0)
};
this.apipost('dmcstatistics_post_SetPriceShouPeiShuService', msg, res => {
this.apipost('dmcstatistics_post_SetPriceShouPeiShuService', msg, res => {
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.getList();
......@@ -1071,8 +1071,10 @@
.dmcSetTable tr {
height: 50px;
}
.DMC_HotelPop{
.DMC_HotelPop {
overflow: auto;
max-height: 350px;
}
</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