Skip to content

S
SuperMan
Commit 604ab07d authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

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

parents b9a2f7dd 48546995
Hide whitespace changes
Inline Side-by-side
Showing with 101 additions and 88 deletions
src/components/Supplier/roomQuery2.vue
View file @ 604ab07d
......@@ -66,33 +66,32 @@
</td>
<td>
<el-tooltip class="item" effect="dark" content="酒店信息" placement="top-start">
<el-popover placement="bottom" width="800" trigger="click" popper-class="rq_HotelDetails">
<el-popover placement="bottom" width="1250" trigger="click" popper-class="rq_HotelDetails">
<table class="rq_HotelTable" v-loading="hotelLoading">
<tr>
<th width="200">
<th width="150">
时间
</th>
<th width="200">
<th width="150">
酒店
</th>
<th width="200">
<th width="150">
更换名称
</th>
<th width="500">
<th width="450">
价格
</th>
<th width="120">
<th width="100">
税入/税别
</th>
<th>提醒</th>
<th>备注</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;">
<td style="text-align:center;" :rowspan="2">
第{{subIndex+1}}天 <br />
{{subItem.UseTimeStr}}
</td>
......@@ -121,8 +120,7 @@
<template v-if="childItem.TaxType==2">税别</template>
</td>
<td>
<!-- 提醒等级
<el-select class='w135 sel' v-model='childItem.SupplierToDmcHotelStatus'
<!-- <el-select v-model='childItem.SupplierToDmcHotelStatus'
:placeholder="$t('pub.pleaseSel')">
<el-option label='请选择' :value='0'></el-option>
<el-option label='一般提醒' :value='1'></el-option>
......@@ -130,25 +128,26 @@
</el-select> -->
</td>
<td>
对地接备注
<el-input type='textarea' class='w135' v-model='childItem.SupplierToDmcRemarks'>
</el-input>
<!-- <el-input type='textarea' class='w135' v-model='childItem.SupplierToDmcRemarks'>
</el-input> -->
</td>
</tr>
<!-- <tr>
<td colspan="4">
<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> -->
<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="5">
<input type="button" value="保存" @click="saveSupplierjourneyorder(HotelList)" class="normalBtn SaveR_Btn" />
</td>
<td colspan="7">
<input type="button" value="保存" @click="saveSupplierjourneyorder(HotelList)"
class="normalBtn SaveR_Btn" />
</td>
</tr>
</tfoot>
</table>
......@@ -164,7 +163,8 @@
对地接备注：
</td>
<td>
<el-input class='w320 SupplierRemarks' v-model='RemarkObj.SupplierToDmcRemarks' type='textarea'></el-input>
<el-input class='w320 SupplierRemarks' v-model='RemarkObj.SupplierToDmcRemarks' type='textarea'>
</el-input>
</td>
</tr>
<tr>
......@@ -181,7 +181,7 @@
<tr>
<td colspan="8" style="text-align:left;padding-left:5px;">
<div class="rQ_HtList" v-if="item.IsBookTeam==2&&item.Numbers>=0">
<span v-for="subItem in item.Numbers"></span>
<span v-for="subItem in item.Numbers"></span>
</div>
<div>注意事项： {{item.SupplierRemarks}}</div>
</td>
......@@ -203,7 +203,7 @@
return {
loading: false,
hotelLoading: false,
HotelUseLoading:false,
HotelUseLoading: false,
total: 0,
msg: {
pageIndex: 1,
......@@ -247,9 +247,9 @@
TCID: 0
},
//是否为今天
isToday:false,
todayDate:'',
showNum:0,
isToday: false,
todayDate: '',
showNum: 0,
}
},
methods: {
......@@ -266,7 +266,7 @@
// }, err => {})
},
//保存信息
saveSupplierjourneyorder(HotelList){
saveSupplierjourneyorder(HotelList) {
this.HotelUseLoading = true;
this.ApiPost2('dmcstatistics_post_SetSupplierjourneyorderService', HotelList, res => {
this.HotelUseLoading = false;
......@@ -284,22 +284,24 @@
this.loading = false;
if (res.data.resultCode == 1) {
this.dataList = res.data.data;
this.dataList.forEach(x=>{
if(x.HotelBookTimeStr){
x.Numbers = 5- this.DateMinus(x.HotelBookTimeStr);
if (this.dataList && this.dataList.length > 0) {
this.dataList.forEach(x => {
if (x.HotelBookTimeStr) {
x.Numbers = 5 - this.DateMinus(x.HotelBookTimeStr);
}
})
})
}
} else {
this.Error(res.data.message)
}
}, err => {})
},
DateMinus(sDate){
　　var sdate = new Date(sDate.replace(/-/g, "/"));
　　var now = new Date();
　　var days = now.getTime()-sdate.getTime();
　　var day = Math.abs(parseInt(days / (1000 * 60 * 60 * 24)));
　　return day;
DateMinus(sDate) {
var sdate = new Date(sDate.replace(/-/g, "/"));
var now = new Date();
var days = now.getTime() - sdate.getTime();
var day = Math.abs(parseInt(days / (1000 * 60 * 60 * 24)));
return day;
},
//获取酒店列表
getHotelList(TCID, NewCombinationNum) {
......@@ -309,11 +311,11 @@
TCID: TCID,
NewCombinationNum: NewCombinationNum
};
this.ApiPost2('dmcstatistics_post_GetSupplierHotelListService_V2', qMsg, res => {
this.ApiPost2('dmcstatistics_post_GetSupplierHotelListService', qMsg, res => {
this.hotelLoading = false;
if (res.data.resultCode == 1) {
this.HotelList = res.data.data;
console.log(this.HotelList,'hotellist')
console.log(this.HotelList, 'hotellist')
} else {
this.Error(res.data.message);
}
......@@ -350,22 +352,22 @@
});
},
timeAdd0(str) {
if(str.length<=1){
str='0'+str;
if (str.length <= 1) {
str = '0' + str;
}
return str
},
//提取年月日
getDateYear(date){
getDateYear(date) {
return date.split(' ')[0];
}
},
mounted() {
this.UserInfo = this.getLocalStorageSupplier();
//获取当前日期
var nowMonth=(new Date().getMonth() + 1).toString()
var nowDay=new Date().getDate().toString();
this.todayDate = new Date().getFullYear()+'-'+ this.timeAdd0(nowMonth) +'-' + this.timeAdd0(nowDay);
var nowMonth = (new Date().getMonth() + 1).toString()
var nowDay = new Date().getDate().toString();
this.todayDate = new Date().getFullYear() + '-' + this.timeAdd0(nowMonth) + '-' + this.timeAdd0(nowDay);
this.getList();
},
......@@ -496,26 +498,31 @@
position: relative;
top: 3px;
}
.SupplierRemarks .el-textarea__inner{
height:75px;
.SupplierRemarks .el-textarea__inner {
height: 75px;
}
.SP_RemarkTitle{
.SP_RemarkTitle {
vertical-align: top;
padding-top:5px;
padding-top: 5px;
}
.SaveR_Btn{
margin:10px 0 0 45%;
.SaveR_Btn {
margin: 10px 0 0 45%;
}
.Add_triangle{
width: 0;
height: 0;
position: absolute;
left:0;
top:0;
border-style: solid;
border-width: 45px 45px 0 0;
border-color: #7abd53 transparent transparent
.Add_triangle {
width: 0;
height: 0;
position: absolute;
left: 0;
top: 0;
border-style: solid;
border-width: 45px 45px 0 0;
border-color: #7abd53 transparent transparent
}
.Add_triangle::after {
content: '新增';
position: absolute;
......@@ -524,17 +531,19 @@
white-space: nowrap;
color: #FFFFFF;
font-size: 12px;
}
.minus_triangle{
}
.minus_triangle {
width: 0;
height: 0;
position: absolute;
left:0;
top:0;
left: 0;
top: 0;
border-style: solid;
border-width: 45px 45px 0 0;
border-color: red transparent transparent
}
border-color: red transparent transparent
}
.minus_triangle::after {
content: '取消';
position: absolute;
......@@ -543,23 +552,27 @@
white-space: nowrap;
color: #FFFFFF;
font-size: 12px;
}
.rQ_HtList{
margin-top:5px 0 3px 0;
}
.rQ_HtList span{
display:inline-block;
width:15px;
height:15px;
margin-right:5px;
background-color: red;
border:1px solid #d1d1d1;
}
.rq_importNote{
color: red;
}
.rq_disImNote{
color: #ea6d6d;
}
}
.rQ_HtList {
margin-top: 5px 0 3px 0;
}
.rQ_HtList span {
display: inline-block;
width: 15px;
height: 15px;
margin-right: 5px;
background-color: red;
border: 1px solid #d1d1d1;
}
.rq_importNote {
color: red;
}
.rq_disImNote {
color: #ea6d6d;
}
</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