Skip to content

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

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

parents a5ab633b 182e3370
Show whitespace changes
Inline Side-by-side
Showing with 133 additions and 119 deletions
src/components/Hotel/roomReservations.vue
View file @ aba74835
...@@ -2,16 +2,6 @@ ...@@ -2,16 +2,6 @@
<div> <div>
<div class="query-box" style="border-bottom: none;"> <div class="query-box" style="border-bottom: none;">
<ul> <ul>
<!-- <li>
<span>
<em>线路</em>
<el-select v-model="msg.LineId" filterable :placeholder="$t('pub.pleaseSel')" @change="getLinePlaceList()">
<el-option label="不限" :value='0'></el-option>
<el-option v-for="item in queryCommonData.LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'>
</el-option>
</el-select>
</span>
</li> -->
<li> <li>
<span> <span>
<em>{{$t('Operation.Op_Country')}}/{{$t('system.query_dest')}}</em> <em>{{$t('Operation.Op_Country')}}/{{$t('system.query_dest')}}</em>
...@@ -106,10 +96,10 @@ ...@@ -106,10 +96,10 @@
<th width="120">机位总数/(Y/E/F)</th> <th width="120">机位总数/(Y/E/F)</th>
<th width="120">占床/不占床</th> <th width="120">占床/不占床</th>
<th width="80">实际用房数</th> <th width="80">实际用房数</th>
<th>操作</th>
<th></th> <th></th>
<th></th> <th></th>
<th>备注</th> <th>备注</th>
<th>操作</th>
</tr> </tr>
<tr v-if="list.length==0"> <tr v-if="list.length==0">
<td colspan="10">暂无数据</td> <td colspan="10">暂无数据</td>
...@@ -188,6 +178,11 @@ ...@@ -188,6 +178,11 @@
{{item.CommonReport.HouseStatistics.RealityRoomNum}} {{item.CommonReport.HouseStatistics.RealityRoomNum}}
</div> </div>
</td> </td>
<td>
<div class="w80 link" style="margin:auto;">
<p @click="goUrl('roomReservationsDetails',item,outItem,'订房详情')">详情</p>
</div>
</td>
<td style="vertical-align: top;"> <td style="vertical-align: top;">
<div class="w260"> <div class="w260">
<p class="pDateStyle">时间</p> <p class="pDateStyle">时间</p>
...@@ -207,7 +202,11 @@ ...@@ -207,7 +202,11 @@
<p class="pDateStyle">{{childItem.CheckInDateStr}}</p> <p class="pDateStyle">{{childItem.CheckInDateStr}}</p>
<p @click="goUrlR('HotelManagement',childItem.HotelId,'酒店管理')" <p @click="goUrlR('HotelManagement',childItem.HotelId,'酒店管理')"
class="pDateStyle phoverStype ownScrollbarStyle" style="height: 50px!important; overflow:auto;"> class="pDateStyle phoverStype ownScrollbarStyle" style="height: 50px!important; overflow:auto;">
<span class="colorE95252">{{childItem.HotelOrderState==1?"[OK]":"[暂定]"}}</span>{{childItem.NewHotelName}} <span class="colorE95252">
<template v-if="childItem.OPState==1">[OP选房-OK]</template>
<template v-else>{{childItem.DMCState==1?"[地接-OK]":(childItem.DMCState==0?"[未操作]":"[暂定]")}}
</template>
</span>{{childItem.NewHotelName}}
</p> </p>
<p class="pDateStyle">{{item.CommonReport.HouseStatistics.RealityRoomNum}}</p> <p class="pDateStyle">{{item.CommonReport.HouseStatistics.RealityRoomNum}}</p>
<p class="pDateStyle"> <p class="pDateStyle">
...@@ -226,11 +225,7 @@ ...@@ -226,11 +225,7 @@
{{item.Remarks}} {{item.Remarks}}
</div> </div>
</td> </td>
<td>
<div class="w80 link" style="margin:auto;">
<p @click="goUrl('roomReservationsDetails',item,outItem,'订房详情')">详情</p>
</div>
</td>
</tr> </tr>
<tr> <tr>
<td :colspan="item.colNum" style="text-align: left!important;padding-left: 20px;"> <td :colspan="item.colNum" style="text-align: left!important;padding-left: 20px;">
......
src/components/Hotel/roomReservationsDetails.vue
View file @ aba74835
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
</td> </td>
<td v-if="childIndex==0" :rowspan="5"> <td v-if="childIndex==0" :rowspan="5">
<div class="w150"> <div class="w150">
<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')" :disabled="subItem.OPState==1"
@visible-change='getHotelList(subItem)' @change='sendValue(subItem)'> @visible-change='getHotelList(subItem)' @change='sendValue(subItem)'>
<el-option v-for='itemHotel in subItem.hotelList' :label='itemHotel.Name' :value='itemHotel.ID' <el-option v-for='itemHotel in subItem.hotelList' :label='itemHotel.Name' :value='itemHotel.ID'
:key='itemHotel.ID'> :key='itemHotel.ID'>
...@@ -181,6 +181,19 @@ ...@@ -181,6 +181,19 @@
<!-- 付款方式 --> <!-- 付款方式 -->
<td v-if="childIndex==0" :rowspan="5"> <td v-if="childIndex==0" :rowspan="5">
<table class="hotelTable"> <table class="hotelTable">
<tr>
<td width="70" style="text-align:right;">订房状态：</td>
<td>
<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>
</el-select>
</td>
</tr>
<tr>
<td colspan="2" style="height:5px;"></td>
</tr>
<tr> <tr>
<td width="70" style="text-align:right;">付款方式：</td> <td width="70" style="text-align:right;">付款方式：</td>
<td> <td>
...@@ -215,6 +228,7 @@ ...@@ -215,6 +228,7 @@
</td> </td>
<!-- 操作 --> <!-- 操作 -->
<td v-if="childIndex==0" :rowspan="5"> <td v-if="childIndex==0" :rowspan="5">
<template v-if="subItem.OPState!=1">
<el-tooltip class="item" effect="dark" content="保存" placement="top-start"> <el-tooltip class="item" effect="dark" content="保存" placement="top-start">
<el-button icon="iconfont icon-baocun1" @click="SaveSingle(subItem)" type="primary"></el-button> <el-button icon="iconfont icon-baocun1" @click="SaveSingle(subItem)" type="primary"></el-button>
</el-tooltip> </el-tooltip>
...@@ -226,6 +240,10 @@ ...@@ -226,6 +240,10 @@
<el-button type="primary" icon="iconfont icon-shanchu" @click='DeleteHotel(item,subIndex)'> <el-button type="primary" icon="iconfont icon-shanchu" @click='DeleteHotel(item,subIndex)'>
</el-button> </el-button>
</el-tooltip> </el-tooltip>
</template>
<template v-else>
<span class="Hotel_red">OP选房确认</span>
</template>
</td> </td>
</tr> </tr>
</template> </template>
...@@ -297,7 +315,7 @@ ...@@ -297,7 +315,7 @@
if (subItem.OrderID > 0) { if (subItem.OrderID > 0) {
that.apipost('dmcstatistics_post_DeleteHotelOrder', { that.apipost('dmcstatistics_post_DeleteHotelOrder', {
ID: subItem.OrderID, ID: subItem.OrderID,
TCID:subItem.TCID TCID: subItem.TCID
}, res => { }, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
that.Success(res.data.message); that.Success(res.data.message);
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ aba74835
...@@ -562,41 +562,41 @@ ...@@ -562,41 +562,41 @@
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="singeRowTable"> <table width="100%" border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
<tr> <tr>
<th width="100">日期</th> <th width="100">日期</th>
<th style="border-right:1px solid #E5E5E5">酒店情况</th> <th style="border-right:1px solid #E5E5E5;width:150px;">酒店</th>
<th style="border-right:1px solid #E5E5E5">占房时间</th> <th style="border-right:1px solid #E5E5E5;width:240px;">酒店情况</th>
<th style="border-right:1px solid #E5E5E5;width:100px">占房时间</th>
</tr> </tr>
</table> <template v-for="subItem in item.HotelOrderListReports">
<div> <tr v-for="(childItem,childIndex) in subItem.SubList">
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="singeRowTable"> <td width="100" v-if="childIndex==0" :rowspan="subItem.SubList.length">
<tr v-for="subItem in item.HotelOrderListReports">
<td width="100">
{{subItem.UseDay}} {{subItem.UseDay}}
</td> </td>
<td style="text-align:left;padding-left:20px;"> <td style="text-align:left;padding-left:3px;">
<template v-if="subItem.SubList"> {{childItem.HotelName}}
<div v-if="subItem.SubList.length==1 && subItem.SubList[0].UseCount>0 "> </td>
{{subItem.SubList[0].HotelName}} <td style="text-align:left;padding-left:3px;">
<a style="color:green">{{subItem.SubList[0].Status==1?"【OK】":"【暂定】"}}</a> <a style="color:green" v-if="childItem.HotelName!='温馨的家'">
【<a style="color:green"> 本团使用库存：{{subItem.SubList[0].UseCount}} 【<template v-if="childItem.OPState==1">
{{subItem.SubList[0].CostPrice!=0?"价格:"+subItem.SubList[0].CostPrice:""}}</a>】</div> OP-OK
<template v-else v-for="childItem in subItem.SubList"> </template>
<div>{{childItem.HotelName}} {{childItem.HotelName!="温馨的家"?"【暂定】":""}}</div> <template v-else-if="childItem.OPState==2&&childItem.DMCState==0">
OP-暂定
</template> </template>
<template v-else>
{{childItem.DMCState==1?"地接-OK":(childItem.DMCState==2?"地接-暂定":"地接-未操作")}}
</template> </template>
】
</a>
<a v-if="(childItem.OPState==1||(childItem.OPState==2 && childItem.DMCState==0))&& childItem.UseCount>0 " style="color:green">
【使用: {{childItem.UseCount}} 间 {{childItem.CostPrice!=0?"价格:"+childItem.CostPrice:""}} 】
</a>
</td> </td>
<td> <td>
<template v-if="subItem.SubList"> <template v-if="childItem.OPState==1||(childItem.OPState==2 && childItem.DMCState==0)"> {{childItem.CreateDateStr}}</template>
<div v-if="subItem.SubList.length==1 && subItem.SubList[0].UseCount>0 ">
{{subItem.SubList[0].CreateDateStr}}
</div>
<template v-else v-for="childItem in subItem.SubList">
<div></div>
</template>
</template>
</td> </td>
</tr> </tr>
</template>
</table> </table>
</div>
<span slot="reference" class="price">酒店信息</span> <span slot="reference" class="price">酒店信息</span>
</el-popover> </el-popover>
</p> </p>
...@@ -1478,8 +1478,8 @@ ...@@ -1478,8 +1478,8 @@
name: 'TeamBalancePayment', name: 'TeamBalancePayment',
query: { query: {
id: id, id: id,
OutBranchId:OutBranchId, OutBranchId: OutBranchId,
IsHaveAuth:true, IsHaveAuth: true,
blank: 'y', blank: 'y',
tab: '团队收支明细' tab: '团队收支明细'
} }
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ aba74835
...@@ -583,7 +583,7 @@ ...@@ -583,7 +583,7 @@
<template slot="prepend">同行清位时间</template> <template slot="prepend">同行清位时间</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item > <el-form-item>
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.SaleClearOrderHour" <el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.SaleClearOrderHour"
@keyup.native="checkInteger(priceData,'SaleClearOrderHour')" @keyup.native="checkInteger(priceData,'SaleClearOrderHour')"
@blur="checkInteger(priceData,'SaleClearOrderHour')"> @blur="checkInteger(priceData,'SaleClearOrderHour')">
...@@ -805,62 +805,63 @@ ...@@ -805,62 +805,63 @@
<el-dialog custom-class='Tp_hotelDialog' title="酒店使用情况" :visible.sync="outerVisible" center> <el-dialog custom-class='Tp_hotelDialog' title="酒店使用情况" :visible.sync="outerVisible" center>
<table class="TphotelTable" border="0" cellspacing='1' v-if="priceData.TCID>0"> <table class="TphotelTable" border="0" cellspacing='1' v-if="priceData.TCID>0">
<tr> <tr>
<th>日期</th> <th width="100">日期</th>
<th>酒店</th> <th width="150">酒店</th>
<th>占房时间</th> <th width="240">酒店情况</th>
<th>更换酒店</th> <th width="100">占房时间</th>
<th>操作</th> <th width="100">更换酒店</th>
<th width="60">操作</th>
</tr> </tr>
<tr v-if="priceData.PriceHotelList" v-for="item in priceData.PriceHotelList"> <template v-for="(subItem,subIndex) in priceData.PriceHotelList">
<td style="background-color:#E6E6E6;color:#333;" width="120">{{item.UseDay}}</td> <tr v-for="(childItem,childIndex) in subItem.SubList">
<td> <td style="background-color:#E6E6E6;color:#333;" v-if="childIndex==0"
<div class="tp_divList" v-for="(subItem,index) in item.SubList"> :rowspan="subItem.SubList.length">{{subItem.UseDay}}</td>
<div> <td style="text-align:left;padding-left:3px;">
{{index+1}}.{{subItem.HotelName}}&nbsp;&nbsp; {{childItem.HotelName}}
<span v-if="subItem.UseCount>0 && item.SubList.length==1">
<a style="color:green">{{subItem.Status==1?"【OK】":"【暂定】"}}</a>
【<span style="color:green">本团使用：{{subItem.UseCount}}
{{subItem.CostPrice!=0?"价格:"+subItem.CostPrice:""}}</span>】
</span>
【<span style="color:#E95252;" >剩余：{{subItem.RemainingInventory}}
</span>】
&nbsp;&nbsp;
<el-checkbox v-if="item.SubList.length>1" v-model="item.CheckList[index].CheckStatus"
@change="changeHotelStatus(item,index),changeHotelList()"></el-checkbox>
</div>
</div>
</td> </td>
<td> <td style="text-align:left;padding-left:3px;">
<div class="tp_divList" v-for="(subItem,index) in item.SubList"> <span v-if="childItem.UseCount>0 && subItem.SubList.length==1">
<div> <a style="color:green" v-if="childItem.HotelName!='温馨的家'">
<span v-if="subItem.UseCount>0 && item.SubList.length==1"> 【<template v-if="childItem.OPState==1">
<span style="color:green;white-space:nowrap;">{{subItem.CreateDateStr}}</span> OP-OK
</template>
<template v-else-if="childItem.OPState==2&&childItem.DMCState==0">
OP-暂定
</template>
<template v-else>
{{childItem.DMCState==1?"地接-OK":(childItem.DMCState==2?"地接-暂定":"地接-未操作")}}
</template>
】
</a>
【<span style="color:green">本团使用：{{childItem.UseCount}}
{{childItem.CostPrice!=0?"价格:"+childItem.CostPrice:""}}</span>】
</span>
<span style="color:#E95252;" v-if="childItem.HotelName!='温馨的家'"> 【剩余：{{childItem.RemainingInventory}}】
</span> </span>
</div>
</div>
</td> </td>
<td> <td>
<el-select class="w180" v-model="item.NewHotelId" @visible-change="getHotelList(item,$event)" <template v-if="childItem.OPState==1||(childItem.OPState==2 && childItem.DMCState==0)">
{{childItem.CreateDateStr}}</template>
</td>
<td v-if="childIndex==0" :rowspan="subItem.SubList.length">
<el-select class="w180" v-model="subItem.NewHotelId" @visible-change="getHotelList(subItem,$event)"
@change="changeHotelList()" filterable> @change="changeHotelList()" filterable>
<el-option :key="0" label="请选择" :value="0"></el-option> <el-option :key="0" label="请选择" :value="0"></el-option>
<el-option v-for="subItem in item.HotelList" :key="subItem.ID" :label="subItem.Name" :value="subItem.ID"> <el-option v-for="hotelItem in subItem.HotelList" :key="hotelItem.ID" :label="hotelItem.Name"
<span style="float: left">{{subItem.Name}}</span> :value="hotelItem.ID">
<span style="float: right; color:red; font-size: 13px">剩余:{{subItem.Inventory}} / <span style="float: left">{{hotelItem.Name}}</span>
价格:{{subItem.CostPrice}}</span> <span style="float: right; color:red; font-size: 13px">剩余:{{hotelItem.Inventory}} /
价格:{{hotelItem.CostPrice}}</span>
</el-option> </el-option>
</el-select> </el-select>
</td> </td>
<td> <td>
<div class="tp_divList" v-for="(subItem,index) in item.SubList"> <span v-if="childItem.UseCount>0 && subItem.SubList.length==1">
<div> <span style="color:red;white-space:nowrap;cursor:pointer;" @click="DeleteStock(subItem)">删除</span>
<span v-if="subItem.UseCount>0 && item.SubList.length==1">
<span style="color:red;white-space:nowrap;cursor:pointer;" @click="DeleteStock(item)">删除</span>
</span> </span>
</div>
</div>
</td> </td>
</tr> </tr>
</template>
</table> </table>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary" @click="saveHoteluseDetail()" <button class="normalBtn" type="primary" @click="saveHoteluseDetail()"
...@@ -1103,7 +1104,7 @@ ...@@ -1103,7 +1104,7 @@
//选中的酒店数组 //选中的酒店数组
ChooseHotelArray: [], ChooseHotelArray: [],
//销售清位时间 //销售清位时间
SaleClearOrderHour:0, SaleClearOrderHour: 0,
}; };
} }
this.returnPriceList.push(objItem); this.returnPriceList.push(objItem);
...@@ -1646,7 +1647,7 @@ ...@@ -1646,7 +1647,7 @@
that.apipost("hoteluse_post_DeleteHotelUse", delMsg, res => { that.apipost("hoteluse_post_DeleteHotelUse", delMsg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
that.Success("操作成功!"); that.Success("操作成功!");
item.SubList[0].UseCount=0; item.SubList[0].UseCount = 0;
} else { } else {
that.Error(res.data.message); that.Error(res.data.message);
} }
......
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