Skip to content

S
SuperMan
Commit 9ad2a022 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

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

parents 701dd41e 4132b1bf
Show whitespace changes
Inline Side-by-side
Showing with 77 additions and 52 deletions
src/components/Hotel/roomReservationsDetails.vue
View file @ 9ad2a022
......@@ -286,11 +286,17 @@
<td colspan="2" style="height:5px;"></td>
</tr>
<tr>
<td width="70" style="text-align:right;">备注：</td>
<td width="70" style="text-align:right;">对供应商备注：</td>
<td>
<el-input type='textarea' class='w135' v-model='subItem.Remarks'></el-input>
</td>
</tr>
<tr v-if="subItem.SupplierToDmcRemarks">
<td width="70" style="text-align:right;">供应商对地接备注：</td>
<td>
{{subItem.SupplierToDmcRemarks}}
</td>
</tr>
</table>
</td>
<!-- 操作 -->
......
src/components/Supplier/roomQuery2.vue
View file @ 9ad2a022
......@@ -19,8 +19,7 @@
<div style="font-size:12px;padding:2px 4px 3px 20px;">
<div style="display:inline-block;color:red;display:none">注意事项:每次导出数据最好不要超过一个月。</div>
<div class="rq_comSpan" style="display:inline-block;">颜色说明:
<span class="rq_span1">未操作</span><span class="rq_span2">操作中</span><span class="rq_span3">操作完成</span><span
class="rq_span4">机位数和人数不相符</span>
<span class="rq_span1">新增团体</span><span class="rq_span2">取消团体</span>
</div>
</div><br />
<table border="0" cellspacing="1" cellpadding="0" class="roomQuery_SupplierTable" v-loading='loading'>
......@@ -66,19 +65,16 @@
</td>
<td>
<el-tooltip class="item" effect="dark" content="酒店信息" placement="top-start">
<el-popover placement="bottom" width="1250" trigger="click" popper-class="rq_HotelDetails">
<el-popover placement="bottom" width="800" trigger="click" popper-class="rq_HotelDetails">
<table class="rq_HotelTable" v-loading="hotelLoading">
<tr>
<th width="150">
<th width="120">
时间
</th>
<th width="150">
酒店
</th>
<th width="150">
更换名称
</th>
<th width="450">
<th width="250">
价格
</th>
<th width="100">
......@@ -96,12 +92,14 @@
{{subItem.UseTimeStr}}
</td>
<td>
{{childItem.HotelName}}
</td>
<td>
{{childItem.NewHotelName!=childItem.HotelName?childItem.NewHotelName:""}}
<template v-if="childItem.SupplierId==0||childItem.SupplierId==UserInfo.SupplierId">
{{childItem.HotelName}}<br/>
<div class="rq_changeName">{{childItem.NewHotelName!=childItem.HotelName?'更换为:'+childItem.NewHotelName:""}}</div>
</template>
<template v-else>业者自理</template>
</td>
<td>
<template v-if="childItem.SupplierId==0||childItem.SupplierId==UserInfo.SupplierId">
<template v-for="(detailsItem,detailsIndex) in childItem.OrderDetailsList"
v-if="detailsItem.HouseTypeCount>0">
<template v-if="detailsItem.HouseType==1">单间</template>
......@@ -114,22 +112,28 @@
返佣: {{detailsItem.RebateRatio}}
<br />
</template>
</template>
</td>
<td>
<template v-if="childItem.SupplierId==0||childItem.SupplierId==UserInfo.SupplierId">
<template v-if="childItem.TaxType==1">税入</template>
<template v-if="childItem.TaxType==2">税别</template>
</template>
</td>
<td>
<!-- <el-select v-model='childItem.SupplierToDmcHotelStatus'
<template v-if="childItem.SupplierId==0||childItem.SupplierId==UserInfo.SupplierId">
<select class="rq_status" v-model='childItem.SupplierToDmcHotelStatus'
:placeholder="$t('pub.pleaseSel')">
<el-option label='请选择' :value='0'></el-option>
<el-option label='一般提醒' :value='1'></el-option>
<el-option label='重要提醒' :value='2'></el-option>
</el-select> -->
<option label='请选择' :value='0'></option>
<option label='一般提醒' :value='1'></option>
<option label='重要提醒' :value='2'></option>
</select>
</template>
</td>
<td>
<!-- <el-input type='textarea' class='w135' v-model='childItem.SupplierToDmcRemarks'>
</el-input> -->
<template v-if="childItem.SupplierId==0||childItem.SupplierId==UserInfo.SupplierId">
<textarea class="w135" cols="25" rows="5" v-model='childItem.SupplierToDmcRemarks'></textarea>
</template>
</td>
</tr>
<tr>
......@@ -180,10 +184,19 @@
</tr>
<tr>
<td colspan="8" style="text-align:left;padding-left:5px;">
<div class="rQ_HtList" v-if="item.IsBookTeam==2&&item.Numbers>=0">
<div class="rq_remark" v-if="item.IsBookTeam==2&&item.Numbers>=0">
<span class="rq_reSpan">取消团体提醒</span>
<span class="rQ_HtList">
<span v-for="subItem in item.Numbers"></span>
</span>
</div>
<div>注意事项： {{item.SupplierRemarks}}</div>
<div class="rq_remark" v-if="item.SupplierHotelStatus==1||item.SupplierHotelStatus==2&&item.Numbers>=0">
<span class="rq_reSpan">酒店提醒</span>
<span class="rQ_HtList">
<span v-for="subItem in item.Numbers"></span>
</span>
</div>
<div><span class="rq_reSpan">注意事项</span> {{item.SupplierRemarks}}</div>
</td>
</tr>
<tr>
......@@ -203,7 +216,6 @@
return {
loading: false,
hotelLoading: false,
HotelUseLoading: false,
total: 0,
msg: {
pageIndex: 1,
......@@ -267,9 +279,9 @@
},
//保存信息
saveSupplierjourneyorder(HotelList) {
this.HotelUseLoading = true;
this.hotelLoading = true;
this.ApiPost2('dmcstatistics_post_SetSupplierjourneyorderService', HotelList, res => {
this.HotelUseLoading = false;
this.hotelLoading = false;
if (res.data.resultCode == 1) {
this.Success(res.data.message)
this.getList();
......@@ -315,7 +327,6 @@
this.hotelLoading = false;
if (res.data.resultCode == 1) {
this.HotelList = res.data.data;
console.log(this.HotelList, 'hotellist')
} else {
this.Error(res.data.message);
}
......@@ -434,19 +445,12 @@
margin-right: 10px;
}
.roomQuery .rq_span1 {
background-color: #333;
}
.roomQuery .rq_span2 {
.roomQuery .rq_span1 {
background-color: #7abd53;
}
.roomQuery .rq_span3 {
background-color: blue;
}
.roomQuery .rq_span4 {
.roomQuery .rq_span2 {
background-color: red;
}
......@@ -555,7 +559,8 @@
}
.rQ_HtList {
margin-top: 5px 0 3px 0;
position: relative;
top:3px;
}
.rQ_HtList span {
......@@ -574,5 +579,19 @@
.rq_disImNote {
color: #ea6d6d;
}
.rq_status{
height:25px;
}
.rq_changeName{
margin-top:10px;
color:red;
}
.roomQuery_SupplierTable .rq_remark{
margin-bottom:5px;
}
.roomQuery_SupplierTable .rq_reSpan{
display:inline-block;
width:75px;
text-align: right;
}
</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