Skip to content

S
SuperMan
Commit 6bd63158 authored by 黄奎's avatar 黄奎
Browse files
Options

酒店查询修改

parent 11866b35
Hide whitespace changes
Inline Side-by-side
Showing with 141 additions and 106 deletions
src/components/Hotel/HotelQueryList.vue
View file @ 6bd63158
...@@ -28,38 +28,39 @@ ...@@ -28,38 +28,39 @@
<li> <li>
<span> <span>
<em>星级</em> <em>星级</em>
<el-select v-model="msg.Star" :placeholder="$t('pub.pleaseSel')" > <el-select v-model="msg.Star" :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option label="3星或商务" :value='3'></el-option> <el-option label="3星或商务" :value='3'></el-option>
<el-option label="4星" :value='4'></el-option> <el-option label="4星" :value='4'></el-option>
<el-option label="5星" :value='5'></el-option> <el-option label="5星" :value='5'></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>价格区间</em> <em>价格区间</em>
<el-select v-model="msg.PriceLevel" :placeholder="$t('pub.pleaseSel')" > <el-select v-model="msg.PriceLevel" :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option label="5000以下" :value='1'></el-option> <el-option label="5000以下" :value='1'></el-option>
<el-option label="5000~6000" :value='2'></el-option> <el-option label="5000~6000" :value='2'></el-option>
<el-option label="6000~7000" :value='3'></el-option> <el-option label="6000~7000" :value='3'></el-option>
<el-option label="7000~8000" :value='4'></el-option> <el-option label="7000~8000" :value='4'></el-option>
<el-option label="8000~9000" :value='5'></el-option> <el-option label="8000~9000" :value='5'></el-option>
<el-option label="9000~10000" :value='6'></el-option> <el-option label="9000~10000" :value='6'></el-option>
<el-option label="10000以上" :value='7'></el-option> <el-option label="10000以上" :value='7'></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
<li><span><em>日期</em> <li><span><em>日期</em>
<el-date-picker v-model='msg.StartDate' value-format="yyyy-MM-dd" type="date"></el-date-picker> <el-date-picker v-model='msg.StartDate' value-format="yyyy-MM-dd" type="date" :picker-options="beforeCheck"></el-date-picker>
<el-date-picker v-model='msg.EndDate' value-format="yyyy-MM-dd" type="date"></el-date-picker> <el-date-picker v-model='msg.EndDate' value-format="yyyy-MM-dd" type="date" :picker-options="afterCheck"></el-date-picker>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>酒店</em> <em>酒店</em>
<el-select v-model="msg.HotelChooseArray" :placeholder="$t('pub.pleaseSel')" class="multiple_input w300" filterable multiple :multiple-limit="3"> <el-select v-model="msg.HotelChooseArray" :placeholder="$t('pub.pleaseSel')" class="multiple_input w300"
filterable multiple :multiple-limit="3">
<el-option v-for="item in HotelList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option> <el-option v-for="item in HotelList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select> </el-select>
</span> </span>
...@@ -82,43 +83,52 @@ ...@@ -82,43 +83,52 @@
<span style="color:#000000;background-color: #02F78E;padding:2px 4px;border-radius:5px">特别价</span> <span style="color:#000000;background-color: #02F78E;padding:2px 4px;border-radius:5px">特别价</span>
</div> </div>
<template v-if="isShow"> <template v-if="isShow">
<el-table :data="dataList" style="width:100%" border v-loading='loading' height="500"> <el-table v-if="dataList.length>0" :data="dataList" style="width:100%" border v-loading='loading' height="500">
<el-table-column fixed label="酒店名称" min-width="180"> <el-table-column fixed label="酒店名称" min-width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<div style="text-decoration: underline;cursor:pointer" @click="GotoHotel(scope.row.HotelId)">{{scope.row.HotelName}}</div> <div style="text-decoration: underline;cursor:pointer" @click="GotoHotel(scope.row.HotelId)">
<div>{{scope.row.TotalInventory}}</div> {{scope.row.HotelName}}</div>
</template> <div>{{scope.row.TotalInventory}}</div>
</el-table-column> </template>
<el-table-column label="价格&库存" fixed min-width="120"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="价格&库存" fixed min-width="120">
<div class="Hotel_kong">价格</div> <template slot-scope="scope">
<div class="Hotel_kong" style="min-width:60px;">总/用/剩</div> <div class="Hotel_kong">价格</div>
<div class="Hotel_kong">超定</div> <div class="Hotel_kong" style="min-width:60px;">总/用/剩</div>
</template> <div class="Hotel_kong">超定</div>
</el-table-column> </template>
<el-table-column v-for='(item,index) in dataList[0].subList' :label="getDateList(item.DateStr)" :key='index' min-width="120"> </el-table-column>
<template slot-scope="scope"> <el-table-column v-for='(item,index) in dataList[0].subList' :label="getDateList(item.DateStr)" :key='index'
<div class="Hotel_kong Com_hoteldiv"> min-width="120">
<template v-if="scope.row.subList[index].PriceList.length>0"> <template slot-scope="scope">
<template v-for="childItem in scope.row.subList[index].PriceList"> <div class="Hotel_kong Com_hoteldiv">
<div :class="getClass(1,childItem.InventoryType)" style="height:100%;float:left;width:100%" <template v-if="scope.row.subList[index].PriceList.length>0">
:style="{width:(100/scope.row.subList[index].PriceList.length)+'%'}">{{childItem.CostPrice}}</div> <template v-for="childItem in scope.row.subList[index].PriceList">
</template> <div :class="getClass(1,childItem.InventoryType)" style="height:100%;float:left;width:100%"
</template> :style="{width:(100/scope.row.subList[index].PriceList.length)+'%'}">{{childItem.CostPrice}}</div>
<template v-else> </template>
<div :class="getClass(0,0)" style="width:100%;height:100%">&nbsp;</div> </template>
</template> <template v-else>
</div> <div :class="getClass(0,0)" style="width:100%;height:100%">&nbsp;</div>
<div class="Hotel_kong Com_hoteldiv Hq_duoge" @click="GotoUrl(scope.row,index,scope.row.subList[index].UseInventory)"> </template>
{{scope.row.subList[index].Inventory}}/{{scope.row.subList[index].UseInventory}}/{{scope.row.subList[index].RemainingInventory}}</div> </div>
<div class="Hotel_kong Com_hoteldiv"> <div class="Hotel_kong Com_hoteldiv Hq_duoge"
<span v-if="scope.row.subList[index].UseInventory-scope.row.subList[index].Inventory>0" style="color:red;"> @click="GotoUrl(scope.row,index,scope.row.subList[index].UseInventory)">
{{scope.row.subList[index].UseInventory-scope.row.subList[index].Inventory}} {{scope.row.subList[index].Inventory}}/{{scope.row.subList[index].UseInventory}}/{{scope.row.subList[index].RemainingInventory}}
</span> </div>
</div> <div class="Hotel_kong Com_hoteldiv">
</template> <span v-if="scope.row.subList[index].UseInventory-scope.row.subList[index].Inventory>0"
</el-table-column> style="color:red;">
</el-table> {{scope.row.subList[index].UseInventory-scope.row.subList[index].Inventory}}
</span>
</div>
</template>
</el-table-column>
</el-table>
<div class="noDataNotice" v-else>
<i class="iconfont icon-kong"></i>
<p>{{$t("active.ld_noData")}}</p>
</div>
</template> </template>
</div> </div>
...@@ -143,7 +153,7 @@ ...@@ -143,7 +153,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="说明"> <el-form-item label="说明">
<quill-editor class="w595" :options="editorOption" v-model="postMsg.TipContent"></quill-editor> <quill-editor class="w595" :options="editorOption" v-model="postMsg.TipContent"></quill-editor>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -164,7 +174,9 @@ ...@@ -164,7 +174,9 @@
<template v-if="queryMsg.total>0"> <template v-if="queryMsg.total>0">
<tr v-for="(item,index) in HotelTipList"> <tr v-for="(item,index) in HotelTipList">
<td>{{item.Id}}</td> <td>{{item.Id}}</td>
<td><p style="text-align:left;padding-left:5px;" v-html="item.TipContent"></p></td> <td>
<p style="text-align:left;padding-left:5px;" v-html="item.TipContent"></p>
</td>
<td>{{item.CreateByName}}</td> <td>{{item.CreateByName}}</td>
<td>{{item.CreateTimeStr}}</td> <td>{{item.CreateTimeStr}}</td>
<td> <td>
...@@ -198,7 +210,9 @@ ...@@ -198,7 +210,9 @@
<template v-if="queryMsg.total>0"> <template v-if="queryMsg.total>0">
<tr v-for="(item,index) in HotelTipList"> <tr v-for="(item,index) in HotelTipList">
<td>{{item.Id}}</td> <td>{{item.Id}}</td>
<td><p style="text-align:left;padding:0 5px;" v-html="item.TipContent"></p></td> <td>
<p style="text-align:left;padding:0 5px;" v-html="item.TipContent"></p>
</td>
<td>{{item.CreateByName}}</td> <td>{{item.CreateByName}}</td>
<td>{{item.CreateTimeStr}}</td> <td>{{item.CreateTimeStr}}</td>
</tr> </tr>
...@@ -223,7 +237,7 @@ ...@@ -223,7 +237,7 @@
return { return {
msg: { msg: {
//酒店选择数组 //酒店选择数组
HotelChooseArray:[], HotelChooseArray: [],
StartDate: new Date().Format("yyyy-MM-dd"), StartDate: new Date().Format("yyyy-MM-dd"),
EndDate: this.setEdate(), EndDate: this.setEdate(),
//只查询日本 //只查询日本
...@@ -232,11 +246,31 @@ ...@@ -232,11 +246,31 @@
City: 0, City: 0,
OutBranchId: -1, OutBranchId: -1,
//星级 //星级
Star:0, Star: 0,
//价格等级 //价格等级
PriceLevel:0 PriceLevel: 0
},
beforeCheck: {
disabledDate: time => {
if (this.msg.StartDate) {
let endTime = new Date(this.msg.EndDate);
return time && endTime.getTime() < time.getTime();
} else {
return false;
}
}
},
afterCheck: {
disabledDate: time => {
if (this.msg.StartDate) {
let startTime = new Date(this.msg.StartDate);
//可以选择当天
return time && time.getTime() < startTime.getTime() - 1 * 24 * 60 * 60 * 1000;
} else {
return false;
}
}
}, },
//分公司列表 //分公司列表
companyList: [], companyList: [],
defaultSelectValue: 0, defaultSelectValue: 0,
...@@ -277,13 +311,13 @@ ...@@ -277,13 +311,13 @@
return startTime.getTime() >= time.getTime() return startTime.getTime() >= time.getTime()
} }
}, },
editorOption:{ editorOption: {
placeholder: '请输入内容', placeholder: '请输入内容',
modules:{ modules: {
toolbar:[ toolbar: [
['bold', 'italic', 'underline', 'strike'], // toggled buttons ['bold', 'italic', 'underline', 'strike'], // toggled buttons
['blockquote', 'code-block','align'] ['blockquote', 'code-block', 'align']
] ]
} }
}, },
}; };
...@@ -295,7 +329,7 @@ ...@@ -295,7 +329,7 @@
query: { query: {
ID: HotelId, ID: HotelId,
tab: "酒店查询", tab: "酒店查询",
blank:'y', blank: 'y',
} }
}); });
}, },
...@@ -306,7 +340,7 @@ ...@@ -306,7 +340,7 @@
query: { query: {
HotelId: item.HotelId, HotelId: item.HotelId,
HotelUseTime: item.subList[subIndex].DateStr, HotelUseTime: item.subList[subIndex].DateStr,
blank:'y', blank: 'y',
tab: "团控查询", tab: "团控查询",
} }
}); });
...@@ -365,7 +399,7 @@ ...@@ -365,7 +399,7 @@
var weekDay = ["天", "一", "二", "三", "四", "五", "六"]; var weekDay = ["天", "一", "二", "三", "四", "五", "六"];
var myDate = new Date(Date.parse(dateStr)); var myDate = new Date(Date.parse(dateStr));
return str[1] + '/' + str[2] + "（"+weekDay[myDate.getDay()]+"）"; return str[1] + '/' + str[2] + "（" + weekDay[myDate.getDay()] + "）";
}, },
//获取星期几 //获取星期几
getWeek(dateStr) { getWeek(dateStr) {
...@@ -374,7 +408,7 @@ ...@@ -374,7 +408,7 @@
return weekDay[myDate.getDay()] return weekDay[myDate.getDay()]
}, },
//获取颜色状态 //获取颜色状态
getClass(Status,InventoryType) { getClass(Status, InventoryType) {
var classStr = ""; var classStr = "";
if (Status == 0) { if (Status == 0) {
classStr = 'noKucun'; classStr = 'noKucun';
...@@ -525,10 +559,10 @@ ...@@ -525,10 +559,10 @@
text-decoration: underline; text-decoration: underline;
} }
.HqCom_bottom .ql-container .HqCom_bottom .ql-container {
{ min-height: 100px;
min-height: 100px; }
}
.classHong { .classHong {
background-color: rgb(255, 55, 55); background-color: rgb(255, 55, 55);
} }
...@@ -557,7 +591,7 @@ ...@@ -557,7 +591,7 @@
.Com_hoteldiv { .Com_hoteldiv {
min-width: 70px; min-width: 70px;
white-space:nowrap; white-space: nowrap;
} }
.noKucun { .noKucun {
...@@ -617,23 +651,32 @@ ...@@ -617,23 +651,32 @@
height: 350px; height: 350px;
padding-top: 35px; padding-top: 35px;
} }
.HQ_miaoshu{
color:#E95252; .HQ_miaoshu {
font-size:12px; color: #E95252;
font-size: 12px;
} }
.HQ_miaoshu:first-child{
margin-top:10px; .HQ_miaoshu:first-child {
margin-top: 10px;
} }
.HotelQueryList .has-gutter tr th, .el-table th.is-leaf{
background: #EAEAEA!important; .HotelQueryList .has-gutter tr th,
.el-table th.is-leaf {
background: #EAEAEA !important;
} }
.HotelQueryList .el-table td, .el-table th.is-leaf{
border-bottom:1px solid #ebeef5; .HotelQueryList .el-table td,
.el-table th.is-leaf {
border-bottom: 1px solid #ebeef5;
} }
.HotelQueryList .el-table .cell{
padding:0; .HotelQueryList .el-table .cell {
padding: 0;
} }
.HotelQueryList .el-table td{
padding:0; .HotelQueryList .el-table td {
padding: 0;
} }
</style> </style>
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ 6bd63158
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
} }
._TravelPricePopover .jiDiv{ ._TravelPricePopover .jiDiv{
width:800px; width:650px;
max-height:400px; max-height:400px;
overflow: auto; overflow: auto;
} }
...@@ -257,6 +257,7 @@ ...@@ -257,6 +257,7 @@
.TP_Airticktid { .TP_Airticktid {
text-decoration: underline; text-decoration: underline;
cursor: pointer; cursor: pointer;
color: #409eff;
} }
.TP_noneed { .TP_noneed {
...@@ -681,28 +682,22 @@ ...@@ -681,28 +682,22 @@
<table width="100%" border="0" cellspacing="0" cellpadding="0"> <table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
<td class="_color_666">选择</td> <td class="_color_666">选择</td>
<td class="_color_666">航班号</td> <td class="_color_666">航班号/航空公司/航段</td>
<td class="_color_666">航空公司</td>
<td class="_color_666">航段</td>
<td class="_color_666">时间</td> <td class="_color_666">时间</td>
<td class="_color_666">PNR</td> <td class="_color_666">PNR</td>
<td class="_color_666">机票数量</td> <td class="_color_666">机票数量/使用数量</td>
<td class="_color_666">使用数量</td>
<td class="_color_666">绑定机位数</td> <td class="_color_666">绑定机位数</td>
</tr> </tr>
<tr v-for="fitem in selectFilghtList"> <tr v-for="fitem in selectFilghtList">
<td> <td>
<el-checkbox v-model="fitem.IsSelected===true" @change="getSelect(fitem)"></el-checkbox> <el-checkbox v-model="fitem.IsSelected===true" @change="getSelect(fitem)"></el-checkbox>
</td> </td>
<td><span class="TP_Airticktid" <td>
@click="goUrl('TicketManager',fitem.AirticketId)">{{fitem.FlightNumber}}</span> <span class="TP_Airticktid" @click="goUrl('TicketManager',fitem.AirticketId)">{{fitem.FlightNumber}}</span> / {{fitem.AlName}} / {{fitem.DepartureName}}-{{fitem.ArrivalCityName}}
</td> </td>
<td>{{fitem.AlName}}</td>
<td>{{fitem.DepartureName}}-{{fitem.ArrivalCityName}}</td>
<td>{{fitem.FlightDate}} {{fitem.Departure_time}}</td> <td>{{fitem.FlightDate}} {{fitem.Departure_time}}</td>
<td>{{fitem.PNR}}</td> <td>{{fitem.PNR}}</td>
<td>{{fitem.TicketNum}}</td> <td>{{fitem.TicketNum}} / {{fitem.UseAmount}}</td>
<td>{{fitem.UseAmount}}</td>
<td> <td>
<el-input class="w80" placeholder="机位数" @keyup.native="getFlightBindNum(fitem)" v-model="fitem.BindNum"></el-input> <el-input class="w80" placeholder="机位数" @keyup.native="getFlightBindNum(fitem)" v-model="fitem.BindNum"></el-input>
</td> </td>
...@@ -1576,7 +1571,6 @@ ...@@ -1576,7 +1571,6 @@
LineTeamId:this.PostConfig.LineteamId LineTeamId:this.PostConfig.LineteamId
} }
this.apipost("sell_get_GetNewTCIDLessprice", msg,res => { this.apipost("sell_get_GetNewTCIDLessprice", msg,res => {
console.log(res,'res');
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.lessPriceData = res.data.data; this.lessPriceData = res.data.data;
}else{ }else{
...@@ -1626,7 +1620,6 @@ ...@@ -1626,7 +1620,6 @@
this.DateArr.push(x.StartDate); this.DateArr.push(x.StartDate);
}); });
this.initCalendar(); this.initCalendar();
console.log(this.priceData,'pricedate');
}, },
deep: true deep: true
}, },
...@@ -1651,5 +1644,4 @@ ...@@ -1651,5 +1644,4 @@
TravelPriceFlightList: TravelPriceFlightList TravelPriceFlightList: TravelPriceFlightList
} }
}; };
</script>
</script> \ No newline at end of file
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