Skip to content

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

1

parent 495ab5eb
Hide whitespace changes
Inline Side-by-side
Showing with 317 additions and 84 deletions
src/components/FinancialModule/FinancialSubmodule/BillModule.vue
View file @ 72b8ab9a
......@@ -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 @ 72b8ab9a
......@@ -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 @ 72b8ab9a
......@@ -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 @ 72b8ab9a
......@@ -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 @ 72b8ab9a
......@@ -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 @ 72b8ab9a
......@@ -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/leaderPay2.vue
View file @ 72b8ab9a
......@@ -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