Commit fcc5bf03 authored by 黄奎's avatar 黄奎

页面修改

parent 69b68682
......@@ -44,9 +44,10 @@
</td>
<td>
<template v-for="(subItem,subIndex) in item.FlightList2">
<span class="roomNowrap"><span class="roomFlightNumber">{{subItem.Flight_number}}</span> {{subItem.TicketDepartureTime}} {{subItem.DepartureName}}({{subItem.DIATA}})
<i class="iconfont icon-weibiaoti40 rq_Arrow"></i>
{{subItem.TicketArrivalTime}} {{subItem.ArrivalCityName}}({{subItem.AIATA}})</span>
<span class="roomNowrap"><span class="roomFlightNumber">{{subItem.Flight_number}}</span>
{{subItem.TicketDepartureTime}} {{subItem.DepartureName}}({{subItem.DIATA}})
<i class="iconfont icon-weibiaoti40 rq_Arrow"></i>
{{subItem.TicketArrivalTime}} {{subItem.ArrivalCityName}}({{subItem.AIATA}})</span>
</template>
</td>
<td>
......@@ -83,47 +84,71 @@
</th>
</tr>
<template v-for="(subItem,subIndex) in HotelList">
<tbody >
<template v-for="(childItem,childIndex) in subItem.HotelOrderList">
<tbody>
<template v-for="(childItem,childIndex) in subItem.HotelOrderList">
<tr>
<td v-if="childIndex==0" :rowspan="subItem.HotelOrderList.length>1?subItem.HotelOrderList.length*2:subItem.HotelOrderList.length+1" style="text-align:center;">
{{subIndex+1}}<br/>
{{subItem.UseTimeStr}}
</td>
<td>
{{childItem.HotelName}}
</td>
<td>
{{childItem.NewHotelName}}
</td>
<td>
<template v-for="(detailsItem,detailsIndex) in childItem.OrderDetailsList" v-if="detailsItem.HouseTypeCount>0" >
<template v-if="detailsItem.HouseType==1">单间</template>
<template v-if="detailsItem.HouseType==2">标准双人间</template>
<template v-if="detailsItem.HouseType==3">大床房</template>
<template v-if="detailsItem.HouseType==4">三人间</template>
<template v-if="detailsItem.HouseType==4">司导间</template>
{{detailsItem.HouseTypeCount}} 间
价格: {{detailsItem.UnitPrice}}
返佣: {{detailsItem.RebateRatio}}
<br/>
</template>
</td>
<td>
<template v-if="childItem.TaxType==1">税入</template>
<template v-if="childItem.TaxType==2">税别</template>
</td>
<td v-if="childIndex==0"
:rowspan="subItem.HotelOrderList.length>1?subItem.HotelOrderList.length*2:subItem.HotelOrderList.length+1"
style="text-align:center;">
{{subIndex+1}}<br />
{{subItem.UseTimeStr}}
</td>
<td>
{{childItem.HotelName}}
</td>
<td>
{{childItem.NewHotelName}}
</td>
<td>
<template v-for="(detailsItem,detailsIndex) in childItem.OrderDetailsList"
v-if="detailsItem.HouseTypeCount>0">
<template v-if="detailsItem.HouseType==1">单间</template>
<template v-if="detailsItem.HouseType==2">标准双人间</template>
<template v-if="detailsItem.HouseType==3">大床房</template>
<template v-if="detailsItem.HouseType==4">三人间</template>
<template v-if="detailsItem.HouseType==4">司导间</template>
{{detailsItem.HouseTypeCount}} 间
价格: {{detailsItem.UnitPrice}}
返佣: {{detailsItem.RebateRatio}}
<br />
</template>
</td>
<td>
<template v-if="childItem.TaxType==1">税入</template>
<template v-if="childItem.TaxType==2">税别</template>
</td>
</tr>
<tr>
<td colspan="4">
<td colspan="4">
<span style="display:inline-block;width:40px;vertical-align:top;">备注:</span>
<span style="display:inline-block;width:400px;">{{childItem.Remarks}}</span></td>
</tr>
</template>
</tbody>
</template>
</tbody>
</template>
</table>
<a class="hotelLink" slot="reference" @click="getHotelList(item.TCID,item.NewCombinationNum)">酒店使用情况</a>
<a class="hotelLink" slot="reference"
@click="getHotelList(item.TCID,item.NewCombinationNum)">酒店使用情况</a>
</el-popover>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="酒店信息" placement="top-start">
<el-popover placement="bottom" width="400" trigger="click" popper-class="rq_HotelDetails">
<table>
<tr>
<td>
备注:
</td>
<td>
<el-input class='mt10' v-model='RemarkObj.SupplierToDmcRemarks' type='textarea'></el-input>
</td>
</tr>
<tr>
<td colspan="2">
<input type="button" value="保存" @click="saveSupplierToDmcRemarks" class="normalBtn" />
</td>
</tr>
</table>
<a class="hotelLink" slot="reference" @click="getClickItem(item)">备注</a>
</el-popover>
</el-tooltip>
</td>
......@@ -133,6 +158,11 @@
注意事项: {{item.SupplierRemarks}}
</td>
</tr>
<tr>
<td colspan="8" style="text-align:left;padding-left:5px;">
对地接备注: {{item.SupplierToDmcRemarks}}
</td>
</tr>
</tbody>
</table>
</div>
......@@ -144,7 +174,7 @@
data() {
return {
loading: false,
hotelLoading:false,
hotelLoading: false,
total: 0,
msg: {
pageIndex: 1,
......@@ -172,6 +202,11 @@
UserInfo: {}, //用户信息
dataList: [], //数据列表
HotelList: [], //酒店列表
//供应商对地接备注
RemarkObj: {
TCID: 0,
SupplierToDmcRemarks: ""
},
//日志信息
LogsList: [],
queryLogMsg: {
......@@ -208,21 +243,35 @@
}
}, err => {})
},
//获取日志
//获取酒店列表
getHotelList(TCID, NewCombinationNum) {
console.log(TCID)
this.hotelLoading=true;
this.hotelLoading = true;
this.HotelList = [];
var qMsg = {
TCID: TCID,
NewCombinationNum: NewCombinationNum
};
this.ApiPost2('dmcstatistics_post_GetSupplierHotelListService', qMsg, res => {
this.hotelLoading=false;
this.hotelLoading = false;
if (res.data.resultCode == 1) {
this.HotelList = res.data.data;
console.log("this.HotelList",this.HotelList);
}else{
} else {
this.Error(res.data.message);
}
}, err => {})
},
//获取点击备注
getClickItem(item) {
this.RemarkObj.TCID = item.TCID;
this.RemarkObj.SupplierToDmcRemarks = item.SupplierToDmcRemarks;
},
//保存供应商对地接备注
saveSupplierToDmcRemarks() {
this.ApiPost2('dmcstatistics_post_SetSupplierToDmcRemarksService', this.RemarkObj, res => {
this.hotelLoading = false;
if (res.data.resultCode == 1) {
this.getList();
} else {
this.Error(res.data.message);
}
}, err => {})
......@@ -263,11 +312,13 @@
background-color: #fff;
border: 1px solid #d1d1d1;
}
.roomQuery_SupplierTable tbody:nth-child(2n+2){
.roomQuery_SupplierTable tbody:nth-child(2n+2) {
background: #fafafa;
}
.roomQuery_SupplierTable tbody tr:last-child{
border-bottom:2px solid #333;
.roomQuery_SupplierTable tbody tr:last-child {
border-bottom: 2px solid #333;
}
.roomQuery_SupplierTable tr th {
......@@ -328,25 +379,48 @@
text-decoration: underline;
cursor: pointer;
}
.roomQuery .roomNowrap{
.roomQuery .roomNowrap {
white-space: nowrap;
display: block;
text-align: left;
padding-left:20px;
padding-left: 20px;
}
.roomQuery .roomFlightNumber{
color:#FF0066;
.roomQuery .roomFlightNumber {
color: #FF0066;
font-weight: bold;
}
.rq_HotelTable { padding: 10px 0 0 20px; background-color: #ededed; border-collapse: collapse; border: 1px solid #d2d2d2; font-size: 12px;}
.rq_HotelTable th { background-color: #ededed; padding: 5px 10px;text-align: center;}
.rq_HotelTable td { background-color: #ffffff; padding: 9px 10px;color: #333333;border: 1px solid #d2d2d2;}
.rq_HotelDetails{
max-height:400px;
overflow: auto;
}
.roomQuery .rq_Arrow{
position: relative;
top:3px;
}
.rq_HotelTable {
padding: 10px 0 0 20px;
background-color: #ededed;
border-collapse: collapse;
border: 1px solid #d2d2d2;
font-size: 12px;
}
.rq_HotelTable th {
background-color: #ededed;
padding: 5px 10px;
text-align: center;
}
.rq_HotelTable td {
background-color: #ffffff;
padding: 9px 10px;
color: #333333;
border: 1px solid #d2d2d2;
}
.rq_HotelDetails {
max-height: 400px;
overflow: auto;
}
.roomQuery .rq_Arrow {
position: relative;
top: 3px;
}
</style>
......@@ -267,61 +267,62 @@
v-if="item.LineId==14 && item.CommonReport.PriceHotelResult && item.CommonReport.PriceHotelResult.length>0">
<el-popover width="700" trigger="click" popper-class="TC_HotelPop">
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
<tr>
<th width="100">日期</th>
<th style="width:150px;">酒店</th>
<th style="width:150px;">更换酒店</th>
<th style="width:100px;">状态</th>
<th style="width:150px;">使用数量/价格</th>
<th style="width:100px;">付款方式</th>
<th style="width:120px">占房时间</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;color:red">
{{hotelSubItem.HotelName!=hotelSubItem.NewHotelName?""+hotelSubItem.NewHotelName:""}}
</td>
<td style="text-align:left;padding-left:3px;">
<span v-if="hotelSubItem.HotelName!='温馨的家'">
<template v-if="hotelSubItem.OPState==1">
<a style="color:green">OP-OK</a>
</template>
<template v-else-if="hotelSubItem.OPState==2&&hotelSubItem.DMCState==0">
<a style="color:red">OP-暂定</a>
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
<tr>
<th width="100">日期</th>
<th style="width:150px;">酒店</th>
<th style="width:150px;">更换酒店</th>
<th style="width:100px;">状态</th>
<th style="width:150px;">使用数量/价格</th>
<th style="width:100px;">付款方式</th>
<th style="width:120px">占房时间</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;color:red">
{{hotelSubItem.HotelName!=hotelSubItem.NewHotelName?""+hotelSubItem.NewHotelName:""}}
</td>
<td style="text-align:left;padding-left:3px;">
<span v-if="hotelSubItem.HotelName!='温馨的家'">
<template v-if="hotelSubItem.OPState==1">
<a style="color:green">OP-OK</a>
</template>
<template v-else-if="hotelSubItem.OPState==2&&hotelSubItem.DMCState==0">
<a style="color:red">OP-暂定</a>
</template>
<template v-else>
<template v-if="hotelSubItem.DMCState==1">
<a style="color:green">地接-OK</a>
</template>
<template v-else>
<template v-if="hotelSubItem.DMCState==1">
<a style="color:green">地接-OK</a>
</template>
<template v-else>
<a style="color:red"> {{hotelSubItem.DMCState==2?"地接-暂定":"地接-未操作"}}</a>
</template>
<a style="color:red"> {{hotelSubItem.DMCState==2?"地接-暂定":"地接-未操作"}}</a>
</template>
</span>
</td>
<td>
<a v-if="(hotelSubItem.OPState==1|| hotelSubItem.OPState==2 || hotelSubItem.DMCState==1 )">
{{hotelSubItem.UseCount>0? hotelSubItem.UseCount+" 间" :""}}
{{hotelSubItem.CostPriceNew>0?" 价格:"+hotelSubItem.CostPriceNew:(hotelSubItem.CostPrice!=0?" 价格:"+hotelSubItem.CostPrice:"")}}
</a>
</td>
<td>
{{hotelSubItem.PayTypeStr}}
</td>
<td>
<template v-if="hotelSubItem.OPState==1||(hotelSubItem.OPState==2 && hotelSubItem.DMCState==0)">
{{hotelSubItem.CreateDateStr}}</template>
</td>
</tr>
</template>
</table>
</template>
</span>
</td>
<td>
<a v-if="(hotelSubItem.OPState==1|| hotelSubItem.OPState==2 || hotelSubItem.DMCState==1 )">
{{hotelSubItem.UseCount>0? hotelSubItem.UseCount+" 间" :""}}
{{hotelSubItem.CostPriceNew>0?" 价格:"+hotelSubItem.CostPriceNew:(hotelSubItem.CostPrice!=0?" 价格:"+hotelSubItem.CostPrice:"")}}
</a>
</td>
<td>
{{hotelSubItem.PayTypeStr}}
</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>
......@@ -367,6 +368,17 @@
此团号会带到,房、餐、车、景点使用.并且会显示在组团团控列表
</td>
</tr>
<tr>
<td style="text-align:right;width:80px;">订房状态:</td>
<td>
<el-select v-model="NumObj.IsBookTeam">
<el-option label="请选择" :key="0" :value="0"></el-option>
<el-option label="订房" :key="1" :value="1"></el-option>
<el-option label="取消订房" :key="2" :value="2"></el-option>
</el-select>
</td>
</tr>
<tr>
<td style="text-align:right;">备注:</td>
<td>
......@@ -378,7 +390,7 @@
此备注会带到组团团控列表.
</td>
</tr>
<tr>
<tr>
<td style="text-align:right;">供应商备注:</td>
<td>
<el-input class='mt10' v-model='NumObj.SupplierRemarks' type='textarea'></el-input>
......@@ -412,28 +424,36 @@
<table class="dmcSetTable">
<tr>
<td colspan="2" style="text-align:center;">
<el-checkbox v-model="UpdateHotelMsg.UpdateType" :true-label="UnCheckedVaule" :false-label="CheckedVaule">当团</el-checkbox>
<el-checkbox v-model="UpdateHotelMsg.UpdateType" :true-label="CheckedVaule" :false-label="UnCheckedVaule">批量修改</el-checkbox>
<el-checkbox v-model="UpdateHotelMsg.UpdateType" :true-label="UnCheckedVaule"
:false-label="CheckedVaule">当团</el-checkbox>
<el-checkbox v-model="UpdateHotelMsg.UpdateType" :true-label="CheckedVaule"
:false-label="UnCheckedVaule">批量修改</el-checkbox>
</td>
</tr>
<tr v-if="UpdateHotelMsg.UpdateType==1">
<td>
<el-date-picker class='w135' v-model="UpdateHotelMsg.StartDate" style="display:inline-block;" value-format="yyyy-MM-dd" type="date"
:picker-options="pickerBefore"></el-date-picker>
<el-date-picker class='w135' v-model="UpdateHotelMsg.StartDate"
style="display:inline-block;" value-format="yyyy-MM-dd" type="date"
:picker-options="pickerBefore"></el-date-picker>
</td>
<td>
<el-date-picker class='w135' v-model="UpdateHotelMsg.EndDate" style="display:inline-block;" value-format="yyyy-MM-dd" type="date"
:picker-options="pickerAfter"></el-date-picker>
<el-date-picker class='w135' v-model="UpdateHotelMsg.EndDate"
style="display:inline-block;" value-format="yyyy-MM-dd" type="date"
:picker-options="pickerAfter"></el-date-picker>
</td>
</tr>
<tr>
<td colspan="2" style="text-align:center;">
<input type="button" class="normalBtn" @click="SetIsOpenHotelService(item)" :value="item.IsOpenHotel==0?'关闭酒店操作':'开启酒店操作'"/>
<input type="button" class="normalBtn" @click="SetIsOpenHotelService(item)"
:value="item.IsOpenHotel==0?'关闭酒店操作':'开启酒店操作'" />
</td>
</tr>
</table>
<el-button v-if="item.IsOpenHotel==0" slot="reference" style="background:#E95252; border-color:#E95252" icon="iconfont icon-suo" type="primary"></el-button>
<el-button v-if="item.IsOpenHotel==1" slot="reference" icon="iconfont icon-suo1" type="primary" style="background:green; border-color:green"></el-button>
<el-button v-if="item.IsOpenHotel==0" slot="reference"
style="background:#E95252; border-color:#E95252" icon="iconfont icon-suo" type="primary">
</el-button>
<el-button v-if="item.IsOpenHotel==1" slot="reference" icon="iconfont icon-suo1" type="primary"
style="background:green; border-color:green"></el-button>
</el-popover>
</el-tooltip>
</el-button-group>
......@@ -454,9 +474,15 @@
<div v-show="outItem.StaticsReportList[0].DMCRemark!=''" class="colorE95252"
style="padding-top:5px;padding-bottom:4px;">地接备注:{{outItem.StaticsReportList[index].DMCRemark}}
</div>
<div v-show="outItem.StaticsReportList[0].SupplierRemarks!=''" class="colorE95252"
style="padding-top:5px;padding-bottom:4px;">对供应商备注:{{outItem.StaticsReportList[index].SupplierRemarks}}
</div>
<div v-show="outItem.StaticsReportList[0].SupplierRemarks!=''" class="colorE95252"
style="padding-top:5px;padding-bottom:4px;">
地接对供应商备注:{{outItem.StaticsReportList[index].SupplierRemarks}}
</div>
<div v-show="outItem.StaticsReportList[0].SupplierToDmcRemarks!=''" class="colorE95252"
style="padding-top:5px;padding-bottom:4px;">
供应商对地接备注:{{outItem.StaticsReportList[index].SupplierToDmcRemarks}}
</div>
</div>
</td>
</tr>
......@@ -468,7 +494,8 @@
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total"></el-pagination>
<el-dialog custom-class='w450' title="行程下载" :visible.sync="travelControlTripLayerShow" center>
<tripDownLoadCommon ref="tripDownLoadCommon" :tripObj="tripObj" @headCallBack="hideTripDown" :downType="1"></tripDownLoadCommon>
<tripDownLoadCommon ref="tripDownLoadCommon" :tripObj="tripObj" @headCallBack="hideTripDown" :downType="1">
</tripDownLoadCommon>
</el-dialog>
</div>
......@@ -503,14 +530,14 @@
},
CheckedVaule: 1,
UnCheckedVaule: 0,
//酒店更新
UpdateHotelMsg:{
UpdateType:0, //0-当团,1-批量修改
StartDate:"", //开始日期
EndDate:"", //结束日期
LineId:14,
TCID:0,
Status:0
//酒店更新
UpdateHotelMsg: {
UpdateType: 0, //0-当团,1-批量修改
StartDate: "", //开始日期
EndDate: "", //结束日期
LineId: 14,
TCID: 0,
Status: 0
},
thLengthTitle: [],
list: [],
......@@ -520,7 +547,8 @@
DMCNum: "",
TCIDs: "",
remarkString: '',
SupplierRemarks:''
SupplierRemarks: '',
IsBookTeam:0,
},
queryCommonData: {
//公司数据
......@@ -554,7 +582,7 @@
return startTime.getTime() >= time.getTime()
}
},
pickerBefore:{
pickerBefore: {
disabledDate: time => {
if (this.UpdateHotelMsg.EndDate == null) {
return false;
......@@ -564,7 +592,7 @@
}
}
},
pickerAfter:{
pickerAfter: {
disabledDate: time => {
let startTime = new Date(this.UpdateHotelMsg.StartDate)
return startTime.getTime() >= time.getTime()
......@@ -587,7 +615,8 @@
this.NumObj.TCIDs = TCIDs;
this.NumObj.remarkString = obj.DMCRemark;
this.NumObj.DMCNum = obj.DMCNum;
this.NumObj.SupplierRemarks=obj.SupplierRemarks;
this.NumObj.SupplierRemarks = obj.SupplierRemarks;
this.NumObj.IsBookTeam=obj.IsBookTeam;
},
saveRemark() {
this.apipost('dmcstatistics_post_SetDMCRemark', this.NumObj, res => {
......@@ -601,16 +630,16 @@
},
//开启关闭酒店操作
SetIsOpenHotelService(item) {
item.isShowPop=true;
if(item.IsOpenHotel==0){
this.UpdateHotelMsg.Status=1;
}else{
this.UpdateHotelMsg.Status=0;
item.isShowPop = true;
if (item.IsOpenHotel == 0) {
this.UpdateHotelMsg.Status = 1;
} else {
this.UpdateHotelMsg.Status = 0;
}
if(this.UpdateHotelMsg.UpdateType==1){
if(this.UpdateHotelMsg.StartDate==""||this.UpdateHotelMsg.EndDate==""){
this.Error('请选择日期')
return
if (this.UpdateHotelMsg.UpdateType == 1) {
if (this.UpdateHotelMsg.StartDate == "" || this.UpdateHotelMsg.EndDate == "") {
this.Error('请选择日期')
return
}
}
this.UpdateHotelMsg.TCID = item.TCID
......@@ -618,15 +647,15 @@
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.getList();
this.UpdateHotelMsg.UpdateType=0;
this.UpdateHotelMsg.StartDate="";
this.UpdateHotelMsg.EndDate="";
this.UpdateHotelMsg.TCID=0;
this.UpdateHotelMsg.Status=0;
this.UpdateHotelMsg.UpdateType = 0;
this.UpdateHotelMsg.StartDate = "";
this.UpdateHotelMsg.EndDate = "";
this.UpdateHotelMsg.TCID = 0;
this.UpdateHotelMsg.Status = 0;
} else {
this.Error(res.data.message);
}
item.isShowPop=false;
item.isShowPop = false;
}, err => {})
},
getLineList() {
......@@ -779,9 +808,9 @@
if (res.data.resultCode == 1) {
this.total = res.data.data.count;
this.list = res.data.data.pageData.data;
if(this.list.StaticsReportList){
if (this.list.StaticsReportList) {
this.list.StaticsReportList.forEach(x => {
x.isShowPop = false
x.isShowPop = false
});
}
} else {
......@@ -998,10 +1027,13 @@
.dmcMain .el-checkbox+.el-checkbox {
margin-left: 5px;
}
.dmcSetTable{
width:100%;
.dmcSetTable {
width: 100%;
}
.dmcSetTable tr{
height:50px;
.dmcSetTable tr {
height: 50px;
}
</style>
......@@ -440,7 +440,7 @@
<el-checkbox v-model="priceData.IsSupportChildren" :true-label="CheckedVaule"
:false-label="UnCheckedVaule">支持儿童出游
</el-checkbox>
<el-checkbox v-model="priceData.IsBookTeam" :true-label="CheckedVaule" v-if="PostConfig.LineId==14"
<el-checkbox style="display:none;" v-model="priceData.IsBookTeam" :true-label="CheckedVaule" v-if="PostConfig.LineId==14"
:false-label="UnCheckedVaule">订团
</el-checkbox>
<el-checkbox v-model="priceData.IsLessPrice" :true-label="CheckedVaule"
......
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