Skip to content

S
SuperMan
Commit ad25c8fc authored by Mac's avatar Mac
Browse files
Options

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

parents dff47855 2705fa96
Hide whitespace changes
Inline Side-by-side
Showing with 115 additions and 67 deletions
src/components/Hotel/roomReservationsDetails.vue
View file @ ad25c8fc
......@@ -33,7 +33,7 @@
<th width="100">房间类型</th>
<th width="70">房间数</th>
<th width="70">房间<br />人数</th>
<th width="110">修改酒店</th>
<th width="170">修改酒店/供应商</th>
<th width="80">房间<br />预定数</th>
<th width="80">预定人数</th>
<th width="80">尚差<br />房间数</th>
......@@ -56,7 +56,7 @@
<table class="hotelTable">
<tr>
<td colspan="2">
<p class="link" style="word-break: normal;text-align:left;"
<p class="link" style="word-break: normal;text-align:left;"
:class="{'Hotel_red':subItem.HotelChangeState==3}"
@click="goUrlR('HotelManagement',subItem.HotelId,'酒店管理')">{{subItem.HotelName}}</p>
</td>
......@@ -114,36 +114,60 @@
{{subItem.HouseStatistics.HouseTypeList[childIndex].HouseGuestNum}}
</td>
<td v-if="childIndex==0" :rowspan="5">
<div class="w150">
<!--:disabled="subItem.OPState==1"-->
<el-select class='w120 sel' v-model='subItem.NewHotelId' filterable :placeholder="$t('pub.pleaseSel')"
<el-select class='w120 sel' v-model='subItem.NewHotelId' filterable :placeholder="$t('pub.pleaseSel')"
@visible-change='getHotelList(subItem)' @change='sendValue(subItem)'>
<el-option v-for='itemHotel in subItem.hotelList' :label='itemHotel.Name' :value='itemHotel.ID'
:key='itemHotel.ID'>
<span style="float: left">{{itemHotel.Name}}</span>
<span style="float: right; color:red; font-size: 13px">{{itemHotel.Inventory }}</span>
</el-option>
</el-select>
<p style="padding-top: 5px;">
<a v-if="subItem.ContractUrl" target="_blank" :href="subItem.ContractUrl">手配书</a>
</p>
<el-upload :http-request="uploadFileBtnS" :multiple="false" :show-file-list="false" action=''>
<el-button size="small" type="danger" @click='getItem(index, subIndex)'>
{{!subItem.ContractUrl ? '上传手配书' : '重新上传手配书'}}</el-button>
</el-upload>
</div>
<table class="hotelTable">
<tr>
<td width="70" style="text-align:right;">酒店</td>
<td>
<!--:disabled="subItem.OPState==1"-->
<el-select class='w120 sel' v-model='subItem.NewHotelId' filterable
:placeholder="$t('pub.pleaseSel')" @visible-change='getHotelList(subItem)'
@change='sendValue(subItem)'>
<el-option v-for='itemHotel in subItem.hotelList' :label='itemHotel.Name' :value='itemHotel.ID'
:key='itemHotel.ID'>
<span style="float: left">{{itemHotel.Name}}</span>
<span style="float: right; color:red; font-size: 13px">{{itemHotel.Inventory }}</span>
</el-option>
</el-select>
</td>
</tr>
<tr>
<td colspan="2" style="height:5px;"></td>
</tr>
<tr>
<td width="70" style="text-align:right;">
供应商
</td>
<td>
<el-select class='w120 sel' v-model='subItem.SupplierId' filterable placeholder="请选择供应商">
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option v-for="(SupplierItem,Supplierindex) in SupplierList" :key="Supplierindex"
:label="SupplierItem.Name" :value="SupplierItem.ID">
</el-option>
</el-select>
</td>
</tr>
<tr>
<td colspan="2" style="height:5px;"></td>
</tr>
<tr>
<td colspan="2">
<p style="padding-top: 5px;">
<a v-if="subItem.ContractUrl" target="_blank" :href="subItem.ContractUrl">手配书</a>
</p>
<el-upload :http-request="uploadFileBtnS" :multiple="false" :show-file-list="false" action=''>
<el-button size="small" type="danger" @click='getItem(index, subIndex)'>
{{!subItem.ContractUrl ? '上传手配书' : '重新上传手配书'}}</el-button>
</el-upload>
</td>
</tr>
</table>
</td>
<!-- 房间数 -->
<td>
<el-input class='w40 tcenter' maxlength="2" @keyup.native="checkPrice(childItem,'HouseTypeCount')"
v-model='childItem.HouseTypeCount' :disabled="childIndex<4?true:false"></el-input>
<el-input class='w40 tcenter' maxlength="2" @keyup.native="checkPrice(childItem,'HouseTypeCount')"
v-model='childItem.HouseTypeCount' :disabled="childIndex<4?true:false"></el-input>
</td>
<td>
<el-input class='w40 tcenter' maxlength="2" @keyup.native="checkInteger(childItem,'BookNum')"
@input="calculationPrice(subItem)" v-model='childItem.BookNum' :disabled="childIndex<4?true:false">
......@@ -159,13 +183,13 @@
</td>
<!-- 单价/每人 -->
<td>
<el-input @keyup.native="checkInteger(childItem,'UnitPrice')" class='w60 tcenter'
<el-input @keyup.native="checkInteger(childItem,'UnitPrice')" class='w60 tcenter'
@input="calculationPrice(subItem)" v-model='childItem.UnitPrice'>
</el-input>
</td>
<!-- 免减人数 -->
<td>
<el-input class='w40' maxlength="2" @keyup.native="checkInteger(childItem,'HotelDiscount')"
<el-input class='w40' maxlength="2" @keyup.native="checkInteger(childItem,'HotelDiscount')"
v-model='childItem.HotelDiscount' @input="calculationPrice(subItem)">
</el-input>
</td>
......@@ -191,7 +215,7 @@
<tr>
<td width="70" style="text-align:right;">订房状态：</td>
<td>
<el-select class='w135 sel' v-model='subItem.DMCState' :placeholder="$t('pub.pleaseSel')">
<el-select class='w135 sel' v-model='subItem.DMCState' :placeholder="$t('pub.pleaseSel')">
<el-option label='请选择' :value='0'></el-option>
<el-option label='确定' :value='1'></el-option>
<el-option label='暂定' :value='2'></el-option>
......@@ -230,7 +254,7 @@
<tr>
<td width="70" style="text-align:right;">订团号：</td>
<td>
<el-input class='w135' v-model='subItem.ReserveNo'></el-input>
<el-input class='w135' v-model='subItem.ReserveNo'></el-input>
</td>
</tr>
......@@ -240,7 +264,7 @@
<tr>
<td width="70" style="text-align:right;">备注：</td>
<td>
<el-input type='textarea' class='w135' v-model='subItem.Remarks'></el-input>
<el-input type='textarea' class='w135' v-model='subItem.Remarks'></el-input>
</td>
</tr>
</table>
......@@ -248,8 +272,8 @@
<!-- 操作 -->
<td v-if="childIndex==0" :rowspan="5">
<!--v-if="subItem.OPState!=1"-->
<template v-if="subItem.OPState!=1">
<span class="Hotel_red">OP选房确认</span>
<template v-if="subItem.OPState==1">
<span class="Hotel_red">OP选房确认</span>
</template>
<template v-if="IsOperation!=1">
<el-tooltip class="item" effect="dark" content="保存" placement="top-start">
......@@ -300,7 +324,9 @@
checkedsubIndex: '',
loading: false,
boxHeight: 0,
IsOperation:'',
IsOperation: '',
//供应商列表
SupplierList: [],
}
},
methods: {
......@@ -480,7 +506,7 @@
obj.Tel = ckedObj.Tel;
obj.NewHotelName = ckedObj.Name;
obj.PayStyle = ckedObj.PayStyle;
obj.PayStyleExt=ckedObj.PayStyle;
obj.PayStyleExt = ckedObj.PayStyle;
} else {
obj.Address = '';
obj.Tel = '';
......@@ -584,7 +610,17 @@
})
this.ClickItem.ContractUrl = str != "" ? str.substring(0, str.length - 1) : str;
});
},
// 获取供应商
initSupplier() {
this.apipost("supplier_post_GetAllList", {
Type: 1,
Country: 651
}, res => {
if (res.data.resultCode === 1) {
this.SupplierList = res.data.data;
}
}, err => {});
},
},
mounted() {
......@@ -595,6 +631,7 @@
let height = window.innerHeight - 65 - 55;
this.boxHeight = height;
this.offsetwidth = width;
this.initSupplier();
this.getList();
}
}
......
src/components/Supplier/HotelManagement.vue
View file @ ad25c8fc
......@@ -280,7 +280,7 @@
</li>
</ul>
</div>
<div class="hotelResource clearfix" v-loading="loading">
<div class="hotelResource clearfix" v-loading="loading" style="padding:0 20px;">
<div class="resourceList" v-for="(item,index) in tableData" :key="index">
<div class="reTopInfo" :class="{'comCursorUrl':item.URL}" @click="OpenNewUrl(item.URL)">
<img v-if="!item.PicPath" src="../../assets/img/bg_c3@3x.png">
......
src/components/Supplier/HotelQueryList.vue
View file @ ad25c8fc
......@@ -76,10 +76,10 @@
</ul>
</div>
<div style="width: 100%;min-height:200px; overflow-x: auto;padding-bottom: 10px; " class="HotelQueryList"
<div style="width: 100%;min-height:200px; overflow-x: auto;padding:0 20px; " class="HotelQueryList"
v-loading="loading">
<div class="hotelProductManage2_tableBox" style="margin-bottom:20px;">
<span style="color:#000000;background-color: #ff3737;padding:2px 4px;border-radius:5px">红日</span>
<span style="color:#fff;background-color: #ff3737;padding:2px 4px;border-radius:5px">红日</span>
<span style="color:#000000;background-color: #ff99cc;padding:2px 4px;border-radius:5px">旺季</span>
<span style="color:#000000;background-color: #bcd6ee;padding:2px 4px;border-radius:5px">平季</span>
<span style="color:#000000;background-color: #DDDDDD;padding:2px 4px;border-radius:5px">淡季</span>
......@@ -581,6 +581,7 @@
.classHong {
background-color: rgb(255, 55, 55);
color:#fff;
}
.classWang {
......
src/components/Supplier/HotelSalesBoard.vue
View file @ ad25c8fc
......@@ -211,7 +211,7 @@
</style>
<template>
<div class="flexOne hotelSalesBoard">
<div class="flexOne hotelSalesBoard" style="padding:0 20px;">
<div class="query-box Plan_Query">
<ul>
<li>
......
src/components/Supplier/roomQuery.vue
View file @ ad25c8fc
......@@ -29,12 +29,13 @@
<el-input v-model='msg.TCNUM'></el-input>
</span>
</li>
<li><span><em>日期</em>
<el-date-picker v-model='msg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date"
:picker-options="pickerBeginDateBefore"></el-date-picker>
-
<el-date-picker v-model='msg.EndDate' class='w135' value-format="yyyy-MM-dd" type="date"
:picker-options="pickerBeginDateAfter"></el-date-picker>
<li>
<span>
<em>酒店</em>
<el-select v-model="msg.HotelId" :placeholder="$t('pub.pleaseSel')" filterable>
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option v-for="item in HotelList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
</span>
</li>
<li><span>
......@@ -86,11 +87,12 @@
</li>
<li>
<span>
<em>酒店</em>
<el-select v-model="msg.HotelId" :placeholder="$t('pub.pleaseSel')" filterable>
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option v-for="item in HotelList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
<em>日期</em>
<el-date-picker v-model='msg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date"
:picker-options="pickerBeginDateBefore"></el-date-picker>
-
<el-date-picker v-model='msg.EndDate' class='w135' value-format="yyyy-MM-dd" type="date"
:picker-options="pickerBeginDateAfter"></el-date-picker>
</span>
</li>
<li>
......@@ -100,7 +102,7 @@
</ul>
</div>
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle">
<div style="font-size:12px;padding:2px 4px 3px 4px; color:red">注意事项:每次导出数据最好不要超过一个月。</div>
<div style="font-size:12px;padding:2px 4px 3px 20px; color:red">注意事项:每次导出数据最好不要超过一个月。</div>
<table border="0" cellspacing="1" cellpadding="0" class="roomQuery_SupplierTable" v-loading='loading'>
<tr>
<th width="100">序号</th>
......@@ -119,7 +121,7 @@
<template v-for="(item,index) in dataList">
<template v-for="(subItem,subIndex) in item.subList">
<tr v-for="(childItem,childIndex) in subItem.hotelList" :class="{roomQuerySplitTrCss:index%2!=0}">
<td v-if="childIndex==0&&subIndex==0" :rowspan="subItem.hotelList.length*item.subList.length">
<td v-if="childIndex==0&&subIndex==0" :rowspan="item.RowSpan">
{{item.NewCombinationNum}}
</td>
<td v-if="childIndex==0" :rowspan="subItem.hotelList.length">
......@@ -142,9 +144,14 @@
</td>
<td>
<span style="color:red;">
<template v-if="childItem.SupplierId==UserInfo.SupplierId">
<template v-if="childItem.OPState==1">[OP选房-OK]</template>
<template v-else>{{childItem.DMCState==1?"[地接-OK]":(childItem.DMCState==0?"[未操作]":"[暂定]")}}
</template>
</template>
<template v-else>
[组团社自理]
</template>
</span>
</td>
<td v-if="childIndex==0" :rowspan="subItem.hotelList.length">
......@@ -194,6 +201,7 @@
PriceStatus: 0,
CombinationNum: ''
},
UserInfo:{},
//分公司类表
companyList: [],
//酒店列表
......@@ -334,6 +342,7 @@
if (res.data.resultCode == 1) {
this.total = res.data.data.count;
this.dataList = res.data.data.pageData;
console.log("dataList",this.dataList);
} else {
this.$message.error(res.data.message)
}
......@@ -449,6 +458,7 @@
},
},
mounted() {
this.UserInfo=this.getLocalStorageSupplier();
let myDate = new Date();
let nowDate =
myDate.getFullYear() +
......@@ -482,8 +492,14 @@
background: #eee !important;
}
.roomQuery_SupplierTable {
background: #ccc;
.roomQuery_SupplierTable{
width: 98%;
font-size: 12px;
color: #333;
margin: auto;
border-collapse: collapse;
background-color: #fff;
border: 1px solid #d1d1d1;
}
.roomQuery_SupplierTable tr th {
......@@ -493,17 +509,11 @@
color: #333;
}
.roomQuery_SupplierTable tr {
background: #fff;
text-align: center;
}
.roomQuery_SupplierTable tr td {
font-size: 12px;
line-height: 22px;
height: 22px;
;
}
border: 1px solid #d1d1d1;
text-align: center;
padding: 10px 0;
}
.roomQuery_SupplierTable .tdLeft {
text-align: left;
......
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