Commit a75ed14b authored by zhengke's avatar zhengke

修改

parent 46398937
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<div style="display:inline-block;color:red">注意事项:每次导出数据最好不要超过一个月。</div> <div style="display:inline-block;color:red">注意事项:每次导出数据最好不要超过一个月。</div>
<div class="rq_comSpan" style="display:inline-block;">颜色说明: <div class="rq_comSpan" style="display:inline-block;">颜色说明:
<span class="rq_span1">未操作</span><span class="rq_span2">操作中</span><span class="rq_span3">操作完成</span><span <span class="rq_span1">未操作</span><span class="rq_span2">操作中</span><span class="rq_span3">操作完成</span><span
class="rq_span4">机位数和人数不相符</span> class="rq_span4">机位数和人数不相符</span><span class="rq_span4">取消个数</span>
</div> </div>
</div><br /> </div><br />
<table border="0" cellspacing="1" cellpadding="0" class="roomQuery_SupplierTable" v-loading='loading'> <table border="0" cellspacing="1" cellpadding="0" class="roomQuery_SupplierTable" v-loading='loading'>
...@@ -39,15 +39,6 @@ ...@@ -39,15 +39,6 @@
<td style="position:relative;"> <td style="position:relative;">
{{item.NewCombinationNum}} {{item.NewCombinationNum}}
<div class="Add_triangle" v-if="item.IsBookTeam==1&&todayDate==getDateYear(item.HotelBookTimeStr)"></div> <div class="Add_triangle" v-if="item.IsBookTeam==1&&todayDate==getDateYear(item.HotelBookTimeStr)"></div>
{{item.IsBookTeam}}
{{item.HotelBookTimeStr}}
<div class="rQ_HtList">
<span></span>
<span></span>
<span></span>
<span></span>
<span></span>
</div>
</td> </td>
<td> <td>
{{item.TCNUMS}}({{item.TCID}}) {{item.TCNUMS}}({{item.TCID}})
...@@ -165,7 +156,10 @@ ...@@ -165,7 +156,10 @@
</tr> </tr>
<tr> <tr>
<td colspan="8" style="text-align:left;padding-left:5px;"> <td colspan="8" style="text-align:left;padding-left:5px;">
注意事项: {{item.SupplierRemarks}} <div class="rQ_HtList" v-if="item.IsBookTeam==2">
<span v-for="subItem in item.Numbers"></span>
</div>
<div>注意事项: {{item.SupplierRemarks}}</div>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -230,6 +224,7 @@ ...@@ -230,6 +224,7 @@
//是否为今天 //是否为今天
isToday:false, isToday:false,
todayDate:'', todayDate:'',
showNum:0,
} }
}, },
methods: { methods: {
...@@ -251,12 +246,24 @@ ...@@ -251,12 +246,24 @@
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.dataList = res.data.data; this.dataList = res.data.data;
console.log("Supplier_V2",this.dataList); this.dataList.forEach(x=>{
if(x.HotelBookTimeStr){
x.Numbers = 5- this.DateMinus(x.HotelBookTimeStr);
}
})
console.log(this.dataList,'datalist');
} else { } else {
this.Error(res.data.message) this.Error(res.data.message)
} }
}, err => {}) }, err => {})
}, },
DateMinus(sDate){
  var sdate = new Date(sDate.replace(/-/g, "/"));
  var now = new Date();
  var days = sdate.getTime()-now.getTime();
  var day = parseInt(days / (1000 * 60 * 60 * 24));
  return day;
},
//获取酒店列表 //获取酒店列表
getHotelList(TCID, NewCombinationNum) { getHotelList(TCID, NewCombinationNum) {
this.hotelLoading = true; this.hotelLoading = true;
...@@ -468,25 +475,27 @@ ...@@ -468,25 +475,27 @@
left:0; left:0;
top:0; top:0;
border-style: solid; border-style: solid;
border-width: 40px 40px 0 0; border-width: 45px 45px 0 0;
border-color: red transparent transparent border-color: red transparent transparent
} }
.Add_triangle::after { .Add_triangle::after {
content: '新增'; content: '新增';
position: absolute; position: absolute;
top: -35px; top: -42px;
right: -27px; right: -27px;
white-space: nowrap; white-space: nowrap;
color: #FFFFFF; color: #FFFFFF;
font-size: 12px; font-size: 12px;
} }
.rQ_HtList{ .rQ_HtList{
margin-top:10px; margin-top:5px 0 3px 0;
} }
.rQ_HtList span{ .rQ_HtList span{
display:inline-block; display:inline-block;
width:15px; width:15px;
height:15px; height:15px;
margin-right:5px;
background-color: red;
border:1px solid #d1d1d1; border:1px solid #d1d1d1;
} }
</style> </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