Skip to content

S
SuperMan
Commit 6d8c0be4 authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

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

parents 6baa05ef 4f3c088d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 217 additions and 249 deletions
src/components/Hotel/HotelInfo.vue
View file @ 6d8c0be4
......@@ -80,17 +80,17 @@
<el-row v-for="(list,index) in addMsg.DiscountList" :key="index">
<el-col :span="6" :gutter="35">
<el-form-item label="开始数量">
<el-input class='w80' type="text" v-model="list.StartNum"></el-input>
<el-input class='w80' type="text" v-model="list.StartNum" @keyup.native="checkInteger(list,'StartNum')" maxlength="2"></el-input>
</el-form-item>
</el-col>
<el-col :span="6" :gutter="35">
<el-form-item label="结束数量">
<el-input class='w80' type="text" v-model="list.EndNum"></el-input>
<el-input class='w80' type="text" v-model="list.EndNum" @keyup.native="checkInteger(list,'EndNum')" maxlength="2"></el-input>
</el-form-item>
</el-col>
<el-col :span="6" :gutter="35">
<el-form-item label="返还数量">
<el-input class='w80' type="text" v-model="list.DisCountNum"></el-input>
<el-input class='w80' type="text" v-model="list.DisCountNum" @keyup.native="checkInteger(list,'DisCountNum')" maxlength="2"></el-input>
</el-form-item>
</el-col>
<el-col :span="6" :gutter="35" v-if="index==0">
......@@ -100,36 +100,7 @@
<el-button icon="el-icon-minus" circle @click="deleteAir(index)"> </el-button>
</el-col>
</el-row>
<!-- <el-row :gutter="0">
<el-col :span="6">
<el-form-item label="开始数量" >
<el-input class='w80' type="text" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="结束数量" >
<el-input class='w80'type="text" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="返还数量">
<el-input class='w80' type="text" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
</el-col>
<el-col :span="6" style='padding-top: 5px;'>
</el-col>
</el-row> -->
</div>
<!--<div v-for="(item) in GetPolicy" :key="item.subCode">
<div class="common-lefttit">{{item.Content}}</div>
<span class="resource-net">
<el-input v-model="item.checked" maxlength="50" class="w300"></el-input>
</span>
</div>-->
</div>
<div class="resource-imginfo">
<div class="resourcerightTop">
......
src/components/Hotel/HotelProductManage2.vue
View file @ 6d8c0be4
......@@ -187,27 +187,27 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="单人间成本价" prop="SingleroomPrice">
<el-form-item label="单间成本价" prop="SingleroomPrice">
<el-input-number v-model="msg2.SingleroomPrice" :precision="2" :min="0"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="小孩不占床成本价" prop="ChildNotBedPrice">
<el-form-item label="不占床成本价" prop="ChildNotBedPrice">
<el-input-number v-model="msg2.ChildNotBedPrice" :precision="2" :min="0"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="加床成本价" prop="AddBedPrice">
<el-form-item label="三人间成本价" prop="AddBedPrice">
<el-input-number v-model="msg2.AddBedPrice" :precision="2" :min="0"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="6" style="display:none;">
<el-form-item label="司机房成本价" prop="DriverRoomPrice">
<el-input-number v-model="msg2.DriverRoomPrice" :precision="2" :min="0"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="导游房成本价" prop="GuideRoomPrice">
<el-form-item label="司导间成本价" prop="GuideRoomPrice">
<el-input-number v-model="msg2.GuideRoomPrice" :precision="2" :min="0"></el-input-number>
</el-form-item>
</el-col>
......@@ -424,27 +424,27 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="单人间成本价" prop="SingleroomPrice">
<el-form-item label="单间成本价" prop="SingleroomPrice">
<el-input-number v-model="msg.SingleroomPrice" :precision="2" :min="0"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="小孩不占床成本价" prop="ChildNotBedPrice">
<el-form-item label="不占床成本价" prop="ChildNotBedPrice">
<el-input-number v-model="msg.ChildNotBedPrice" :precision="2" :min="0"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="加床成本价" prop="AddBedPrice">
<el-form-item label="三人间成本价" prop="AddBedPrice">
<el-input-number v-model="msg.AddBedPrice" :precision="2" :min="0"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="6" style="display:none;">
<el-form-item label="司机房成本价" prop="DriverRoomPrice">
<el-input-number v-model="msg.DriverRoomPrice" :precision="2" :min="0"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="导游房成本价" prop="GuideRoomPrice">
<el-form-item label="司导间成本价" prop="GuideRoomPrice">
<el-input-number v-model="msg.GuideRoomPrice" :precision="2" :min="0"></el-input-number>
</el-form-item>
</el-col>
......
src/components/Hotel/roomReservationsDetails.vue
View file @ 6d8c0be4
......@@ -22,7 +22,7 @@
<ul>
<li>
<input v-if="IsOperation!=1" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
<input style="display:none;" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
<input style="display:none;" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
<span v-if="IsOperation==1" style="color:red;font-size:14px;">已制单，不能在修改!</span>
</li>
</ul>
......@@ -52,6 +52,7 @@
<th width="80">金额小计</th>
<th width="80">返佣类型</th>
<th width="80">返佣</th>
<th width="80">返佣金额</th>
<th width="80">入汤税</th>
<th width="80">城市税</th>
<th width="80">停车费</th>
......@@ -221,7 +222,7 @@
<!-- 返佣类型 -->
<td style="white-space:nowrap;" v-if="childIndex==0" :rowspan="6">
<template v-if="subItem.RebateType==1">
<span style="color:green">含税</span>
<span style="color:green">含税</span>
</template>
<template v-else>
<span style="color:red"> 不含税</span>
......@@ -239,6 +240,29 @@
:disabled="IsEditHotel==0?true:false"></el-input> %
</template>
</td>
<!--返佣金额-->
<td>
<!--含税-->
<template v-if="subItem.RebateType==1">
<!--税别-->
<template v-if="subItem.TaxType==2">
{{ (childItem.UnitPrice * (childItem.BookNum - childItem.HotelDiscount) * (1 + 0.08 )*( childItem.RebateRatio / 100)).toFixed(2)}}
</template>
<template v-else>
{{(childItem.UnitPrice * (childItem.BookNum - childItem.HotelDiscount) * (1)*( childItem.RebateRatio / 100)).toFixed(2) }}
</template>
</template>
<!--不含税-->
<template v-else>
<!--税别-->
<template v-if="subItem.TaxType==2">
{{(childItem.UnitPrice * (childItem.BookNum - childItem.HotelDiscount) * (1 + 0.08)*( childItem.RebateRatio / 100)).toFixed(2)}}
</template>
<template v-else>
{{(childItem.UnitPrice * (childItem.BookNum - childItem.HotelDiscount) * (1)*( childItem.RebateRatio / 100)).toFixed(2)}}
</template>
</template>
</td>
<!-- 入汤税 -->
<td style="white-space:nowrap;" v-if="childIndex==0" :rowspan="6">
{{subItem.InTangTax}}
......@@ -453,8 +477,8 @@
IsEditHotel: 0,
//0-可以操作，1-已制单，不能操作
IsOperation: 1,
LeaderName:"",//领队名称
GuideName:"",//导游名称
LeaderName: "", //领队名称
GuideName: "", //导游名称
}
},
components: {
......@@ -658,7 +682,7 @@
this.CreateByPhoto = res.data.data.CreateByPhoto;
this.CreateByAccount = res.data.data.CreateByAccount;
if (list != null && list.length > 0) {
list.forEach(item => {
list.forEach((item,sIndex) => {
item.HotelOrderList.forEach(subItem => {
subItem.hotelList.push({
Name: subItem.NewHotelName,
......@@ -678,6 +702,7 @@
})
});
this.list = list;
this.$forceUpdate();
}
} else {
......@@ -693,7 +718,8 @@
if (obj.TaxType == 2) {
if (index == 4) {
if (obj.DriverGuideIsRebate == 1) {
totalPrice += item.UnitPrice * (item.BookNum - item.HotelDiscount) * (1 + 0.08 - item.RebateRatio / 100);
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);
}
......@@ -868,8 +894,8 @@
},
},
mounted() {
this.LeaderName=this.$route.query.LeaderName;
this.GuideName=this.$route.query.GuideName;
this.LeaderName = this.$route.query.LeaderName;
this.GuideName = this.$route.query.GuideName;
this.TCNUM = this.$route.query.TCNUM;
this.flightTotal = this.$route.query.flightTotal;
this.GuestNum = this.$route.query.GuestNum;
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ 6d8c0be4
......@@ -132,27 +132,28 @@
</table>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<tr>
<th colspan="21" class="bgwhite">酒店使用</th>
<th colspan="22" class="bgwhite">酒店使用</th>
</tr>
<tr class="title">
<th width="100">使用时间</th>
<th width="180">酒店名称</th>
<th width="100">占床/不占床</th>
<th width="80">实际用房数</th>
<th width="">房间类型</th>
<th width="">房间数</th>
<th width="80">预定人数</th>
<th width="80">免费人数</th>
<th width="">单价/人</th>
<th width="">金额小计</th>
<th width="">返佣类型</th>
<th width="">返佣</th>
<th width="">入汤税</th>
<th width="">城市税</th>
<th width="">停车费</th>
<th width="">税入/税别</th>
<th width="">总金额</th>
<th width="">付款方式</th>
<th width="90">使用时间</th>
<th width="150">酒店名称</th>
<th width="70">占床<br/>不占床</th>
<th width="70">实际<br/>用房数</th>
<th width="70">房间<br/>类型</th>
<th width="70">房间数</th>
<th width="60">预定<br/>人数</th>
<th width="60">免费<br/>人数</th>
<th width="60">单价/人</th>
<th width="60">金额<br/>小计</th>
<th width="60">返佣<br/>类型</th>
<th width="60">返佣</th>
<th width="60">返佣<br/>金额</th>
<th width="60">入汤税</th>
<th width="60">城市税</th>
<th width="60">停车费</th>
<th width="60">税入<br/>税别</th>
<th width="60">总金额</th>
<th width="60">付款<br/>方式</th>
<th width="100">供应商</th>
<th width="100">状态</th>
<th width="100">备注</th>
......@@ -160,10 +161,9 @@
<template v-for='(outItem,outIndex) in list.HotelOrderListReport'>
<template v-for="(subItem,subIndex) in outItem.HotelOrderList">
<tr v-for="(childItem,childIndex) in subItem.OrderDetailsList">
<td v-if="childIndex==0&&subIndex==0" :rowspan="6*outItem.HotelOrderList.length">{{outItem.UseTimeStr}}
<td v-if="childIndex==0&&subIndex==0" :rowspan="6*outItem.HotelOrderList.length" style="white-space:nowrap; ">{{outItem.UseTimeStr}}
</td>
<td v-if="childIndex==0" :rowspan="6">{{subItem.HotelName}}
<td v-if="childIndex==0" :rowspan="6" style="text-align:left; ">{{subItem.HotelName}}
<p class="cursorpointer" style="margin-top:5px;color: blue;">
<a v-if="subItem.ContractUrl" target="_blank" :href="subItem.ContractUrl">手配书</a>
</p>
......@@ -176,8 +176,8 @@
</td>
<td>
<span v-if="childItem.HouseType === 1">单间</span>
<span v-if="childItem.HouseType === 2">标准双人间</span>
<span v-if="childItem.HouseType === 3">大床房</span>
<span v-if="childItem.HouseType === 2">标准间</span>
<span v-if="childItem.HouseType === 3">大床间</span>
<span v-if="childItem.HouseType === 4">三人间</span>
<span v-if="childItem.HouseType === 5">
司导间
......@@ -203,13 +203,13 @@
<td>
{{childItem.HotelDiscount}}
</td>
<td>
<td style="white-space:nowrap; ">
<p class="cursorpointer text-decoration"
@click="goHotelDetail(subItem.TCID, subItem.NewCombinationNum, subItem.TCNUM, 'roomReservationsDetails')">
{{subItem.PayStyle === 1 ? moneyFormat(childItem.UnitPrice) : 0}}
</p>
</td>
<td>
<td style="white-space:nowrap; ">
{{subItem.PayStyle === 1 ? moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount)) : 0}}
</td>
<td v-if="childIndex==0" :rowspan="6">
......@@ -223,6 +223,28 @@
<td>
{{childItem.RebateRatio}} %
</td>
<td style="white-space:nowrap; ">
<!--含税-->
<template v-if="subItem.RebateType==1">
<!--税别-->
<template v-if="subItem.TaxType==2">
{{ (childItem.UnitPrice * (childItem.BookNum - childItem.HotelDiscount) * (1 + 0.08 )*( childItem.RebateRatio / 100)).toFixed(2)}}
</template>
<template v-else>
{{(childItem.UnitPrice * (childItem.BookNum - childItem.HotelDiscount) * (1)*( childItem.RebateRatio / 100)).toFixed(2) }}
</template>
</template>
<!--不含税-->
<template v-else>
<!--税别-->
<template v-if="subItem.TaxType==2">
{{(childItem.UnitPrice * (childItem.BookNum - childItem.HotelDiscount) * (1 + 0.08)*( childItem.RebateRatio / 100)).toFixed(2)}}
</template>
<template v-else>
{{(childItem.UnitPrice * (childItem.BookNum - childItem.HotelDiscount) * (1)*( childItem.RebateRatio / 100)).toFixed(2)}}
</template>
</template>
</td>
<td v-if="childIndex==0" :rowspan="6">
{{subItem.InTangTax}}
</td>
......@@ -240,7 +262,7 @@
税别
</template>
</td>
<td v-if="childIndex==0" :rowspan="6">
<td v-if="childIndex==0" :rowspan="6" style="white-space:nowrap; ">
{{hotelTotalPrice(subItem)}}
</td>
<td v-if="childIndex==0" :rowspan="6">
......@@ -276,7 +298,7 @@
</template>
<tr v-if="TotalNav.reimburseTotalPrice">
<td>总金额</td>
<td colspan="20">
<td colspan="21">
{{moneyFormat(TotalNav.reimburseTotalPrice.ExpendTotalPrice)}}
</td>
</tr>
......@@ -834,7 +856,6 @@
this.loading = false;
if (res.data.resultCode == 1) {
this.list = res.data.data;
console.log("this.list", this.list);
this.UseCount = this.list.UseCount;
if (this.list.OtherOrderReportList.OtherList && this.list.OtherOrderReportList.OtherList.length > 0) {
this.list.OtherOrderReportList.OtherList.forEach(x => {
......
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