Skip to content

S
SuperMan
Commit adead566 authored by 罗超's avatar 罗超
Browse files
Options

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

parents 8c2d4644 4fee25bb
Hide whitespace changes
Inline Side-by-side
Showing with 424 additions and 148 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ adead566
......@@ -299,20 +299,20 @@
<div class="_conten">
<template v-if="!otherTable">
<template v-if="GetDetail.Type!==1 && GetDetail.Type!==7 && GetDetail.Type!=4 && showModel">
<my-Bill :GetDetail="GetDetail" v-on:headCallBack="headCall" :width="widthSon" :color="colorSon"></my-Bill>
<my-Bill :ID="FrID" :GetDetail="GetDetail" v-on:headCallBack="headCall" :width="widthSon" :color="colorSon"></my-Bill>
</template>
<template v-else-if="GetDetail.Type===4 && showModel">
<new-Bill :GetDetail="GetDetail"></new-Bill>
<new-Bill :ID="FrID" :GetDetail="GetDetail"></new-Bill>
</template>
<template v-else-if="GetDetail.Type===1 && GetDetail.Type!==7 && showModel">
<my-RVB-Bill :GetDetail="GetDetail" :width="widthSon" :color="colorSon"></my-RVB-Bill>
<my-RVB-Bill :ID="FrID" :GetDetail="GetDetail" :width="widthSon" :color="colorSon"></my-RVB-Bill>
</template>
<template v-else-if="GetDetail.Type===7 && showModel">
<my-GZ-Bill :GetDetail="GetDetail" :width="widthSon" :color="colorSon"></my-GZ-Bill>
<my-GZ-Bill :ID="FrID" :GetDetail="GetDetail" :width="widthSon" :color="colorSon"></my-GZ-Bill>
</template>
</template>
<template v-else-if="showModel">
<my-DJ-Bill :GetDetail="GetDetail" :width="widthSon" :color="colorSon"></my-DJ-Bill>
<my-DJ-Bill :ID="FrID" :GetDetail="GetDetail" :width="widthSon" :color="colorSon"></my-DJ-Bill>
</template>
<div class="_explain">
......
src/components/FinancialModule/FinancialSubmodule/BillModule.vue
View file @ adead566
......@@ -355,12 +355,12 @@ export default {
})
}
},
Financial_post_GetDetail(id){ //获取单据详情
if(!id) return
Financial_post_GetDetail(){ //获取单据详情
// if(!id) return
this.loading = true;
this.apipost('Financial_post_GetDetail',{ID:id}, res => {
if(res.data.resultCode == 1) {
let data= res.data.data;
// this.apipost('Financial_post_GetDetail',{ID:id}, res => {
// if(res.data.resultCode == 1) {
let data = this.GetDetail;
data.DetailList.forEach(x=>{
x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100)
x.Money = Math.round(x.Money * 100) / 100
......@@ -381,8 +381,8 @@ export default {
this.loading=false
// this.$set(this.$data,"GetDetail",data);
// console.log(this.GetDetail)
}
}, err => {})
// }
// }, err => {})
},
},mounted(){
// console.log(this.ID+"mounted")
......@@ -394,9 +394,7 @@ export default {
this.EndDate = yaer + '-' + month + '-' + dateS;
let userInfo = this.getLocalStorage();
this.EmployeeId = userInfo.EmployeeId;
if (this.ID){
this.Financial_post_GetDetail(this.ID);
}
this.Financial_post_GetDetail();
},watch: { // 监听参数变化
// GetDetail: {
......
src/components/FinancialModule/FinancialSubmodule/CashierBillModule.vue
View file @ adead566
......@@ -136,11 +136,11 @@ export default {
this.picIsShow= true;
},
Financial_post_GetDetail(id){ //获取单据详情
if(!id) return
// if(!id) return
this.loading = true;
this.apipost('Financial_post_GetDetail',{ID:id}, res => {
if(res.data.resultCode == 1) {
let data= res.data.data;
// this.apipost('Financial_post_GetDetail',{ID:id}, res => {
// if(res.data.resultCode == 1) {
let data= this.GetDetail;
let Money = 0;
data.DetailList.forEach(x=>{
x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100);
......@@ -158,11 +158,11 @@ export default {
data.AuditSteps.reverse();
this.GetDetail = data;
this.loading=false;
}
}, err => {})
// }
// }, err => {})
},
},mounted(){
// this.Financial_post_GetDetail(this.ID)
this.Financial_post_GetDetail()
},watch: { // 监听参数变化
// GetDetail: {
// handler: function(val, oldVal) {
......
src/components/FinancialModule/FinancialSubmodule/DjieMergeBillModule.vue
View file @ adead566
......@@ -332,12 +332,12 @@
})
}
},
Financial_post_GetDetail(id){ //获取单据详情
if(!id) return
Financial_post_GetDetail(){ //获取单据详情
// if(!id) return
this.loading = true;
this.apipost('Financial_post_GetDetail',{ID:id}, res => {
if(res.data.resultCode == 1) {
let data= res.data.data;
// this.apipost('Financial_post_GetDetail',{ID:id}, res => {
// if(res.data.resultCode == 1) {
let data= this.GetDetail;
data.DetailList.forEach(x=>{
x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100)
x.Money = Math.round(x.Money * 100) / 100
......@@ -362,8 +362,8 @@
this.loading=false
// this.$set(this.$data,"GetDetail",data);
// console.log(this.GetDetail)
}
}, err => {})
// }
// }, err => {})
},
},mounted(){
// console.log(this.ID+"mounted")
......@@ -375,7 +375,7 @@
this.EndDate = yaer + '-' + month + '-' + dateS;
let userInfo = this.getLocalStorage();
this.EmployeeId = userInfo.EmployeeId;
// this.Financial_post_GetDetail(this.ID);
this.Financial_post_GetDetail();
},watch: { // 监听参数变化
// GetDetail: {
// handler: function(val, oldVal) {
......
src/components/FinancialModule/FinancialSubmodule/GZBillModule.vue
View file @ adead566
......@@ -372,12 +372,12 @@ export default {
})
}
},
Financial_post_GetDetail(id){ //获取单据详情
if(!id) return
Financial_post_GetDetail(){ //获取单据详情
// if(!id) return
this.loading = true;
this.apipost('Financial_post_GetDetail',{ID:id}, res => {
if(res.data.resultCode == 1) {
let data= res.data.data;
// this.apipost('Financial_post_GetDetail',{ID:id}, res => {
// if(res.data.resultCode == 1) {
let data= this.GetDetail;
data.DetailList.forEach(x=>{
x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100)
x.Money = Math.round(x.Money * 100) / 100
......@@ -397,8 +397,8 @@ export default {
this.loading=false
// this.$set(this.$data,"GetDetail",data);
// console.log(this.GetDetail)
}
}, err => {})
// }
// }, err => {})
},
},mounted(){
// console.log(this.ID+"mounted")
......@@ -410,7 +410,7 @@ export default {
this.EndDate = yaer + '-' + month + '-' + dateS;
let userInfo = this.getLocalStorage();
this.EmployeeId = userInfo.EmployeeId;
// this.Financial_post_GetDetail(this.ID);
this.Financial_post_GetDetail();
},watch: { // 监听参数变化
// GetDetail: {
// handler: function(val, oldVal) {
......
src/components/FinancialModule/FinancialSubmodule/MergeBillModule.vue
View file @ adead566
......@@ -282,12 +282,12 @@
})
}
},
Financial_post_GetDetail(id){ //获取单据详情
if(!id) return
this.loading = true;
this.apipost('Financial_post_GetDetail',{ID:id}, res => {
if(res.data.resultCode == 1) {
let data= res.data.data;
Financial_post_GetDetail(){ //获取单据详情
// if(!id) return
// this.loading = true;
// this.apipost('Financial_post_GetDetail',{ID:id}, res => {
// if(res.data.resultCode == 1) {
let data= this.GetDetail;
data.DetailList.forEach(x=>{
x.UnitPrice = this.$commonUtils.addCommas(Math.round(x.UnitPrice * 100) / 100)
x.Money = Math.round(x.Money * 100) / 100
......@@ -302,8 +302,8 @@
this.loading=false
// this.$set(this.$data,"GetDetail",data);
// console.log(this.GetDetail)
}
}, err => {})
// }
// }, err => {})
},
},mounted(){
console.log(this.GetDetail,"mounted")
......@@ -315,7 +315,7 @@
this.EndDate = yaer + '-' + month + '-' + dateS;
let userInfo = this.getLocalStorage();
this.EmployeeId = userInfo.EmployeeId;
// this.Financial_post_GetDetail(this.ID);
this.Financial_post_GetDetail();
},watch: { // 监听参数变化
// GetDetail: {
// handler: function(val, oldVal) {
......
src/components/FinancialModule/FinancialSubmodule/ReceivablesModule.vue
View file @ adead566
......@@ -336,12 +336,12 @@ export default {
})
}
},
Financial_post_GetDetail(id){ //获取单据详情
if(!id) return;
Financial_post_GetDetail(){ //获取单据详情
// if(!id) return;
this.loading = true;
this.apipost('Financial_post_GetDetail',{ID:id}, res => {
if(res.data.resultCode == 1) {
let data= res.data.data;
// this.apipost('Financial_post_GetDetail',{ID:id}, res => {
// if(res.data.resultCode == 1) {
let data = this.GetDetail;
let numberC = 0;
let price = 0;
let rate = 0;
......@@ -364,8 +364,8 @@ export default {
this.loading=false
// this.$set(this.$data,"GetDetail",data);
// console.log(this.GetDetail)
}
}, err => {})
// }
// }, err => {})
},
},mounted(){
// console.log(this.ID+"mounted")
......@@ -377,9 +377,7 @@ export default {
this.EndDate = yaer + '-' + month + '-' + dateS;
let userInfo = this.getLocalStorage();
this.EmployeeId = userInfo.EmployeeId;
if (this.ID){
this.Financial_post_GetDetail(this.ID);
}
this.Financial_post_GetDetail();
// this.Financial_post_GetDetail(this.ID);
},watch: { // 监听参数变化
// GetDetail: {
......
src/components/Hotel/roomReservationsDetails.vue
View file @ adead566
......@@ -119,7 +119,7 @@
{{subItem.HouseStatistics.HouseTypeList[childIndex].HouseTypeName}}
<template v-if="childIndex==4">
<template v-if="subItem.DriverGuideIsRebate==1">
<br />返佣
<br /><span style="color:green">返佣</span>
</template>
<template v-else-if="subItem.DriverGuideIsRebate==0">
<br /><span style="color:red;">不返佣</span>
......@@ -186,11 +186,11 @@
<!-- 房间数 -->
<td>
<el-input class='w40 tcenter' maxlength="2" @keyup.native="checkPrice(childItem,'HouseTypeCount')"
v-model='childItem.HouseTypeCount' :disabled="childIndex<4?true:false"></el-input>
v-model='childItem.HouseTypeCount' :disabled="true"></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">
@input="calculationPrice(subItem)" v-model='childItem.BookNum' :disabled="true">
</el-input>
</td>
<!-- 尚差房间数 -->
......@@ -220,7 +220,7 @@
<!-- 返佣类型 -->
<td style="white-space:nowrap;" v-if="childIndex==0" :rowspan="6">
<template v-if="subItem.RebateType==1">
含税
<span style="color:green">含税</span>
</template>
<template v-else>
<span style="color:red"> 不含税</span>
......@@ -690,8 +690,7 @@
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);
}
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ adead566
......@@ -28,8 +28,8 @@
<td>{{item.GuideName}}</td>
<td>
<el-popover width="900" trigger="click" popper-class="DMC_HotelPop">
<commonHotelInfo :HotelObj="item.CommonReport.PriceHotelResult" :showHotelObj="showHotelObj" :TCID="item.TCIDS" :DMCNum="NewCombinationNum" :TCNUM="item.TCNUMS"
></commonHotelInfo>
<commonHotelInfo :HotelObj="item.CommonReport.PriceHotelResult" :showHotelObj="showHotelObj"
:TCID="item.TCIDS" :DMCNum="NewCombinationNum" :TCNUM="item.TCNUMS"></commonHotelInfo>
<span slot="reference" class="price" style="cursor:pointer;text-decoration:underline;">酒店信息</span>
</el-popover>
</td>
......@@ -118,7 +118,8 @@
</td>
<td>
<span>
<span>{{item.SupplierName}} <span v-if="item.SupplierPayType !== 0" :style="{'color': item.SupplierPayType == 2 ? '#E95252': '#111111'}">{{item.SupplierPayType == 2 ? '签单' : '现付'}}</span></span>
<span>{{item.SupplierName}} <span v-if="item.SupplierPayType !== 0"
:style="{'color': item.SupplierPayType == 2 ? '#E95252': '#111111'}">{{item.SupplierPayType == 2 ? '签单' : '现付'}}</span></span>
</span>
</td>
</tr>
......@@ -127,15 +128,11 @@
<td colspan="15">
<span v-for="item in TotalNav.busPrice">{{item.Str + '：' +item.TotalPrice}} &nbsp;&nbsp;&nbsp;&nbsp;</span>
</td>
<!-- <td>签单/预付/抵扣总金额</td>
<td colspan="7">
{{moneyFormat(TotalNav.reimburseTotalPrice.SelfPayingIncomeTotalPrice)}}
</td> -->
</tr>
</table>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<tr>
<th colspan="16" class="bgwhite">酒店使用</th>
<th colspan="21" class="bgwhite">酒店使用</th>
</tr>
<tr class="title">
<th width="100">使用时间</th>
......@@ -148,27 +145,33 @@
<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="100">备注</th>
<th width="100">供应商</th>
<th width="100">状态</th>
<th width="100">备注</th>
</tr>
<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="5*outItem.HotelOrderList.length">{{outItem.UseTimeStr}}
<td v-if="childIndex==0&&subIndex==0" :rowspan="6*outItem.HotelOrderList.length">{{outItem.UseTimeStr}}
</td>
<td v-if="childIndex==0" :rowspan="5">{{subItem.HotelName}}
<td v-if="childIndex==0" :rowspan="6">{{subItem.HotelName}}
<p class="cursorpointer" style="margin-top:5px;color: blue;">
<a v-if="subItem.ContractUrl" target="_blank" :href="subItem.ContractUrl">手配书</a>
</p>
</td>
<td v-if="childIndex==0" :rowspan="5">
<td v-if="childIndex==0" :rowspan="6">
{{subItem.HouseStatistics.NeedBed}}/{{subItem.HouseStatistics.NoNeedBed}}
</td>
<td v-if="childIndex==0" :rowspan="5">
<td v-if="childIndex==0" :rowspan="6">
{{subItem.HouseStatistics.RealityRoomNum}}
</td>
<td>
......@@ -176,7 +179,20 @@
<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">司导间</span>
<span v-if="childItem.HouseType === 5">
司导间
<template v-if="childIndex==4">
<template v-if="subItem.DriverGuideIsRebate==1">
<br /><span style="color:green">返佣</span>
</template>
<template v-else-if="subItem.DriverGuideIsRebate==0">
<br /><span style="color:red;">不返佣</span>
</template>
</template>
</span>
<span v-if="childItem.HouseType === 6">
不占床
</span>
</td>
<td>
{{childItem.HouseTypeCount}}
......@@ -194,12 +210,29 @@
</p>
</td>
<td>
{{subItem.PayStyle === 1 ? moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount)) : 0}}
{{subItem.PayStyle === 1 ? moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount)) : 0}}
</td>
<td v-if="childIndex==0" :rowspan="6">
<template v-if="subItem.RebateType==1">
<span style="color:green">含税</span>
</template>
<template v-else>
<span style="color:red"> 不含税</span>
</template>
</td>
<td>
{{childItem.RebateRatio}} %
</td>
<td v-if="childIndex==0" :rowspan="5">
<td v-if="childIndex==0" :rowspan="6">
{{subItem.InTangTax}}
</td>
<td v-if="childIndex==0" :rowspan="6">
{{subItem.CityTax}}
</td>
<td v-if="childIndex==0" :rowspan="6">
{{subItem.ParkFee}}
</td>
<td v-if="childIndex==0" :rowspan="6">
<template v-if="subItem.TaxType==1">
税入
</template>
......@@ -207,10 +240,10 @@
税别
</template>
</td>
<td v-if="childIndex==0" :rowspan="5">
{{hotelTotalPrice(subItem.OrderDetailsList,subItem)}}
<td v-if="childIndex==0" :rowspan="6">
{{hotelTotalPrice(subItem)}}
</td>
<td v-if="childIndex==0" :rowspan="5">
<td v-if="childIndex==0" :rowspan="6">
<span v-if="subItem.PayStyle === 1">现付</span>
<span v-else-if="subItem.PayStyle === 2">签单</span>
<span v-else-if="subItem.PayStyle === 4">预付</span>
......@@ -220,21 +253,32 @@
</br>
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</td>
<td v-if="childIndex==0" :rowspan="5">
{{subItem.Remarks}}
<td v-if="childIndex==0" :rowspan="6">
<span>{{subItem.SupplierName}} <span v-if="subItem.SupplierPayType !== 0"
:style="{'color': subItem.SupplierPayType == 2 ? '#E95252': '#111111'}">{{subItem.SupplierPayType == 2 ? '签单' : '现付'}}</span></span>
</td>
<td v-if="childIndex==0" :rowspan="6">
<template v-if="subItem.DMCState==1">
<span style="color: green;">地接-OK</span>
</template>
<template v-else-if="subItem.DMCState==2">
<span style="color:red;">地接-暂定</span>
</template>
<template v-else>
<span style="color:red;">地接-未操作</span>
</template>
</td>
<td v-if="childIndex==0" :rowspan="5">
<span>{{subItem.SupplierName}} <span v-if="subItem.SupplierPayType !== 0" :style="{'color': subItem.SupplierPayType == 2 ? '#E95252': '#111111'}">{{subItem.SupplierPayType == 2 ? '签单' : '现付'}}</span></span>
<td v-if="childIndex==0" :rowspan="6">
{{subItem.Remarks}}
</td>
</tr>
</template>
</template>
<tr v-if="TotalNav.reimburseTotalPrice">
<td>总金额</td>
<td colspan="15">
<td colspan="20">
{{moneyFormat(TotalNav.reimburseTotalPrice.ExpendTotalPrice)}}
</td>
</tr>
</table>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
......@@ -305,10 +349,6 @@
<td colspan="11">
{{moneyFormat(TotalNav.reimburseTotalPrice.IncomeTotalPrice)}}
</td>
<!-- <td>签单/预付/抵扣总金额</td>
<td colspan="5">
{{moneyFormat(TotalNav.reimburseTotalPrice.TipTotalPrice)}}
</td> -->
</tr>
</table>
......@@ -381,12 +421,7 @@
<td colspan="11">
{{moneyFormat(TotalNav.reimburseTotalPrice.OtherTotalPrice)}}
</td>
<!-- <td>签单/预付/抵扣总金额</td>
<td colspan="5">
{{moneyFormat(TotalNav.reimburseTotalPrice.PlanTotalPrice)}}
</td> -->
</tr>
</table>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<tr>
......@@ -497,8 +532,8 @@
showZhan: true,
showBtnList: false,
showCaozuoTime: true,
ShowTaxType:true, //显示税入税别
ShowRebateRatio:true, //显示返佣比列
ShowTaxType: true, //显示税入税别
ShowRebateRatio: true, //显示返佣比列
},
}
},
......@@ -662,23 +697,32 @@
})
return this.moneyFormat(totalPrice)
},
hotelTotalPrice(obj, subItem) {
let totalPrice = 0
obj.forEach(x => {
if (subItem.TaxType == 2) {
if (x.PayStyle === 1) {
totalPrice += x.UnitPrice * (x.BookNum - x.HotelDiscount) * (1+0.08 - x.RebateRatio / 100)
hotelTotalPrice(obj) {
let totalPrice = 0;
obj.OrderDetailsList.forEach((item, index) => {
if (obj.PayStyle === 1) {
//税别
if (obj.TaxType == 2) {
if (index == 4) {
if (obj.DriverGuideIsRebate == 1) {
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);
}
} else {
totalPrice += item.UnitPrice * (item.BookNum - item.HotelDiscount) * (1 + 0.08 - item.RebateRatio /
100);
}
//税入
} else {
totalPrice += 0
totalPrice += item.UnitPrice * (item.BookNum - item.HotelDiscount) * (1 - item.RebateRatio / 100);
}
} else {
if (x.PayStyle === 1) {
totalPrice += x.UnitPrice * (x.BookNum - x.HotelDiscount) * (1 - x.RebateRatio / 100)
} else {
totalPrice += 0
}
totalPrice += 0
}
})
totalPrice += obj.ParkFee + obj.CityTax + obj.InTangTax;
return this.moneyFormat(totalPrice)
},
diningTotalPrice(sObj, obj) {
......@@ -731,7 +775,7 @@
this.picIsShow = true
},
peopleStrToWord(str) {
if (str == 1)
if (str == 1)
return '大人'
if (str == 2)
return '中人'
......@@ -767,7 +811,6 @@
}
})
this.nav = nav;
console.log(this.nav,'navvvvvvvv');
} else {
this.Error(res.data.message)
}
......@@ -791,7 +834,7 @@
this.loading = false;
if (res.data.resultCode == 1) {
this.list = res.data.data;
console.log("this.list",this.list);
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 => {
......
src/components/Ticketing/TicketManager.vue
View file @ adead566
......@@ -1371,10 +1371,11 @@
<el-col :span="2">
<span class="_lian_style" v-if="item.IsSetUnion==1">联</span>
<div class="_oll_img_box">
<span class="TICK_Code PingFangSC">编号：{{item.ID}}&nbsp;&nbsp;天数：<span style="color:#ff0066;font-weight:bold">{{item.DayNum}}</span></span>
<span class="TICK_Code PingFangSC">编号：{{item.ID}} </span>
<img v-if="!item.AirlineUrl" class="_oll_img" :src="defaultImg">
<img v-else class="_oll_img" :src="item.AirlineUrl" :onerror="defaultImg">
</div>
<span style="display:block;padding-left:10px;" title="国际段">行程天数：<span style="color:#ff0066;font-weight:bold">{{item.DayNum}} 天</span></span>
</el-col>
<el-col :span="2" class="vmiddle" style="width:85px;">
<div class="_oll_info">
......
src/components/index.vue
View file @ adead566
......@@ -899,7 +899,7 @@
</div>
<div style="text-align:center">
<p style="font-size:26px;color:#111111;margin:40px 0">第{{tsNumber}}期投诉案例分享已经发布</p>
<a @click="CloseTs" href="http://we.oytour.com:8110/?/article/8" style="font-size:18px;color:#E95252;cursor:pointer;text-decoration:underline">点击查看</a>
<a @click="CloseTs" target="_blank" href="http://we.oytour.com:8110/?/article/8" style="font-size:18px;color:#E95252;cursor:pointer;text-decoration:underline">点击查看</a>
</div>
</div>
</div>
......
src/components/leaderPay2.vue
View file @ adead566
......@@ -139,7 +139,47 @@ input[type="number"] {
<th width="">实付金额</th>
<th width="100">备注</th>
</tr>
<template v-for='(item,index) in list.ScenicList'>
<template v-for='(item,index) in ScenicDataList'>
<template v-for="(subItem,subIndex) in item.data">
<tr v-for="(childItem,childIndex) in subItem.TicketPriceList">
<td v-if="childIndex==0" :rowspan="subItem.TicketPriceList.length">
{{subItem.ScenicName}}
</td>
<td>
{{peopleStrToWord(childItem.PeopleType)}}:{{childItem.PeopleNum}}
</td>
<td>
<p>
{{subItem.PayStyle === 1 ? moneyFormat(childItem.PeoplePrice) : 0}}
</p>
</td>
<td v-if="childIndex==0" :rowspan="subItem.TicketPriceList.length">
<span v-if="subItem.PayStyle === 1">现付</span>
<span v-else-if="subItem.PayStyle === 2">公司结算</span>
<span v-else-if="subItem.PayStyle === 3">预付</span>
<span v-else-if="subItem.PayStyle === 6">公司合团支付</span>
<span v-else></span>
</br>
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</td>
<td>
{{subItem.PayStyle === 1 ? moneyFormat((childItem.UsePeopleNum-childItem.Discount)*childItem.PeoplePrice) : 0}}
</td>
<td v-if="childIndex==0" :rowspan="subItem.TicketPriceList.length">
{{scenicTotalPrice(subItem, subItem.TicketPriceList)}}
</td>
<td v-if="childIndex==0" :rowspan="item.data.length*subItem.TicketPriceList.length">
{{subItem.TradingTotalPrice}}
</td>
<td v-if="childIndex==0" :rowspan="subItem.TicketPriceList.length">
{{subItem.Remarks}}
</td>
</tr>
</template>
</template>
<!-- <template v-for='(item,index) in list.ScenicList'>
<template v-for="(subItem,subIndex) in item.ScenicStatisticsList">
<tr v-for="(childItem,childIndex) in subItem.TicketPriceList">
<td v-if="childIndex==0" :rowspan="subItem.TicketPriceList.length">
......@@ -178,7 +218,7 @@ input[type="number"] {
</td>
</tr>
</template>
</template>
</template> -->
</table>
<table border="0" cellspacing="1" class="leaderPayTable leaderPayTable2">
......@@ -192,21 +232,23 @@ input[type="number"] {
<th width="">实付金额</th>
<th width="">备注</th>
</tr>
<tr v-for='(item,index) in list.BusList'>
<td>{{item.PlanDateStr}}</td>
<td>
{{item.HighSpeedPrice >= 0 && item.HighSpeedPrice !== null && item.HighSpeedPayType > 0 ? (item.HighSpeedPayType === 1 ? moneyFormat(item.HighSpeedPrice) : 0) : ''}}
</td>
<!-- <td v-if='index==0' :rowspan='list.BusList.length'>-->
<!-- {{busTotalPrice(list.BusList)}}-->
<!-- </td>-->
<td>
{{item.TotalPrice}}
</td>
<td>
{{item.Remarks}}
</td>
</tr>
<template v-for='(item,index) in busDataList'>
<tr v-for='(item2,index2) in item.data'>
<td>{{item.PlanDateStr}}</td>
<td>
{{item2.HighSpeedPrice >= 0 && item2.HighSpeedPrice !== null && item2.HighSpeedPayType > 0 ? (item2.HighSpeedPayType === 1 ? moneyFormat(item2.HighSpeedPrice) : 0) : ''}}
</td>
<!-- <td v-if='index==0' :rowspan='list.BusList.length'>-->
<!-- {{busTotalPrice(list.BusList)}}-->
<!-- </td>-->
<td v-if="index2 ==0" :rowspan="item.data.length">
{{item2.TotalPrice}}
</td>
<td>
{{item2.Remarks}}
</td>
</tr>
</template>
</table>
<table border="0" cellspacing="1" class="leaderPayTable leaderPayTable2">
......@@ -224,7 +266,47 @@ input[type="number"] {
<th width="">实付金额</th>
<th width="100">备注</th>
</tr>
<template v-for='(item,index) in list.DiningList'>
<template v-for='(item,index) in DiningDataList'>
<template v-for='(subItem,subIndex) in item.data'>
<tr v-for='(childItem,childIndex) in subItem.DiningPriceList'>
<td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
{{subItem.RealName? subItem.RealName : subItem.DiningName}}
</td>
<td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
{{subItem.UseDinnerTypeStr}}
</td>
<td>
{{peopleStrToWord(childItem.PeopleType)}}:{{childItem.PeopleNum}}
</td>
<td>
<p>
{{subItem.PayStyle === 1 ? moneyFormat(childItem.PeoplePrice) : 0}}
</p>
</td>
<td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
<span v-if="subItem.PayStyle === 1">现付</span>
<span v-else-if="subItem.PayStyle === 2">公司结算</span>
<span v-else-if="subItem.PayStyle === 3">预付</span>
<span v-else-if="subItem.PayStyle === 6">公司合团支付</span>
<span v-else></span>
</br>
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</td>
<td>
{{subItem.PayStyle === 1 ? moneyFormat((childItem.PeopleNum-childItem.Discount)*childItem.PeoplePrice) : 0}}
</td>
<td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
{{diningTotalPrice(subItem, subItem.DiningPriceList)}}
</td>
<td v-if="childIndex==0" :rowspan="item.data.length * subItem.DiningPriceList.length">{{subItem.TradingTotalPrice}}</td>
<td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
{{subItem.Remarks}}
</td>
</tr>
</template>
</template>
<!-- <template v-for='(item,index) in list.DiningList'>
<template v-for="(subItem,subIndex) in item.DiningSummaryList">
<tr v-for="(childItem,childIndex) in subItem.DiningPriceList">
<td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
......@@ -263,7 +345,7 @@ input[type="number"] {
</td>
</tr>
</template>
</template>
</template> -->
</table>
<table border="0" cellspacing="1" class="leaderPayTable leaderPayTable2">
......@@ -281,7 +363,53 @@ input[type="number"] {
<th width="">实付金额</th>
<th width="100">备注</th>
</tr>
<template v-for='(outItem,outIndex) in list.HotelOrderListReport'>
<template v-for='(item, index) in HotelDataList'>
<template v-for="(subItem,subIndex) in item.data">
<tr v-for="(childItem,childIndex) in subItem.OrderDetailsList">
<td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length">
{{subItem.HotelName}}
</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 === 4">三人间</span>
<span v-if="childItem.HouseType === 5">司导间</span>
<span v-if="childItem.HouseType === 6">不占床</span>
</td>
<td>
{{childItem.BookNum}}
</td>
<td>
<p>
{{subItem.PayStyle === 1 ? moneyFormat(childItem.UnitPrice) : 0}}
</p>
</td>
<td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length">
<span v-if="subItem.PayStyle === 1">现付</span>
<span v-else-if="subItem.PayStyle === 2">签单</span>
<span v-else-if="subItem.PayStyle === 4">预付</span>
<span v-else-if="subItem.PayStyle === 5">实物抵扣</span>
<span v-else-if="subItem.PayStyle === 6">公司合团支付</span>
<span v-else></span>
</br>
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</td>
<td>
{{moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount))}}
</td>
<td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length">
{{hotelTotalPrice(subItem.OrderDetailsList)}}
</td>
<td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length * item.data.length">{{subItem.TradingTotalPrice}}</td>
<td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length">
{{subItem.Remarks}}
</td>
</tr>
</template>
</template>
<!-- <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" :rowspan="subItem.OrderDetailsList.length">
......@@ -293,6 +421,7 @@ input[type="number"] {
<span v-if="childItem.HouseType === 3">大床房</span>
<span v-if="childItem.HouseType === 4">三人间</span>
<span v-if="childItem.HouseType === 5">司导间</span>
<span v-if="childItem.HouseType === 6">不占床</span>
</td>
<td>
{{childItem.BookNum}}
......@@ -325,7 +454,7 @@ input[type="number"] {
</td>
</tr>
</template>
</template>
</template> -->
</table>
<table border="0" cellspacing="1" class="leaderPayTable">
<tr>
......@@ -573,6 +702,10 @@ export default {
SelfPayingExpendTotalPrice:0,
IncomeTotalPrice:0,
ExpendTotalPrice:0,
busDataList: [],
DiningDataList: [],
ScenicDataList: [],
HotelDataList: []
};
},
methods: {
......@@ -653,7 +786,6 @@ export default {
this.totalDinnerPrice
).toFixed(2);
this.isShowRemark = true;
console.log(this.dataList)
} else {
this.Error(res.data.message);
}
......@@ -708,7 +840,7 @@ export default {
//打印
printTable() {
window.print();
},
},
//获取总额
getTotalMoney() {
this.apipost(
......@@ -771,20 +903,125 @@ export default {
// tab: '领队报账'
// }
// })
},
},
getnewList(){
this.loading = true;
this.apipost('dmcstatistics_post_GetNewLeaderPayStatics_V1', this.msg, res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.list = res.data.data;
// this.UseCount = this.list.UseCount;
// if (this.list.OtherOrderReportList.OtherList && this.list.OtherOrderReportList.OtherList.length > 0) {
// this.list.OtherOrderReportList.OtherList.forEach(x => {
// x.CostProject = x.CostProject.toString();
// });
// }
this.list = res.data.data;
// 车
let busList = res.data.data.BusList
var busmap = {},
busdest = [];
for(var i = 0; i < busList.length; i++){
var ai = busList[i];
if(!busmap[ai.PlanDateStr]){
busdest.push({
PlanDateStr: ai.PlanDateStr,
data: [ai]
});
busmap[ai.PlanDateStr] = ai;
}else{
for(var j = 0; j < busdest.length; j++){
var dj = busdest[j];
if(dj.PlanDateStr == ai.PlanDateStr){
dj.data.push(ai);
break;
}
}
}
}
this.busDataList = busdest;
// 餐
let DiningList = []
for(let i = 0; i < res.data.data.DiningList.length; i++) {
for(let o = 0; o < res.data.data.DiningList[i].DiningSummaryList.length; o++) {
DiningList.push(res.data.data.DiningList[i].DiningSummaryList[o])
}
}
var Diningmap = {},
Diningdest = [];
for(var i = 0; i < DiningList.length; i++){
var ai = DiningList[i];
if(!Diningmap[ai.UseTimeStr]){
Diningdest.push({
UseTimeStr: ai.UseTimeStr,
DiningID: ai.DiningID,
data: [ai]
});
Diningmap[ai.PlanDateStr] = ai;
}else{
for(var j = 0; j < Diningdest.length; j++){
var dj = Diningdest[j];
if(dj.UseTimeStr == ai.UseTimeStr && dj.DiningID == ai.DiningID){
dj.data.push(ai);
break;
}
}
}
}
this.DiningDataList = Diningdest
//票
console.log(res.data.data.ScenicList)
let ScenicList = []
for(let i = 0; i < res.data.data.ScenicList.length; i++) {
for(let o = 0; o < res.data.data.ScenicList[i].ScenicStatisticsList.length; o++) {
ScenicList.push(res.data.data.ScenicList[i].ScenicStatisticsList[o])
}
}
var Scenicmap = {},
Scenicdest = [];
for(var i = 0; i < ScenicList.length; i++){
var ai = ScenicList[i];
if(!Scenicmap[ai.UseTimeStr]){
Scenicdest.push({
UseTimeStr: ai.UseTimeStr,
TicketID: ai.TicketID,
data: [ai]
});
Scenicmap[ai.PlanDateStr] = ai;
}else{
for(var j = 0; j < Scenicdest.length; j++){
var dj = Scenicdest[j];
if(dj.UseTimeStr == ai.UseTimeStr && dj.TicketID == ai.TicketID){
dj.data.push(ai);
break;
}
}
}
}
this.ScenicDataList = Scenicdest
//酒
let HotelList = []
for(let i = 0; i < res.data.data.HotelOrderListReport.length; i++) {
for(let o = 0; o < res.data.data.HotelOrderListReport[i].HotelOrderList.length; o++) {
HotelList.push(res.data.data.HotelOrderListReport[i].HotelOrderList[o])
}
}
var Hotelmap = {},
Hoteldest = [];
for(var i = 0; i < HotelList.length; i++){
var ai = HotelList[i];
if(!Hotelmap[ai.CheckInDateStr]){
Hoteldest.push({
CheckInDateStr: ai.CheckInDateStr,
NewHotelId: ai.NewHotelId,
data: [ai]
});
Hotelmap[ai.CheckInDateStr] = ai;
}else{
for(var j = 0; j < Hoteldest.length; j++){
var dj = Hoteldest[j];
if(dj.CheckInDateStr == ai.CheckInDateStr && dj.NewHotelId == ai.NewHotelId){
dj.data.push(ai);
break;
}
}
}
}
console.log(HotelList)
this.HotelDataList = Hoteldest
} else {
this.$message.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