Skip to content

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

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

parents 510c0407 e7ade6b1
Hide whitespace changes
Inline Side-by-side
Showing with 303 additions and 165 deletions
src/components/Hotel/ChangeHotel.vue
View file @ b86c0861
......@@ -18,7 +18,6 @@
</tr>
<tr>
<th width="120">入住时间</th>
<th width="200">选择酒店</th>
<th width="120">机位数(Y/E/F)</th>
<th width="120">占床/不占床</th>
......@@ -38,9 +37,6 @@
<td v-if="childIndex==0&&subIndex==0" :rowspan="5*item.HotelOrderList.length" class="tdCenter">
{{item.UseTimeStr}}
</td>
<!-- <td v-if="childIndex==0" :rowspan="5" class="tdCenter">
<el-checkbox v-model='subItem.IsChecked'></el-checkbox>
</td> -->
<td v-if="childIndex==0" :rowspan="5" class="tdLeft">
<p class="link" style="word-break: normal;" @click="goUrlR('HotelManagement',HotelId.HotelId,'酒店管理')">
{{subItem.HotelName}}</p>
......@@ -67,7 +63,9 @@
{{subItem.HouseStatistics.HouseTypeList[childIndex].HouseGuestNum}}
</td>
<td v-if="childIndex==0" :rowspan="5" class="tdLeft">
{{subItem.NewHotelName}}
<template v-if="subItem.HotelName!=subItem.NewHotelName" ><span style="color:red;">{{subItem.NewHotelName}}</span></template>
<template v-else>{{subItem.NewHotelName}}</template>
</td>
<td class="tdCenter">
{{childItem.HouseTypeCount}}
......@@ -153,6 +151,7 @@
this.Loading = false;
if (res.data.resultCode == 1) {
this.DataList = res.data.data.HotelOrderListReport;
console.log("this.DataList",this.DataList)
} else {
this.Error(res.data.message);
}
......
src/components/Hotel/roomReservationsDetails.vue
View file @ b86c0861
......@@ -126,8 +126,9 @@
<table class="hotelTable">
<tr>
<td width="70" style="text-align:center;" colspan="2">
<span style="color:red">{{subItem.NewHotelName}}</span>
<el-popover placement="right" width="540" trigger="click" v-model="subItem.isShowPop">
<span style="color:green">{{subItem.NewHotelName}}</span>
<el-popover placement="right" width="540" trigger="click" v-model="subItem.isShowPop"
v-if="subItem.OPState!=1">
<comCheckHotel :ref="'comCheckHotel'+index+subIndex+''" v-on:childHotel="childHotelList"
:UseDate="item.UseTimeStr">
</comCheckHotel>
......@@ -137,6 +138,9 @@
酒店选择
</el-button>
</el-popover>
<template v-else>
<br /> <span class="Hotel_red">OP-指定，不能更换酒店.</span>
</template>
</td>
</tr>
<tr>
......@@ -193,7 +197,8 @@
<!-- 单价/每人 -->
<td>
<el-input @keyup.native="checkInteger(childItem,'UnitPrice')" class='w60 tcenter'
@input="calculationPrice(subItem)" v-model='childItem.UnitPrice' :disabled="IsEditHotel==0?true:false">
@input="calculationPrice(subItem)" v-model='childItem.UnitPrice'
:disabled="IsEditHotel==0?true:false">
</el-input>
</td>
<!-- 免减人数 -->
......@@ -208,10 +213,11 @@
</td>
<!--返佣-->
<td>
<p class="pHouseStyle link" >
<el-input class='w40' maxlength="2" @keyup.native="checkInteger(childItem,'RebateRatio')"
v-model='childItem.RebateRatio' @input="calculationPrice(subItem)" :disabled="IsEditHotel==0?true:false" ></el-input> %
<span style="display:none;" class="spanlink" @click="goUrl('HotelInfo',childItem,'酒店管理')">设置</span>
<p class="pHouseStyle link">
<el-input class='w40' maxlength="2" @keyup.native="checkInteger(childItem,'RebateRatio')"
v-model='childItem.RebateRatio' @input="calculationPrice(subItem)"
:disabled="IsEditHotel==0?true:false"></el-input> %
<span style="display:none;" class="spanlink" @click="goUrl('HotelInfo',childItem,'酒店管理')">设置</span>
</p>
</td>
<!-- 金额总计 -->
......@@ -224,7 +230,8 @@
<tr>
<td width="70" style="text-align:right;">订房状态：</td>
<td>
<el-select class='w135 sel' v-model='subItem.DMCState' :placeholder="$t('pub.pleaseSel')" :disabled="IsEditHotel==0?true:false">
<el-select class='w135 sel' v-model='subItem.DMCState' :placeholder="$t('pub.pleaseSel')"
:disabled="IsEditHotel==0?true:false">
<el-option label='请选择' :value='0'></el-option>
<el-option label='确定' :value='1'></el-option>
<el-option label='暂定' :value='2'></el-option>
......@@ -237,7 +244,8 @@
<tr>
<td width="70" style="text-align:right;">确认时间：</td>
<td>
<el-date-picker v-model='subItem.SureTime' class='w135' value-format="yyyy-MM-dd" type="date" :disabled="IsEditHotel==0?true:false"></el-date-picker>
<el-date-picker v-model='subItem.SureTime' class='w135' value-format="yyyy-MM-dd" type="date"
:disabled="IsEditHotel==0?true:false"></el-date-picker>
</td>
</tr>
<tr>
......@@ -246,7 +254,8 @@
<tr>
<td width="70" style="text-align:right;">税入/税别：</td>
<td>
<el-select class='w135 sel' v-model='subItem.TaxType' :placeholder="$t('pub.pleaseSel')" @change="calculationPrice(subItem)" :disabled="IsEditHotel==0?true:false">
<el-select class='w135 sel' v-model='subItem.TaxType' :placeholder="$t('pub.pleaseSel')"
@change="calculationPrice(subItem)" :disabled="IsEditHotel==0?true:false">
<el-option label='请选择' :value='0'></el-option>
<el-option label='税入' :value='1'></el-option>
<el-option label='税别' :value='2'></el-option>
......@@ -259,7 +268,8 @@
<tr>
<td width="70" style="text-align:right;color:red">付款方式：</td>
<td>
<el-select class='w135 sel' v-model='subItem.DMCPayType' :placeholder="$t('pub.pleaseSel')" :disabled="IsEditHotel==0?true:false">
<el-select class='w135 sel' v-model='subItem.DMCPayType' :placeholder="$t('pub.pleaseSel')"
:disabled="IsEditHotel==0?true:false">
<el-option label='请选择' :value='0'></el-option>
<el-option label='现付' :value='1'></el-option>
<el-option label='签单' :value='2'></el-option>
......@@ -275,7 +285,8 @@
<tr style="display:none;">
<td width="70" style="text-align:right;">报账付款方式：</td>
<td>
<el-select class='w135 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')" :disabled="IsEditHotel==0?true:false">
<el-select class='w135 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')"
:disabled="IsEditHotel==0?true:false">
<el-option label='请选择' :value='0'></el-option>
<el-option label='现付' :value='1' v-if="subItem.PayStyleExt==1"></el-option>
<el-option label='签单' :value='2' v-if="subItem.PayStyleExt==2"></el-option>
......@@ -292,7 +303,8 @@
<tr v-show="subItem.PayStyle==6">
<td width="70" style="text-align:right;">付款团号：</td>
<td>
<el-input class='w135' v-model='subItem.PayTypeTCNUM' :disabled="IsEditHotel==0?true:false"></el-input>
<el-input class='w135' v-model='subItem.PayTypeTCNUM' :disabled="IsEditHotel==0?true:false">
</el-input>
</td>
</tr>
<tr>
......@@ -340,30 +352,34 @@
</td>
<!-- 操作 -->
<td v-if="childIndex==0" :rowspan="5">
<!--v-if="subItem.OPState!=1"-->
<template v-if="subItem.OPState==1">
<span class="Hotel_red">OP选房确认</span>
<span class="Hotel_red">OP-指定</span>
</template>
<template v-if="IsOperation!=1">
<el-tooltip class="item" effect="dark" content="保存" placement="top-start">
<el-button icon="iconfont icon-baocun1" @click="SaveSingle(subItem)" type="primary"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="新增" placement="top-start">
<el-tooltip class="item" effect="dark" content="新增" v-if="subItem.OPState!=1" placement="top-start">
<el-button @click='AddHotel(item,subIndex)' icon="iconfont icon-tianjia" type="primary"></el-button>
</el-tooltip>
<el-tooltip v-if="item.HotelOrderList.length>1" class="item" effect="dark" content="删除"
placement="top-start">
<el-tooltip v-if="item.HotelOrderList.length>1 && subItem.OPState!=1" class="item" effect="dark"
content="删除" placement="top-start">
<el-button type="primary" icon="iconfont icon-shanchu" @click='DeleteHotel(item,subIndex)'>
</el-button>
</el-tooltip>
</template>
<el-popover width="200" trigger="click" popper-class="Bus_HotelPop">
<commonHotelLog :ref="'comHotelLog'+index+subIndex+''"> </commonHotelLog>
<div slot="reference" class="w80" style="cursor:pointer;text-decoration:underline;" @click="GetHotelLog(subItem,index,subIndex)">日志</div>
</el-popover>
<!--<template v-else>
<span class="Hotel_red">OP选房确认</span>
</template> -->
<el-popover width="200" trigger="click" popper-class="Bus_HotelPop">
<commonHotelLog :ref="'comHotelLog'+index+subIndex+''"> </commonHotelLog>
<div slot="reference" class="w80" style="cursor:pointer;text-decoration:underline;"
@click="GetHotelLog(subItem,index,subIndex)">日志</div>
</el-popover>
<br />
<el-popover width="700" trigger="click" popper-class="DMC_HotelPop">
<commonPHInfo :name='"dmccomPriceHotelInfo"+index+subIndex'
:ref='"dmccomPriceHotelInfo"+index+subIndex'></commonPHInfo>
<span slot="reference" class="price" style="cursor:pointer;text-decoration:underline;"
@click="GetHotelUsePriceList(subItem.HotelId,item.UseTimeStr,index,subIndex)">库存情况</span>
</el-popover>
</td>
</tr>
</template>
......@@ -376,6 +392,7 @@
import moment from 'moment'
import comCheckHotel from "../commonPage/comCheckHotel.vue";
import commonHotelLog from "../commonPage/commonHotelLog.vue";
import commonPHlInfo from "../commonPage/commonPriceHotelInfo.vue";
export default {
data() {
return {
......@@ -400,7 +417,7 @@
checkedsubIndex: '',
loading: false,
boxHeight: 0,
//供应商列表
SupplierList: [],
ckedHotelId: 0,
......@@ -409,7 +426,7 @@
findex: 0,
childIndex: 0,
//修改酒店价格，付款方式权限[0-不能修改，1-有权限修改]
IsEditHotel:0,
IsEditHotel: 0,
//0-可以操作，1-已制单，不能操作
IsOperation: 1,
}
......@@ -417,12 +434,18 @@
components: {
comCheckHotel,
commonHotelLog,
commonPHInfo: commonPHlInfo
},
methods: {
//调用子组件获取日志方法
GetHotelLog(subItem,index,hotelSubIndex) {
//调用子组件方法
GetHotelUsePriceList(HotelId, UseDay, index, hotelSubIndex) {
let str = `dmccomPriceHotelInfo${index}${hotelSubIndex}`;
this.$refs[str][0].getHotelPriceList(HotelId, UseDay);
},
//调用子组件获取日志方法
GetHotelLog(subItem, index, hotelSubIndex) {
let str = `comHotelLog${index}${hotelSubIndex}`
this.$refs[str][0].getHotelLogsList(subItem.TCID,subItem.HotelId,subItem.CheckInDateStr);
this.$refs[str][0].getHotelLogsList(subItem.TCID, subItem.HotelId, subItem.CheckInDateStr);
},
childHotelList(ckedObj) {
this.list.forEach(x => {
......@@ -436,9 +459,9 @@
this.list[this.findex].HotelOrderList[this.childIndex].NewHotelId = ckedObj.ID;
this.list[this.findex].HotelOrderList[this.childIndex].PayStyle = ckedObj.PayStyle;
this.list[this.findex].HotelOrderList[this.childIndex].PayStyleExt = ckedObj.PayStyle;
this.list[this.findex].HotelOrderList[this.childIndex].OrderDetailsList.forEach(subItem=>{
subItem.UnitPrice=ckedObj.CostPrice;
subItem.RebateRatio=ckedObj.RebateRatio;
this.list[this.findex].HotelOrderList[this.childIndex].OrderDetailsList.forEach(subItem => {
subItem.UnitPrice = ckedObj.CostPrice;
subItem.RebateRatio = ckedObj.RebateRatio;
});
this.calculationPrice(this.list[this.findex].HotelOrderList[this.childIndex]);
},
......@@ -571,7 +594,7 @@
}, res => {
if (res.data.resultCode == 1) {
this.IsOperation = res.data.data.IsOperation;
this.IsEditHotel=res.data.data.IsEditHotel;
this.IsEditHotel = res.data.data.IsEditHotel;
let list = res.data.data.HotelOrderListReport;
this.CreateBy = res.data.data.CreateBy;
this.CreateByPhoto = res.data.data.CreateByPhoto;
......@@ -608,15 +631,13 @@
calculationPrice(obj) {
let totalPrice = 0;
obj.OrderDetailsList.forEach(item => {
//税别
if(obj.TaxType==2)
{
totalPrice += item.UnitPrice * (item.BookNum - item.HotelDiscount) * (1+0.08- item.RebateRatio / 100);
}
else
{
totalPrice += item.UnitPrice * (item.BookNum - item.HotelDiscount) * (1 - item.RebateRatio / 100);
}
//税别
if (obj.TaxType == 2) {
totalPrice += item.UnitPrice * (item.BookNum - item.HotelDiscount) * (1 + 0.08 - item.RebateRatio /
100);
} else {
totalPrice += item.UnitPrice * (item.BookNum - item.HotelDiscount) * (1 - item.RebateRatio / 100);
}
})
obj.TotalPrice = totalPrice.toFixed(2);
this.$forceUpdate();
......@@ -685,9 +706,8 @@
if (y.BookNum == "") {
y.BookNum = 0;
}
if(y.RebateRatio=="")
{
y.RebateRatio=0;
if (y.RebateRatio == "") {
y.RebateRatio = 0;
}
})
});
......@@ -728,9 +748,8 @@
if (y.BookNum == "") {
y.BookNum = 0;
}
if(y.RebateRatio=="")
{
y.RebateRatio=0;
if (y.RebateRatio == "") {
y.RebateRatio = 0;
}
})
});
......@@ -854,6 +873,9 @@
color: red;
}
.roomReservationsDetailsTalbe .hotelTable {
border: none;
}
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ b86c0861
......@@ -1105,7 +1105,8 @@
</el-select>
</el-form-item>
<el-form-item label="参团类型" prop="GroupType">
<el-select v-model='addMsg.GroupType' filterable :placeholder="$t('pub.pleaseSel')" @change="gettypechange(addMsg.GroupType)">
<el-select v-model='addMsg.GroupType' filterable :placeholder="$t('pub.pleaseSel')"
@change="gettypechange(addMsg.GroupType)">
<el-option v-for="item in ctlxList" :label='item.Name' :value='item.Id' :key='item.Id'
v-if="item.Id!=5">
</el-option>
......@@ -1184,7 +1185,7 @@
<template>
<el-form-item label="成交单价" prop="Unit_Price" v-if="HightUnitPrice === '2'">
<el-select v-model='addMsg.Unit_Price' filterable :placeholder="$t('pub.pleaseSel')"
@change="getTotalPrice()">
@change="getTotalPrice()">
<el-option v-for="item in Unit_PriceList" :label='item.LessMoney' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
......@@ -1193,7 +1194,7 @@
<el-input v-model='addMsg.Unit_Price' @change="getTotalPrice(3)"></el-input>
</el-form-item>
</template>
<el-form-item label="高于本团单价" v-show="addMsg.GroupType != 4" >
<el-form-item label="高于本团单价" v-show="addMsg.GroupType != 4">
<el-switch v-model="HightUnitPrice" active-value="1" inactive-value="2"></el-switch>
</el-form-item>
......@@ -1217,39 +1218,40 @@
<el-col :span="4">
<el-form-item label="成人人数" prop="ManNum" v-show="addMsg.GroupType !== '4'">
<el-input v-model='addMsg.ManNum' @keyup.native="checkInteger(addMsg,'ManNum')"
@input='getNumber();getHouseNo();getTotalPrice()'></el-input>
@input='getNumber();getHouseNo();getTotalPrice()'></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<p v-if='IsChildrenTour==2' style="color: #E95252; font-size: 12px; line-height: 40px; text-align: center;">
本团不支持儿童出游!</p>
<el-form-item v-if='IsChildrenTour==1' label="儿童不占床" prop="ChirdNoNeedBedNum" v-show="addMsg.GroupType !== '4'">
<el-form-item v-if='IsChildrenTour==1' label="儿童不占床" prop="ChirdNoNeedBedNum"
v-show="addMsg.GroupType !== '4'">
<el-input v-model='addMsg.ChirdNoNeedBedNum' @keyup.native="checkInteger(addMsg,'ChirdNoNeedBedNum')"
@input='getNumber();getHouseNo();getTotalPrice()'></el-input>
@input='getNumber();getHouseNo();getTotalPrice()'></el-input>
</el-form-item>
</el-col>
<el-col :span="4" v-if='IsChildrenTour==1'>
<el-form-item label="儿童占床" prop="ChirdNeedBedNum" v-show="addMsg.GroupType !== '4'">
<el-input v-model='addMsg.ChirdNeedBedNum' @keyup.native="checkInteger(addMsg,'ChirdNeedBedNum')"
@input='getHouseNo();getTotalPrice()'></el-input>
@input='getHouseNo();getTotalPrice()'></el-input>
</el-form-item>
</el-col>
<el-col :span="4" v-if='IsChildrenTour==1'>
<el-form-item label="婴儿人数" prop="BabyNum" v-show="addMsg.GroupType !== '4'">
<el-input v-model='addMsg.BabyNum' @keyup.native="checkInteger(addMsg,'BabyNum')"
@input='getNumber();getTotalPrice()'></el-input>
@input='getNumber();getTotalPrice()'></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="老人人数" prop="OldPeopleNum" v-show="addMsg.GroupType !== '4'">
<el-input v-model='addMsg.OldPeopleNum' @keyup.native="checkInteger(addMsg,'OldPeopleNum')"
@input='getNumber();getHouseNo();getTotalPrice()'></el-input>
@input='getNumber();getHouseNo();getTotalPrice()'></el-input>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item label="单地接数量" prop="AirticketNum" v-show="addMsg.GroupType !== '1'">
<el-input v-model='addMsg.AirticketNum' @keyup.native="checkInteger(addMsg,'AirticketNum')"
@input='getNumber();getTotalPrice();getHouseNo()'></el-input>
@input='getNumber();getTotalPrice();getHouseNo()'></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -1496,12 +1498,15 @@
@click="goTeamBalance(ConfigData.Config.TCID,ConfigData.Config.OutBranchId)" value="团报" />
<input type="button" class="normalBtn" @click="getOrderInfo()"
:value="'出团通知书('+(SetNoticeMsg.OutNotice==1?'OK':'暂定')+')'" />
<input type="button" @click="CancelLeader" v-if="ConfigData.Leader!=null&&ConfigData.Leader.LeaderId>0"
class="normalBtn" value="重选领队" />
<input type="button" class="normalBtn" v-else
@click="showSetLeader=true,isShowLayerRemarks = false,isShowLayer = false" value="设置领队" />
<input type="button" class="normalBtn" @click="goUrl('TravelPassengerList',msg.TCID,'旅客名单')" value="旅客名单" />
:value="'出团通知书('+(SetNoticeMsg.OutNotice==1?'OK':'暂定')+')'" v-if="isShow===true" />
<template v-if="isShow===true">
<input type="button" @click="CancelLeader" v-if="ConfigData.Leader!=null&&ConfigData.Leader.LeaderId>0"
class="normalBtn" value="重选领队" />
<input type="button" class="normalBtn" v-else
@click="showSetLeader=true,isShowLayerRemarks = false,isShowLayer = false" value="设置领队" />
<input type="button" class="normalBtn" @click="goUrl('TravelPassengerList',msg.TCID,'旅客名单')" value="旅客名单" />
</template>
</div>
</div>
......@@ -1562,10 +1567,10 @@
slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
<span v-if='item.GuestNumStatus==3' style="color:#666; " class="personNo nowrap"
slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
<br/>
<span v-if="item.RefuseVisaNum>0" style="color:red">
(拒签 {{item.RefuseVisaNum}}人)
</span>
<br />
<span v-if="item.RefuseVisaNum>0" style="color:red">
(拒签 {{item.RefuseVisaNum}}人)
</span>
</td>
<td>{{item.TC_Price}}</td>
<td>{{item.Unit_Price}}</td>
......@@ -1644,7 +1649,7 @@
<td>
</td>
<td class="RL-BTNlist" rowspan="2">
<el-button-group>
<el-button-group v-if="isShow===true">
<el-tooltip class="item" effect="dark" content="修改备注" placement="top-start">
<el-button type="primary" style='background:green; border-color:green'
icon="iconfont icon-bianji-smal" @click='getRemarks(item)'></el-button>
......@@ -1701,9 +1706,9 @@
<span style="color:blue !important" v-for="(childItem) in item.GuestList"
@click="goUrl('TravelPassengerList',msg.TCID,childItem.OrderId,'旅客名单')">{{childItem.userName}}</span>
</p>
<!-- <p class="RL-redType RL-remarkCon" v-else>-->
<!-- <span>暂无名单</span>-->
<!-- </p>-->
<!-- <p class="RL-redType RL-remarkCon" v-else>-->
<!-- <span>暂无名单</span>-->
<!-- </p>-->
<span>房间信息：{{item.OrderGuestHouseStr}}</span>
<span v-if="item.TipMoney" style="color:red">（小费：{{item.TipMoney}}）</span>
</td>
......@@ -1753,7 +1758,8 @@
</div>
<p v-if="childItem.IsChargeLossOrders==1" style="color:red">损</p>
<div class="fbold over_ellipsis" style="width: 120px;cursor:pointer;" :title="childItem.OrderId">
<span style="font-weight: 100;" v-if="childItem.scoreNum >= 0" @click='goInvetig("investigationList", childItem.tcid, childItem.orderId)'>(评分{{childItem.scoreNum}})</span>{{childItem.OrderId}}
<span style="font-weight: 100;" v-if="childItem.scoreNum >= 0"
@click='goInvetig("investigationList", childItem.tcid, childItem.orderId)'>(评分{{childItem.scoreNum}})</span>{{childItem.OrderId}}
<el-tooltip class="item" effect="dark" content="通过小程序确认单报名" placement="top"
v-show="childItem.OrderForm==4"> <i class="iconfont icon-xiaochengxu"
style="font-size:22px;color:red;"></i></el-tooltip>
......@@ -1810,7 +1816,7 @@
slot="reference">{{childItem.GuestNum}}/{{childItem.YSeatNum>0? childItem.YSeatNum+'Y ':''}}{{childItem.ESeatNum>0? childItem.ESeatNum+'E ':''}}{{childItem.FSeatNum>0? childItem.FSeatNum+'F ':''}}</span>
<span v-if='childItem.GuestNumStatus==3' style="color:#666; " class="personNo nowrap"
slot="reference">{{childItem.GuestNum}}/{{childItem.YSeatNum>0? childItem.YSeatNum+'Y ':''}}{{childItem.ESeatNum>0? childItem.ESeatNum+'E ':''}}{{childItem.FSeatNum>0? childItem.FSeatNum+'F ':''}}</span>
<br/>
<br />
<span v-if="childItem.RefuseVisaNum>0" style="color:red">
(拒签 {{childItem.RefuseVisaNum}}人)
</span>
......@@ -1901,7 +1907,7 @@
</td>
<td class="RL-BTNlist" rowspan="2">
<el-button-group>
<el-button-group v-if="isShow===true">
<el-tooltip class="item" effect="dark" content="修改" placement="top-start">
<el-button type="primary" style='background:#00C6FF; border-color:#00C6FF'
icon="iconfont icon-bianji-smal" @click='getDetail(childItem)'></el-button>
......@@ -1957,7 +1963,8 @@
@click='deleteItem(childItem)'>
删除
</div>
<div v-if="childItem.ScoreNum >= 0" @click='goInvetig("investigationList", childItem.tcid, childItem.OrderId)'>查看旅客调查</div>
<div v-if="childItem.ScoreNum >= 0"
@click='goInvetig("investigationList", childItem.tcid, childItem.OrderId)'>查看旅客调查</div>
</div>
<el-button slot="reference" type="primary"
style='background:#297BEF; border-color:#297BEF;border-top-left-radius: 0;border-bottom-left-radius: 0;'
......@@ -1974,9 +1981,9 @@
<span style="color:blue !important" v-for="(fourthItem) in childItem.GuestList"
@click="goUrl('TravelPassengerList',msg.TCID,fourthItem.OrderId,'旅客名单')">{{fourthItem.userName}}</span>
</span>
<!-- <span class="RL-redType RL-remarkCon" v-else>-->
<!-- <span>暂无名单</span>-->
<!-- </span>-->
<!-- <span class="RL-redType RL-remarkCon" v-else>-->
<!-- <span>暂无名单</span>-->
<!-- </span>-->
<span style="display: block">房间信息：{{childItem.OrderGuestHouseStr}}</span>
<span v-if="childItem.TipMoney" style="color:red">（小费：{{childItem.TipMoney}}）</span>
</td>
......@@ -2003,6 +2010,7 @@
<span class="RL-redType RL-remarkCon"
style="width:80%;display:inline-block;">{{childItem.OP_Remarks ? childItem.OP_Remarks : '无'}}</span>
</div>
<template v-if="isShow==true">
<div style="float:right;" v-if="childItem.IsCanClear==0">
<input type="button" value="确认订单" class="rgsureBtn" @click="clearSeat(childItem,1)"
style="display:block;" />
......@@ -2015,6 +2023,7 @@
<div class="rgComTips">该订单<span style="color:green">已确认</span>不</div>
<div class="rgComTips">会被系统清位</div>
</div>
</template>
</td>
<td colspan="4" style="height: 40px;cursor: pointer;"
@click="goUrlSFD('SalesFinancialDetail', '销售财务单据', childItem)">
......@@ -2150,10 +2159,10 @@
slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
<span v-if='item.GuestNumStatus==3' style="color:#666;" class="personNo"
slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
<br/>
<span v-if="item.RefuseVisaNum>0" style="color:red">
(拒签 {{item.RefuseVisaNum}}人)
</span>
<br />
<span v-if="item.RefuseVisaNum>0" style="color:red">
(拒签 {{item.RefuseVisaNum}}人)
</span>
<!-- </el-popover> -->
</td>
<td>{{item.TC_Price}}</td>
......@@ -2293,9 +2302,9 @@
<span style="color:blue !important" v-for="(childItem) in item.GuestList"
@click="goUrl('TravelPassengerList',msg.TCID,childItem.OrderId,'旅客名单')">{{childItem.userName}}</span>
</span>
<!-- <span class="RL-redType RL-remarkCon" v-else>-->
<!-- <span>暂无名单</span>-->
<!-- </span>-->
<!-- <span class="RL-redType RL-remarkCon" v-else>-->
<!-- <span>暂无名单</span>-->
<!-- </span>-->
<span v-if="item.TipMoney" style="color:red">（小费：{{item.TipMoney}}）</span>
</td>
</tr>
......@@ -2401,17 +2410,17 @@
<th width=100>时间</th>
</tr>
<template v-if="LeaderHolidyList&&LeaderHolidyList.length>0">
<tr v-for="(leaderItem,leaderIndex) in LeaderHolidyList">
<td>
<tr v-for="(leaderItem,leaderIndex) in LeaderHolidyList">
<td>
{{LeaderInfoList.LeaderGuide.Surname}}{{LeaderInfoList.LeaderGuide.Name}}
</td>
</td>
<td>
请假
</td>
</td>
<td>
{{leaderItem.StartDateStr2}}到{{leaderItem.EndDateStr2}}
</td>
</tr>
</td>
</tr>
</template>
<template v-else>
<tr>
......@@ -2500,7 +2509,7 @@
<button class="hollowFixedBtn" @click="OrderLoading=false">{{$t('pub.cancelBtn')}}</button>
</div>
</el-dialog>
<!-- 联运返佣弹窗 -->
<!-- 联运返佣弹窗 -->
<el-dialog custom-class='w350' title="联运返佣" :visible.sync="FyongLoading" center>
<!--zhaunMsg.TCNUM-->
<el-form label-width="110px">
......@@ -2568,7 +2577,7 @@
</el-dialog>
<el-dialog custom-class='w600' title="修改订单收损金额" :visible.sync="shousunDialog" center>
<commonShouSun ref="childShou" :Type="1" @closeShouSun="closeShouSunDialog" @getList="getList"></commonShouSun>
<commonShouSun ref="childShou" :Type="1" @closeShouSun="closeShouSunDialog" @getList="getList"></commonShouSun>
</el-dialog>
......@@ -2688,13 +2697,14 @@
export default {
data() {
return {
IsHaveAuth: 0, //是否有权限
// 修改应收总额
Ysze: false,
addMsg_form: {},
IsUpdateOrderMoney: false,
outerVisible: false,
//收损金额
shousunDialog:false,
shousunDialog: false,
//弹窗
OrderLoading: false,
......@@ -3090,7 +3100,7 @@
},
SuperiorPeople: [],
IsBackStatus: 1,
Unit_Price:0
Unit_Price: 0
};
},
components: {
......@@ -3099,13 +3109,13 @@
commonShouSun: commonShouSun
},
methods: {
closeShouSunDialog(){
this.shousunDialog=false;
closeShouSunDialog() {
this.shousunDialog = false;
},
//点击设置收损
SetShouSunClick(OrderId){
this.shousunDialog=true;
this.$nextTick(()=>{
SetShouSunClick(OrderId) {
this.shousunDialog = true;
this.$nextTick(() => {
this.$refs.childShou.getShouSunList(OrderId);
})
},
......@@ -3114,7 +3124,7 @@
OrderId: this.lianyunFYId,
IsBackStatus: this.IsBackStatus
}
this.apipost('sellorder_post_SetOrderUnionBackMoney', msg, res=>{
this.apipost('sellorder_post_SetOrderUnionBackMoney', msg, res => {
if (res.data.resultCode === 1) {
this.$message.success(res.data.message)
this.getList()
......@@ -3217,10 +3227,10 @@
this.IsBirdDiscount = x.IsBirdDiscount;
this.OpSetLossPeople = x.OpSetLossPeople;
this.OpSetLossMoney = x.OpSetLossMoney;
if(this.addMsg.GroupType == 4){
if (this.addMsg.GroupType == 4) {
this.HightUnitPrice = '1'
this.Unit_Price = x.Unit_Price
}else {
} else {
this.HightUnitPrice = '2'
this.Unit_Price = this.addObj.SingleDMCPrice
}
......@@ -3836,9 +3846,9 @@
Number(this.addMsg.OldPeopleNum)) *
(Number(this.stratPrice) + Number(this.returnPrice));
let dandijie
if(this.addMsg.GroupType == 4){
if (this.addMsg.GroupType == 4) {
dandijie = this.addMsg.Unit_Price * Number(this.addMsg.AirticketNum);
}else {
} else {
dandijie = this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum);
}
this.addMsg.PreferPrice =
......@@ -3896,9 +3906,9 @@
Number(this.addMsg.OldPeopleNum)) *
(Number(this.stratPrice) + Number(this.returnPrice));
let dandijie
if(this.addMsg.GroupType == 4){
if (this.addMsg.GroupType == 4) {
dandijie = this.addMsg.Unit_Price * Number(this.addMsg.AirticketNum);
}else {
} else {
dandijie = this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum);
}
this.addMsg.PreferPrice =
......@@ -4578,7 +4588,7 @@
"leader_Get_GetPriceLeaderInfo", msg,
res => {
if (res.data.resultCode == 1) {
this.LeaderHolidyList=res.data.data.holidyList;
this.LeaderHolidyList = res.data.data.holidyList;
this.LeaderInfoList = res.data.data;
this.beforeInfo.DuringHoliday = "";
this.beforeInfo.date = "";
......@@ -4887,9 +4897,9 @@
// },
// err => {})
},
gettypechange(type){
gettypechange(type) {
//切换参团类型时 把值初始化
if(type == 4){
if (type == 4) {
this.addMsg.Unit_Price = this.Unit_Price; //成交单价
this.HightUnitPrice = '1';
this.addMsg.AirticketNum = 0;
......@@ -4905,7 +4915,7 @@
this.addMsg.VisaNum = 0;
this.addMsg.PredictRoomNum = 0;
this.addMsg.YSeatNum = 0;
}else {
} else {
this.HightUnitPrice = '2';
this.addMsg.AirticketNum = 0;
this.addMsg.ManNum = 0;
......@@ -4922,26 +4932,26 @@
this.addMsg.YSeatNum = 0;
};
if (this.addMsg.CustomerType == 1) {
if(this.addMsg.GroupType==4){
if (this.addMsg.GroupType == 4) {
this.addMsg.TC_Price = this.addObj.SingleDMCPrice;
}else {
} else {
this.addMsg.TC_Price = this.addObj.B2BMemberPrice;
this.addMsg.Unit_Price = this.addObj.B2BMemberPrice;
}
}
if (this.addMsg.CustomerType == 2) {
if(this.addMsg.GroupType==4){
if (this.addMsg.GroupType == 4) {
this.addMsg.TC_Price = this.addObj.SingleDMCPrice;
}else {
} else {
this.addMsg.TC_Price = this.addObj.B2BPrice
this.addMsg.Unit_Price = this.addObj.B2BPrice;
}
}
if (this.addMsg.CustomerType == 3) {
if(this.addMsg.GroupType==4){
if (this.addMsg.GroupType == 4) {
this.addMsg.TC_Price = this.addObj.SingleDMCPrice;
}else {
} else {
this.addMsg.TC_Price = this.addObj.B2CMemberPrice
this.addMsg.Unit_Price = this.addObj.B2CMemberPrice;
}
......@@ -4950,9 +4960,9 @@
}
if (this.addMsg.CustomerType == 4) {
if(this.addMsg.GroupType==4){
if (this.addMsg.GroupType == 4) {
this.addMsg.TC_Price = this.addObj.SingleDMCPrice;
}else {
} else {
this.addMsg.TC_Price = this.addObj.B2CPrice
this.addMsg.Unit_Price = this.addObj.B2CPrice;
......@@ -4964,7 +4974,8 @@
},
getTypePrice2() {
let maxPeopleNum = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNoNeedBedNum) + Number(this.addMsg.ChirdNeedBedNum) + Number(this.addMsg.OldPeopleNum) + Number(this.addMsg.AirticketNum) )
let maxPeopleNum = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNoNeedBedNum) + Number(this.addMsg
.ChirdNeedBedNum) + Number(this.addMsg.OldPeopleNum) + Number(this.addMsg.AirticketNum))
this.Unit_PriceList = [];
this.apipost('sellorder_post_GetLessPrice', {
"TCID": this.addMsg.TCID,
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ b86c0861
......@@ -490,7 +490,7 @@
<span class="TCL-greenType">{{item.ClearOrderHour}}小时</span>
</p>
<p v-if="item.LineID==14 && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
<el-popover width="850" trigger="click" popper-class="TC_HotelPop">
<el-popover width="980" trigger="click" popper-class="TC_HotelPop">
<commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj"
:TCID="item.TCID"
:DMCNum="item.DMCNum" :TCNUM="item.TCNUM"
......
src/components/commonPage/commonHotelInfo.vue
View file @ b86c0861
......@@ -30,80 +30,89 @@
<td>
公司团号
</td>
<td :colspan="4" style="text-align:left;">
<td :colspan="5" style="text-align:left;">
<span style="padding-left:5px;">{{TCNUM}} ({{TCID}})</span>
</td>
<td>
地接团号
</td>
<td :colspan="showHotelObj.ShowTaxType?5:3" style="text-align:left;">
<td :colspan="showHotelObj.ShowTaxType?6:4" style="text-align:left;">
<span style="padding-left:5px;">{{DMCNum}}</span>
</td>
</tr>
<tr>
<th width="120">日期</th>
<th style="width:150px;">酒店</th>
<th style="width:150px;">更换酒店</th>
<th style="width:100px;">状态</th>
<th style="width:150px;" v-if="showHotelObj.showPrice">使用数量/价格</th>
<th style="width:100px;" v-if="showHotelObj.showPay">付款方式</th>
<th style="width:100px;" v-if="showHotelObj.ShowTaxType">税入/税别</th>
<th style="width:120px;" v-if="showHotelObj.ShowRebateRatio">返佣比例</th>
<th style="width:130px" v-if="showHotelObj.showZhan">占房时间</th>
<th style="width:100px" v-if="showHotelObj.showZhan">确认时间</th>
<th style="width:80px;" v-if="showHotelObj.showPrice">
<th width="150">酒店</th>
<th width="150">更换酒店</th>
<th width="120">酒店状态</th>
<th width="120">OP状态</th>
<th width="120">地接状态</th>
<th width="110" v-if="showHotelObj.showPrice">数量<br />价格</th>
<th width="120" v-if="showHotelObj.showPay">付款方式<br/>返佣比例</th>
<th width="130" v-if="showHotelObj.showZhan">占房时间</th>
<th width="100" v-if="showHotelObj.showZhan">确认时间</th>
<th width="70" v-if="showHotelObj.showPrice">
日志
</th>
</tr>
<template v-for="(hotelItem,index) in HotelObj">
<tr v-for="(hotelSubItem,hotelSubIndex) in hotelItem.SubList">
<td width="120" v-if="hotelSubIndex==0" :rowspan="hotelItem.SubList.length">
<td width="120" v-if="hotelSubIndex==0" :rowspan="hotelItem.SubList.length" style="white-space:nowrap; ">
{{hotelItem.UseDay}}
</td>
<td style="text-align:left;padding-left:3px;">
{{hotelSubItem.HotelName}}
<template v-if="hotelSubItem.HotelName!=hotelSubItem.NewHotelName && hotelSubItem.NewHotelName!=''">
<span style="text-decoration:line-through"> {{hotelSubItem.HotelName}}</span>
</template>
<template v-else>
{{hotelSubItem.HotelName}}
</template>
</td>
<td style="text-align:left;padding-left:3px;color:red">
{{hotelSubItem.HotelName!=hotelSubItem.NewHotelName?""+hotelSubItem.NewHotelName:""}}
</td>
<td style="text-align:left;padding-left:3px;">
<td>
<template v-if="hotelSubItem.OPState==1||hotelSubItem.DMCState==1">
<a style="color:green">保证入住</a>
</template>
</td>
<td>
<span v-if="hotelSubItem.HotelName!='温馨的家'">
<template v-if="hotelSubItem.OPState==1">
<a style="color:green">OP-指定</a>
</template>
<template v-else-if="hotelSubItem.OPState==2 && hotelSubItem.DMCState==0 ">
<template v-else-if="hotelSubItem.OPState==2">
<a style="color:red">OP-暂定</a>
</template>
<template v-else>
<template v-if="hotelSubItem.DMCState==1">
<a style="color:green">地接-OK</a>
</template>
<template v-else-if="hotelSubItem.DMCState==2">
<a style="color:red">地接-暂定</a>
</template>
<template v-else-if="hotelSubItem.DMCState==0">
<a style="color:red">地接-未操作</a>
</template>
</span>
</td>
<td>
<span v-if="hotelSubItem.HotelName!='温馨的家'">
<template v-if="hotelSubItem.DMCState==1">
<a style="color:green">地接-OK</a>
</template>
<template v-else-if="hotelSubItem.DMCState==2">
<a style="color:red">地接-暂定</a>
</template>
<template v-else-if="hotelSubItem.DMCState==0">
<a style="color:red">地接-未操作</a>
</template>
</span>
</td>
<td v-if="showHotelObj.showPrice">
<a v-if="(hotelSubItem.OPState==1|| hotelSubItem.OPState==2 || hotelSubItem.DMCState==1 )">
{{hotelSubItem.UseCount>0? hotelSubItem.UseCount+" 间" :""}}
<br />
{{hotelSubItem.CostPriceNew>0?" 价格:"+hotelSubItem.CostPriceNew:(hotelSubItem.CostPrice!=0?" 价格:"+hotelSubItem.CostPrice:"")}}
</a>
</td>
<td v-if="showHotelObj.showPay">
{{hotelSubItem.PayTypeStr}}
</td>
<td v-if="showHotelObj.ShowTaxType">
<template v-if="hotelSubItem.TaxType==1">税入</template>
{{hotelSubItem.PayTypeStr}} <template v-if="hotelSubItem.TaxType==1">税入</template>
<template v-if="hotelSubItem.TaxType==2">税别</template>
{{hotelSubItem.RebateRatio}}
</td>
<td v-if="showHotelObj.ShowRebateRatio">
{{hotelSubItem.RebateRatio}}
</td>
<td v-if="showHotelObj.showZhan">
<td v-if="showHotelObj.showZhan" style="white-space:nowrap; ">
<template v-if="hotelSubItem.OPState==1||(hotelSubItem.OPState==2 && hotelSubItem.DMCState==0)">
{{hotelSubItem.CreateDateStr}}
</template>
......
src/components/commonPage/commonPriceHotelInfo.vue 0 → 100644
View file @ b86c0861
<style>
</style>
<template>
<div class="commonPriceHotelInfo">
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="singeRowTable" v-loading="loading">
<tr>
<th width="100">日期</th>
<th width="135">占房时间</th>
<th width="120">团期</th>
<th width="80">总库存</th>
<th width="80">使用库存</th>
<th width="80">状态</th>
</tr>
<template v-if="HotelPriceList.length>0">
<tr v-for="(item,index) in HotelPriceList">
<td>
{{item.UseTimeStr}}
</td>
<td>
{{item.CreateTimeStr}}
</td>
<td>
{{item.TCNUM}}
</td>
<td>
{{item.Inventory}}
</td>
<td>
{{item.LastUseNum}}
</td>
<td>
<template v-if="item.Status==1"><span style="color:green;">OK</span></template>
<template v-else><span style="color:red;">暂定</span></template>
</td>
</tr>
</template>
<template v-else>
<tr>
<td colspan="6">
<span style="color:red;"> 暂无库存使用记录.</span>
</td>
</tr>
</template>
</table>
</div>
</template>
<script>
export default {
data() {
return {
loading: false,
HotelPriceList: [],
queryMsg: {
HotelId: 0,
UseTime: "",
}
};
},
methods: {
//获取日志
getHotelPriceList(HotelId, timeStr) {
this.HotelPriceList = [];
this.loading = true;
if (HotelId) {
this.queryMsg.HotelId = HotelId;
}
if (timeStr) {
this.queryMsg.UseTime = timeStr;
}
this.apipost('travel_get_GetHotelUsePriceListService', this.queryMsg, res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.HotelPriceList = res.data.data;
}
}, err => {})
},
},
mounted() {}
};
</script>
src/components/dmc/manager/dmcTotalTable.vue
View file @ b86c0861
......@@ -305,7 +305,7 @@
<span class="colorE95252" v-else>{{item.HotelResult=='-1'?"x":"O"}}</span>
</div>
<p v-if="item.LineId==14 && item.PriceHotelResult && item.PriceHotelResult.length>0">
<el-popover width="920" trigger="click" popper-class="DMC_HotelPop">
<el-popover width="1100" trigger="click" popper-class="DMC_HotelPop">
<commonHotelInfo :HotelObj="item.PriceHotelResult" :showHotelObj="showHotelObj" :TCID="item.TCID"
:DMCNum="item.DMCNum" :TCNUM="item.TCNUMS"
@SetShouPeiShu="SetShouPeiShu(item.TCID,item.ShouPeiStatus)"></commonHotelInfo>
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ b86c0861
......@@ -810,7 +810,7 @@
<th width="240">酒店情况</th>
<th width="100">占房时间</th>
<th width="100">更换酒店</th>
<th width="60">操作</th>
<th width="120">操作</th>
</tr>
<template v-for="(subItem,subIndex) in priceData.PriceHotelList">
<tr v-for="(childItem,childIndex) in subItem.SubList">
......@@ -859,6 +859,12 @@
<span v-if="childItem.UseCount>0 && subItem.SubList.length==1">
<span style="color:red;white-space:nowrap;cursor:pointer;" @click="DeleteStock(subItem)">删除</span>
</span>
<span >
<el-popover width="700" trigger="click" popper-class="DMC_HotelPop">
<commonPHInfo :name='"comPriceHotelInfo"+subIndex+childIndex' :ref='"comPriceHotelInfo"+subIndex+childIndex' ></commonPHInfo>
<span slot="reference" class="price" style="cursor:pointer;text-decoration:underline;" @click="GetHotelUsePriceList(childItem.HotelId,subItem.UseDay,subIndex,childIndex)">库存情况</span>
</el-popover>
</span>
</td>
</tr>
</template>
......@@ -913,6 +919,7 @@
</div>
</template>
<script>
import commonPHlInfo from "../../commonPage/commonPriceHotelInfo.vue";
import TravelPriceFlightList from "../TravelGroupControl/TravelPriceFlightList.vue";
export default {
props: ["priceList", "priceIsDirect", "OfferList", "PostConfig", "modifyTcid", "TeamType"],
......@@ -1008,6 +1015,12 @@
};
},
methods: {
//调用子组件方法
GetHotelUsePriceList(HotelId,UseDay,index,hotelSubIndex)
{
let str = `comPriceHotelInfo${index}${hotelSubIndex}`;
this.$refs[str][0].getHotelPriceList(HotelId, UseDay);
},
//点击折叠
fold() {
if (this.isFold == "") {
......@@ -1736,7 +1749,8 @@
}
},
components: {
TravelPriceFlightList: TravelPriceFlightList
TravelPriceFlightList: TravelPriceFlightList,
commonPHInfo:commonPHlInfo
}
};
......
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