Commit fcc5bf03 authored by 黄奎's avatar 黄奎

页面修改

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