Commit 48174df2 authored by zhengke's avatar zhengke

修改

parent 4f48ee9c
...@@ -113,7 +113,7 @@ export default { ...@@ -113,7 +113,7 @@ export default {
} }
</script> </script>
<style> <style>
@import "//at.alicdn.com/t/font_635492_b8jianjuawm.css"; @import "//at.alicdn.com/t/font_635492_ea4o8lkzm2b.css";
@import "./assets/css/Semibold.css"; @import "./assets/css/Semibold.css";
@import "./assets/css/global/config.css"; @import "./assets/css/global/config.css";
@import "./assets/css/fileIcon.css"; @import "./assets/css/fileIcon.css";
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<li> <li>
<span> <span>
<em>月份</em> <em>月份</em>
<el-date-picker v-model="msg.Month" type="month" placeholder="选择月"> <el-date-picker v-model="msg.QMonthStr" type="month" format="yyyy-MM" placeholder="选择月">
</el-date-picker> </el-date-picker>
</span> </span>
</li> </li>
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
<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> {{subItem.TicketDepartureTime}} {{subItem.DepartureName}}({{subItem.DIATA}})
<i class="iconfont icon-weibiaoti40 rq_Arrow"></i>
{{subItem.TicketArrivalTime}} {{subItem.ArrivalCityName}}({{subItem.AIATA}})</span> {{subItem.TicketArrivalTime}} {{subItem.ArrivalCityName}}({{subItem.AIATA}})</span>
</template> </template>
</td> </td>
...@@ -62,7 +63,7 @@ ...@@ -62,7 +63,7 @@
</td> </td>
<td> <td>
<el-tooltip class="item" effect="dark" content="酒店信息" placement="top-start"> <el-tooltip class="item" effect="dark" content="酒店信息" placement="top-start">
<el-popover placement="bottom" width="500" trigger="click" popper-class="rq_HotelDetails"> <el-popover placement="bottom" width="600" trigger="click" popper-class="rq_HotelDetails">
<table class="rq_HotelTable"> <table class="rq_HotelTable">
<tr> <tr>
<th width="160"> <th width="160">
...@@ -74,7 +75,7 @@ ...@@ -74,7 +75,7 @@
<th width="200"> <th width="200">
更换名称 更换名称
</th> </th>
<th width="250"> <th width="300">
价格 价格
</th> </th>
</tr> </tr>
...@@ -100,7 +101,9 @@ ...@@ -100,7 +101,9 @@
<template v-if="detailsItem.HouseType==4">司导间</template> <template v-if="detailsItem.HouseType==4">司导间</template>
{{detailsItem.HouseTypeCount}} 间 {{detailsItem.HouseTypeCount}} 间
价格: {{detailsItem.UnitPrice}} 价格: {{detailsItem.UnitPrice}}
税入/税别 {{detailsItem.TaxType}}
<template v-if="detailsItem.TaxType==1">税入</template>
<template v-if="detailsItem.TaxType==2">税别</template>
返佣: {{detailsItem.RebateRatio}} 返佣: {{detailsItem.RebateRatio}}
<br/> <br/>
</template> </template>
...@@ -158,7 +161,7 @@ ...@@ -158,7 +161,7 @@
TCNUM: '', TCNUM: '',
PriceStatus: 0, PriceStatus: 0,
CombinationNum: '', CombinationNum: '',
Month: "" //月份字符串 QMonthStr: "" //月份字符串
}, },
UserInfo: {}, //用户信息 UserInfo: {}, //用户信息
dataList: [], //数据列表 dataList: [], //数据列表
...@@ -239,7 +242,8 @@ ...@@ -239,7 +242,8 @@
parseInt(myDate.getMonth() + 1) + parseInt(myDate.getMonth() + 1) +
"-" + "-" +
myDate.getDate(); myDate.getDate();
this.msg.Month = myDate.getFullYear() + "-" + parseInt(myDate.getMonth() + 1); this.msg.QMonthStr = myDate.getFullYear() + "-" + parseInt(myDate.getMonth() + 1);
console.log(this.msg.QMonthStr);
this.getList(); this.getList();
}, },
} }
...@@ -336,4 +340,8 @@ ...@@ -336,4 +340,8 @@
max-height:400px; max-height:400px;
overflow: auto; overflow: auto;
} }
.roomQuery .rq_Arrow{
position: relative;
top:3px;
}
</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