Skip to content

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

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

parents e4957e60 301369a8
Hide whitespace changes
Inline Side-by-side
Showing with 140 additions and 124 deletions
src/components/Hotel/roomReservations.vue
View file @ 12873c00
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
<th>备注</th> <th>备注</th>
</tr> </tr>
<tr v-if="list.length==0"> <tr v-if="list.length==0">
<td colspan="10">暂无数据</td> <td colspan="11">暂无数据</td>
</tr> </tr>
<tbody v-for="(outItem,outindex) in list" :class="{roomReservationsSplitTrCss:outindex%2!=0}"> <tbody v-for="(outItem,outindex) in list" :class="{roomReservationsSplitTrCss:outindex%2!=0}">
<template v-for="(item,index) in outItem.StaticsReportList"> <template v-for="(item,index) in outItem.StaticsReportList">
......
src/components/Hotel/roomReservationsDetails.vue
View file @ 12873c00
...@@ -5,6 +5,12 @@ ...@@ -5,6 +5,12 @@
margin: 5px auto; margin: 5px auto;
font-size: 12px; font-size: 12px;
} }
.rq_importNote {
color: red;
}
.rq_disImNote {
color: #ea6d6d;
}
</style> </style>
...@@ -294,7 +300,9 @@ ...@@ -294,7 +300,9 @@
<tr v-if="subItem.SupplierToDmcRemarks"> <tr v-if="subItem.SupplierToDmcRemarks">
<td width="70" style="text-align:right;">供应商对地接备注：</td> <td width="70" style="text-align:right;">供应商对地接备注：</td>
<td> <td>
{{subItem.SupplierToDmcRemarks}} <span :class="{'rq_disImNote':subItem.SupplierToDmcHotelStatus==1&&DateMinus(subItem.SupplierToDmcHotelStatusTime)<=5,'rq_importNote':subItem.SupplierToDmcHotelStatus==2&&DateMinus(subItem.SupplierToDmcHotelStatusTime)<=5}">
{{subItem.SupplierToDmcRemarks}}
</span>
</td> </td>
</tr> </tr>
</table> </table>
...@@ -330,6 +338,7 @@ ...@@ -330,6 +338,7 @@
</div> </div>
</template> </template>
<script> <script>
import moment from 'moment'
import comCheckHotel from "../commonPage/comCheckHotel.vue"; import comCheckHotel from "../commonPage/comCheckHotel.vue";
export default { export default {
data() { data() {
...@@ -388,6 +397,14 @@ ...@@ -388,6 +397,14 @@
let str = `comCheckHotel${index}${subIndex}` let str = `comCheckHotel${index}${subIndex}`
this.$refs[str][0].getCheckHotel(); this.$refs[str][0].getCheckHotel();
}, },
DateMinus(sDate) {
var newDate = moment(sDate).format("YYYY-MM-DD");
var sdate = new Date(newDate.replace(/-/g, "/"));
var now = new Date();
var days = now.getTime() - sdate.getTime();
var day = Math.abs(parseInt(days / (1000 * 60 * 60 * 24)));
return day;
},
getItem(index, subIndex) { getItem(index, subIndex) {
this.checkedIndex = index this.checkedIndex = index
this.checkedsubIndex = subIndex this.checkedsubIndex = subIndex
...@@ -528,6 +545,7 @@ ...@@ -528,6 +545,7 @@
}) })
}); });
this.list = list; this.list = list;
console.log(this.list,'listttt');
this.$forceUpdate(); this.$forceUpdate();
} }
} else { } else {
......
src/components/Supplier/roomQuery2.vue
View file @ 12873c00
...@@ -65,126 +65,8 @@ ...@@ -65,126 +65,8 @@
{{item.LeaderName}} <template v-if="item.LeaderTel">(电话: {{item.LeaderTel}})</template> {{item.LeaderName}} <template v-if="item.LeaderTel">(电话: {{item.LeaderTel}})</template>
</td> </td>
<td> <td>
<el-tooltip class="item" effect="dark" content="酒店信息" placement="top-start"> <a class="hotelLink" slot="reference" @click="getHotelList(item.TCID,item.NewCombinationNum),hotelUseDetail=true">酒店使用情况</a>
<el-popover placement="bottom" width="800" trigger="click" popper-class="rq_HotelDetails"> <a class="hotelLink" slot="reference" @click="getClickItem(item),dijieDialog=true">备注</a>
<table class="rq_HotelTable" v-loading="hotelLoading">
<tr>
<th width="120">
时间
</th>
<th width="150">
酒店
</th>
<th width="250">
价格
</th>
<th width="100">
税入/税别
</th>
<th width="100">提醒</th>
<th width="150">备注</th>
</tr>
<template v-for="(subItem,subIndex) in HotelList">
<tbody>
<template v-for="(childItem,childIndex) in subItem.HotelOrderList">
<tr>
<td style="text-align:center;" :rowspan="2">
第{{subIndex+1}}天 <br />
{{subItem.UseTimeStr}}
</td>
<td>
<template v-if="(childItem.DMCState==1 || childItem.OPState==1) && childItem.SupplierId!=UserInfo.SupplierId">业者自理</template>
<template v-else>
{{childItem.HotelName}}<br/>
<div class="rq_changeName">{{childItem.NewHotelName!=childItem.HotelName?'更换为:'+childItem.NewHotelName:""}}</div>
</template>
</td>
<td>
<template v-if="(childItem.DMCState==1 || childItem.OPState==1) && childItem.SupplierId!=UserInfo.SupplierId"></template>
<template v-else>
<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>
</template>
</td>
<td>
<template v-if="(childItem.DMCState==1 || childItem.OPState==1) && childItem.SupplierId!=UserInfo.SupplierId"></template>
<template v-else>
<template v-if="childItem.TaxType==1">税入</template>
<template v-if="childItem.TaxType==2">税别</template>
</template>
</td>
<td>
<template v-if="(childItem.DMCState==1 || childItem.OPState==1) && childItem.SupplierId!=UserInfo.SupplierId"></template>
<template v-else>
<select class="rq_status" v-model='childItem.SupplierToDmcHotelStatus'
:placeholder="$t('pub.pleaseSel')">
<option label='请选择' :value='0'></option>
<option label='一般提醒' :value='1'></option>
<option label='重要提醒' :value='2'></option>
</select>
</template>
</td>
<td>
<template v-if="(childItem.DMCState==1 || childItem.OPState==1) && childItem.SupplierId!=UserInfo.SupplierId"></template>
<template v-else>
<textarea class="w135" cols="25" rows="5" v-model='childItem.SupplierToDmcRemarks'></textarea>
</template>
</td>
</tr>
<tr>
<td colspan="6">
<span style="display:inline-block;width:60px;vertical-align:top;">提示信息：</span>
<span style="display:inline-block;width:87%;"
:class="{'rq_disImNote':childItem.SupplierHotelStatus==1&&DateMinus(subItem.UseTimeStr)<=5,'rq_importNote':childItem.SupplierHotelStatus==2&&DateMinus(subItem.UseTimeStr)<=5}">{{childItem.Remarks}}</span>
</td>
</tr>
</template>
</tbody>
</template>
<tfoot>
<tr>
<td colspan="7">
<input type="button" value="保存" @click="saveSupplierjourneyorder(HotelList)"
class="normalBtn SaveR_Btn" />
</td>
</tr>
</tfoot>
</table>
<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 class="SP_RemarkTitle">
对地接备注：
</td>
<td>
<el-input class='w320 SupplierRemarks' v-model='RemarkObj.SupplierToDmcRemarks' type='textarea'>
</el-input>
</td>
</tr>
<tr>
<td colspan="2">
<input type="button" value="保存" @click="saveSupplierToDmcRemarks" class="normalBtn SaveR_Btn" />
</td>
</tr>
</table>
<a class="hotelLink" slot="reference" @click="getClickItem(item)">备注</a>
</el-popover>
</el-tooltip>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -217,6 +99,117 @@ ...@@ -217,6 +99,117 @@
<i class="el-icon-arrow-up"></i> <i class="el-icon-arrow-up"></i>
</div> </div>
</transition> </transition>
<el-dialog custom-class='w800' title="酒店信息" :visible.sync="hotelUseDetail" center>
<table class="rq_HotelTable" v-loading="hotelLoading">
<tr>
<th width="120">
时间
</th>
<th width="150">
酒店
</th>
<th width="250">
价格
</th>
<th width="100">
税入/税别
</th>
<th width="100">提醒</th>
<th width="150">备注</th>
</tr>
<template v-for="(subItem,subIndex) in HotelList">
<tbody>
<template v-for="(childItem,childIndex) in subItem.HotelOrderList">
<tr>
<td style="text-align:center;" :rowspan="2">
第{{subIndex+1}}天 <br />
{{subItem.UseTimeStr}}
</td>
<td>
<template v-if="(childItem.DMCState==1 || childItem.OPState==1) && childItem.SupplierId!=UserInfo.SupplierId">业者自理</template>
<template v-else>
{{childItem.HotelName}}<br/>
<div class="rq_changeName">{{childItem.NewHotelName!=childItem.HotelName?'更换为:'+childItem.NewHotelName:""}}</div>
</template>
</td>
<td>
<template v-if="(childItem.DMCState==1 || childItem.OPState==1) && childItem.SupplierId!=UserInfo.SupplierId"></template>
<template v-else>
<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>
</template>
</td>
<td>
<template v-if="(childItem.DMCState==1 || childItem.OPState==1) && childItem.SupplierId!=UserInfo.SupplierId"></template>
<template v-else>
<template v-if="childItem.TaxType==1">税入</template>
<template v-if="childItem.TaxType==2">税别</template>
</template>
</td>
<td>
<template v-if="(childItem.DMCState==1 || childItem.OPState==1) && childItem.SupplierId!=UserInfo.SupplierId"></template>
<template v-else>
<select class="rq_status" v-model='childItem.SupplierToDmcHotelStatus'
:placeholder="$t('pub.pleaseSel')">
<option label='请选择' :value='0'></option>
<option label='一般提醒' :value='1'></option>
<option label='重要提醒' :value='2'></option>
</select>
</template>
</td>
<td>
<template v-if="(childItem.DMCState==1 || childItem.OPState==1) && childItem.SupplierId!=UserInfo.SupplierId"></template>
<template v-else>
<textarea class="w135" cols="25" rows="5" v-model='childItem.SupplierToDmcRemarks'></textarea>
</template>
</td>
</tr>
<tr>
<td colspan="6">
<span style="display:inline-block;width:60px;vertical-align:top;">提示信息：</span>
<span style="display:inline-block;width:87%;"
:class="{'rq_disImNote':childItem.SupplierHotelStatus==1&&DateMinus(subItem.UseTimeStr)<=5,'rq_importNote':childItem.SupplierHotelStatus==2&&DateMinus(subItem.UseTimeStr)<=5}">{{childItem.Remarks}}</span>
</td>
</tr>
</template>
</tbody>
</template>
</table>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn"
@click="hotelUseDetail = false">{{$t('pub.cancelBtn')}}</button> &nbsp;
<input type="button" value="保存" @click="saveSupplierjourneyorder(HotelList)" class="normalBtn" />
</div>
</el-dialog>
<el-dialog custom-class='w500' title="对地接备注" :visible.sync="dijieDialog" center>
<table>
<tr>
<td class="SP_RemarkTitle">
对地接备注：
</td>
<td>
<el-input class='w320 SupplierRemarks' v-model='RemarkObj.SupplierToDmcRemarks' type='textarea'>
</el-input>
</td>
</tr>
</table>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn"
@click="dijieDialog = false">{{$t('pub.cancelBtn')}}</button> &nbsp;
<input type="button" value="保存" @click="saveSupplierToDmcRemarks" class="normalBtn" />
</div>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
...@@ -225,6 +218,8 @@ ...@@ -225,6 +218,8 @@
return { return {
loading: false, loading: false,
hotelLoading: false, hotelLoading: false,
hotelUseDetail:false,
dijieDialog:false,
total: 0, total: 0,
top:0, top:0,
msg: { msg: {
...@@ -294,6 +289,7 @@ ...@@ -294,6 +289,7 @@
this.hotelLoading = false; this.hotelLoading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.Success(res.data.message) this.Success(res.data.message)
this.hotelUseDetail=false;
this.getList(); this.getList();
} else { } else {
this.Error(res.data.message) this.Error(res.data.message)
...@@ -313,7 +309,6 @@ ...@@ -313,7 +309,6 @@
} }
}) })
} }
console.log(this.dataList,'data');
} else { } else {
this.Error(res.data.message) this.Error(res.data.message)
} }
...@@ -350,9 +345,12 @@ ...@@ -350,9 +345,12 @@
}, },
//保存供应商对地接备注 //保存供应商对地接备注
saveSupplierToDmcRemarks() { saveSupplierToDmcRemarks() {
this.loading=true
this.ApiPost2('dmcstatistics_post_SetSupplierToDmcRemarksService', this.RemarkObj, res => { this.ApiPost2('dmcstatistics_post_SetSupplierToDmcRemarksService', this.RemarkObj, res => {
this.hotelLoading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.dijieDialog=false;
this.getList(); this.getList();
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
......
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