Skip to content

J
jz_Travel
Commit 6ce2a44f authored by youjie's avatar youjie
Browse files
Options

修复

parent 021e2907
Show whitespace changes
Inline Side-by-side
Showing with 177 additions and 136 deletions
pages/teamLeader/components/headeDatas.vue
View file @ 6ce2a44f
......@@ -128,39 +128,42 @@
</view>
<view v-if="params.type>1&&params.type<5" class="row justify-center items-center">
<view v-if="params.type==2" class="row justify-center items-center" @click="showOptionVisible(3)">
<template v-if="datas.HotelOrderList[datas.hotelIndex].ReimburseList.ActualUseInfo">
<view v-if="params.type==2" class="row justify-center items-center">
<view class="row" v-if="datas.HotelOrderList[datas.hotelIndex].ReimburseList.ActualUseInfo"
@click="showOptionVisible(3)">
<view class="nameTitle">
{{ datas.HotelOrderList[datas.hotelIndex].ReimburseList.ActualUseInfo?datas.HotelOrderList[datas.hotelIndex].ReimburseList.ActualUseInfo:datas.HotelOrderList[datas.hotelIndex].NewHotelName }}
</view>
<img class="headeDatasTimeImg2 PL20"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638869669873781692.png" />
</template>
</view>
<view v-else class="nameTitle">
暂无酒店信息
</view>
</view>
<view v-if="params.type==3" class="row justify-center items-center" @click="showOptionVisible(4)">
<template v-if="datas.DiningSummaryList[datas.diningIndex].ReimburseList.ActualUseInfo">
<view v-if="params.type==3" class="row justify-center items-center">
<view class="row" v-if="datas.DiningSummaryList[datas.diningIndex].ReimburseList.ActualUseInfo"
@click="showOptionVisible(4)">
<view class="nameTitle">
{{ datas.DiningSummaryList[datas.diningIndex].ReimburseList.ActualUseInfo?datas.DiningSummaryList[datas.diningIndex].ReimburseList.ActualUseInfo:datas.DiningSummaryList[datas.diningIndex].NewDiningName }}
({{ datas.DiningSummaryList[datas.diningIndex].UseDinnerTypeStr }})
</view>
<img class="headeDatasTimeImg2 PL20"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638869669873781692.png" />
</template>
</view>
<view v-else class="nameTitle">
暂无餐食信息
</view>
</view>
<view v-if="params.type==4" class="row justify-center items-center" @click="showOptionVisible(5)">
<template v-if="datas.ScenicStatisticsList[datas.scenicIndex].ReimburseList.ActualUseInfo">
<view v-if="params.type==4" class="row justify-center items-center">
<view class="row" v-if="datas.ScenicStatisticsList[datas.scenicIndex].ReimburseList.ActualUseInfo"
@click="showOptionVisible(5)">
<view class="nameTitle">
{{ datas.ScenicStatisticsList[datas.scenicIndex].ReimburseList.ActualUseInfo?datas.ScenicStatisticsList[datas.scenicIndex].ReimburseList.ActualUseInfo:datas.ScenicStatisticsList[datas.scenicIndex].ScenicName }}
</view>
<img class="headeDatasTimeImg2 PL20"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638869669873781692.png" />
</template>
</view>
<view v-else class="nameTitle">
暂无门票信息
</view>
......@@ -184,7 +187,7 @@
v-else-if="params.type==4">{{ datas.ScenicStatisticsList[datas.scenicIndex].TradingTotalPrice?datas.ScenicStatisticsList[datas.scenicIndex].TradingTotalPrice:0 }}</text>
</view>
</view>
<view v-if="params.type==1" class="headeDatasCenterBox car" stripe>
<view v-if="params.type==1" class="headeDatasCenterBox car">
<view class="headeDatasCenter row">
<view>车牌号</view>
<view class="flex1">{{ datas.BusCode?datas.BusCode:'暂无' }}</view>
......@@ -198,12 +201,13 @@
<view class="flex1">{{ datas.AirportPickUpStr?datas.AirportPickUpStr:'暂无' }}</view>
</view>
</view>
<view v-if="params.type==2" class="headeDatasCenterBox" stripe>
<view v-if="params.type==2" class="headeDatasCenterBox">
<view class="headeDatasCenter row">
<view>床位</view>
<view>占床：{{ datas.HotelOrderList[datas.hotelIndex].HouseStatistics.NeedBed }}</view>
<view class="flex1">不占床：{{ datas.HotelOrderList[datas.hotelIndex].HouseStatistics.NoNeedBed }}</view>
<view>占床：{{ datas.HotelOrderList[datas.hotelIndex].HouseStatistics.NeedBed?datas.HotelOrderList[datas.hotelIndex].HouseStatistics.NeedBed:'暂无' }}</view>
<view class="flex1">不占床：{{ datas.HotelOrderList[datas.hotelIndex].HouseStatistics.NoNeedBed?datas.HotelOrderList[datas.hotelIndex].HouseStatistics.NoNeedBed:'暂无' }}</view>
</view>
<template v-if="datas&&datas.HotelOrderList&&datas.HotelOrderList[datas.hotelIndex]&&datas.HotelOrderList[datas.hotelIndex].OrderDetailsList">
<template v-for="item in datas.HotelOrderList[datas.hotelIndex].OrderDetailsList">
<view class="headeDatasCenter row" v-if="item.HouseTypeCount>0">
<view>{{ getHotelName(item.HouseType) }}</view>
......@@ -211,8 +215,10 @@
<view class="flex1">单价：¥{{ item.UnitPrice }}</view>
</view>
</template>
</template>
</view>
<view v-if="params.type==3" class="headeDatasCenterBox din" stripe>
<view v-if="params.type==3" class="headeDatasCenterBox din">
<template v-if="datas&&datas.DiningSummaryList&&datas.DiningSummaryList[datas.diningIndex]">
<template v-for="item in datas.DiningSummaryList[datas.diningIndex].DiningPriceList">
<view class="headeDatasCenter row" v-if="item.UsePeopleNum>0">
<view>{{ getPeopleName(item.PeopleType) }}</view>
......@@ -220,8 +226,10 @@
<view class="flex1">单价：¥{{ item.PeoplePrice }}</view>
</view>
</template>
</template>
</view>
<view v-if="params.type==4" class="headeDatasCenterBox" stripe>
<view v-if="params.type==4" class="headeDatasCenterBox">
<template v-if="datas&&datas.ScenicStatisticsList&&datas.ScenicStatisticsList[datas.scenicIndex]">
<template v-for="item in datas.ScenicStatisticsList[datas.scenicIndex].TicketPriceList">
<view class="headeDatasCenter row" v-if="item.PeopleNum>0">
<view>{{ getPeopleName(item.PeopleType) }}</view>
......@@ -229,6 +237,7 @@
<view class="flex1">单价：¥{{ item.PeoplePrice }}</view>
</view>
</template>
</template>
</view>
<view class="headeDatasCurrency row justify-between" @click="showOptionVisible(2)">
<view v-if="params.type==1">
......@@ -436,6 +445,7 @@
}
this.datas = this.ScenicList[this.dataIndex]
this.scenicsList = []
if(this.datas&&this.datas.ScenicStatisticsList){
this.datas.ScenicStatisticsList.forEach(x => {
this.scenicsList.push({
name: x.ScenicName,
......@@ -444,10 +454,13 @@
})
this.scenicObj = JSON.parse(JSON.stringify(this.scenicsList[this.datas.scenicIndex]))
}
}
let dates = this.dateList.filter(x => {
return x.id == this.ScenicList[this.dataIndex].Id
})
if (dates.length == 0) dates = [this.dateList[0]]
if(dates&&dates[0]){
this.dateObj = JSON.parse(JSON.stringify(dates[0]))
let list = this.currencyList.filter(x => {
......@@ -472,6 +485,8 @@
}
}
}
}
},
// 餐食
getRenderingDataDining(type) {
......@@ -489,6 +504,7 @@
}
this.datas = this.DiningList[this.dataIndex]
this.diningList = []
if(this.datas&&this.datas.DiningSummaryList){
this.datas.DiningSummaryList.forEach(x => {
this.diningList.push({
name: x.DiningName,
......@@ -497,12 +513,13 @@
})
this.diningObj = JSON.parse(JSON.stringify(this.diningList[this.datas.diningIndex]))
}
}
let dates = this.dateList.filter(x => {
return x.id == this.DiningList[this.dataIndex].Id
})
if (dates.length == 0) dates = [this.dateList[0]]
if(dates&&dates[0]){
this.dateObj = JSON.parse(JSON.stringify(dates[0]))
let list = this.currencyList.filter(x => {
return x.id == this.DiningList[this.dataIndex].DiningSummaryList[this.datas.diningIndex]
.ReimburseList.CurrencyId
......@@ -526,6 +543,8 @@
}
}
}
}
},
// 酒店
getRenderingDataHotel(type) {
......@@ -543,6 +562,7 @@
}
this.datas = this.HotelOrderListReport[this.dataIndex]
this.hotelList = []
if(this.datas&&this.datas.HotelOrderList){
this.datas.HotelOrderList.forEach(x => {
this.hotelList.push({
name: x.HotelName,
......@@ -551,12 +571,16 @@
})
this.hotelObj = JSON.parse(JSON.stringify(this.hotelList[this.datas.hotelIndex]))
}
}
let dates = this.dateList.filter(x => {
return x.id == this.HotelOrderListReport[this.dataIndex].Id
})
if (dates.length == 0) dates = [this.dateList[0]]
if(dates&&dates[0]){
this.dateObj = JSON.parse(JSON.stringify(dates[0]))
}
if(this.HotelOrderListReport&&this.HotelOrderListReport[this.dataIndex]&&this.HotelOrderListReport[this.dataIndex].HotelOrderList[this.datas.hotelIndex]){
let list = this.currencyList.filter(x => {
return x.id == this.HotelOrderListReport[this.dataIndex].HotelOrderList[this.datas.hotelIndex]
.ReimburseList.CurrencyId
......@@ -578,6 +602,7 @@
}
}
}
}
},
// 车
getRenderingDataBus(type) {
......
pages/teamLeader/components/report/otherInfor6.vue
View file @ 6ce2a44f
......@@ -159,7 +159,7 @@
<text>购物店名称</text>
</view>
<!--日本线选择购物店-->
<view v-if="data&&data.IsSelectShop">
<view v-if="params&&params.IsSelectShop">
<view class="inputBoxRight row" @click="showOptionVisible(i,1)">
<text>{{item.ShopName?item.ShopName:'选择购物店名称'}}</text>
<u-icon class="iconRight" name="arrow-down" color="#BBBBBB" size="42" />
......
pages/teamLeader/components/report/productInfor1.vue
View file @ 6ce2a44f
......@@ -382,7 +382,7 @@
UserNum: 0,
UnitPrice: 0,
}
this.datas.ReimburseList.ReimburseDetailsList.push(JSON.parse(JSON.stringify(this.ReimDatas)))
if(this.datas&&this.datas.ReimburseList&&this.datas.ReimburseList.ReimburseDetailsList) this.datas.ReimburseList.ReimburseDetailsList.push(JSON.parse(JSON.stringify(this.ReimDatas)))
},
onSuccess(infor) {
this.datas.ReimburseList.VoucherPicList.push({
......
pages/teamLeader/components/report/productInfor2.vue
View file @ 6ce2a44f
......@@ -137,7 +137,7 @@
</style>
<template>
<view>
<view class="inforCenterBox PX30 MT20" v-if="datas.HotelOrderList[datas.hotelIndex]">
<view class="inforCenterBox PX30 MT20" v-if="datas&&datas.HotelOrderList&&datas.HotelOrderList[datas.hotelIndex]">
<view class="inforCenter"
v-for="(item,index) in datas.HotelOrderList[datas.hotelIndex].ReimburseList.ReimburseDetailsList"
:key="index">
......@@ -312,8 +312,10 @@
this.HotelOrderListReport = this.params.HotelOrderListReport //酒店信息，合团
this.dataIndex = this.dataIndex2;
this.datas = this.HotelOrderListReport[this.dataIndex]
if(this.HotelOrderListReport&&this.HotelOrderListReport[this.dataIndex]&&this.HotelOrderListReport[this.dataIndex].ReimburseList){
this.ReimDatas = JSON.parse(JSON.stringify(this.datas.HotelOrderList[this.datas.hotelIndex].ReimburseList.ReimburseDetailsList[0]))
this.getTotal()
}
},
getTotal() {
let total = 0
......@@ -392,11 +394,11 @@
UserNum: 0,
UnitPrice: 0,
}
this.datas.HotelOrderList[this.datas.hotelIndex].ReimburseList.ReimburseDetailsList.push(JSON.parse(JSON
if(this.datas&&this.datas.HotelOrderList&&this.datas.HotelOrderList[this.datas.hotelIndex]&&this.datas.HotelOrderList[this.datas.hotelIndex].ReimburseList) this.datas.HotelOrderList[this.datas.hotelIndex].ReimburseList.ReimburseDetailsList.push(JSON.parse(JSON
.stringify(this.ReimDatas)))
},
onSuccess(infor) {
this.datas.HotelOrderList[this.datas.hotelIndex].ReimburseList.VoucherPicList.push({
if(this.datas&&this.datas.HotelOrderList&&this.datas.HotelOrderList[this.datas.hotelIndex]&&this.datas.HotelOrderList[this.datas.hotelIndex].ReimburseList) this.datas.HotelOrderList[this.datas.hotelIndex].ReimburseList.VoucherPicList.push({
FileName: infor.name,
url: infor.url,
})
......
pages/teamLeader/components/report/productInfor3.vue
View file @ 6ce2a44f
......@@ -308,11 +308,13 @@
},
getTotal() {
let total = 0
if(this.datas&&this.datas.DiningSummaryList&&this.datas.DiningSummaryList[this.datas.diningIndex]) {
this.datas.DiningSummaryList[this.datas.diningIndex].ReimburseList.ReimburseDetailsList.forEach(x => {
total += x.UserNum * x.UnitPrice
})
this.datas.DiningSummaryList[this.datas.diningIndex].TotalMoney = total
this.updateData()
}
},
delInfor(index) {
this.datas.DiningSummaryList[this.datas.diningIndex].ReimburseList.ReimburseDetailsList.splice(index, 1);
......@@ -333,7 +335,8 @@
},
getRenderingData() {
this.datas = this.DiningList[this.dataIndex]
this.ReimDatas = JSON.parse(JSON.stringify(this.datas.DiningSummaryList[this.datas.diningIndex]
if(this.datas&&this.datas.DiningSummaryList&&this.datas.DiningSummaryList[this.datas.diningIndex]) this.ReimDatas = JSON.parse(JSON.stringify(this.datas.DiningSummaryList[this.datas.diningIndex]
.ReimburseList.ReimburseDetailsList[0]))
},
showOptionVisible(index) {
......@@ -385,11 +388,11 @@
UserNum: 0,
UnitPrice: 0,
}
this.datas.DiningSummaryList[this.datas.diningIndex].ReimburseList.ReimburseDetailsList.push(JSON.parse(
if(this.datas&&this.datas.DiningSummaryList&&this.datas.DiningSummaryList[this.datas.diningIndex]&&this.datas.DiningSummaryList[this.datas.diningIndex].ReimburseList) this.datas.DiningSummaryList[this.datas.diningIndex].ReimburseList.ReimburseDetailsList.push(JSON.parse(
JSON.stringify(this.ReimDatas)))
},
onSuccess(infor) {
this.datas.DiningSummaryList[this.datas.diningIndex].ReimburseList.VoucherPicList.push({
if(this.datas&&this.datas.DiningSummaryList&&this.datas.DiningSummaryList[this.datas.diningIndex]&&this.datas.DiningSummaryList[this.datas.diningIndex].ReimburseList) this.datas.DiningSummaryList[this.datas.diningIndex].ReimburseList.VoucherPicList.push({
FileName: infor.name,
url: infor.url,
})
......
pages/teamLeader/components/report/productInfor4.vue
View file @ 6ce2a44f
......@@ -310,11 +310,13 @@
},
getTotal() {
let total = 0
if(this.datas&&this.datas.ScenicStatisticsList&&this.datas.ScenicStatisticsList[this.datas.scenicIndex]&&this.datas.ScenicStatisticsList[this.datas.scenicIndex].ReimburseList.ReimburseDetailsList.length>0){
this.datas.ScenicStatisticsList[this.datas.scenicIndex].ReimburseList.ReimburseDetailsList.forEach(x => {
total += x.UserNum * x.UnitPrice
})
this.datas.ScenicStatisticsList[this.datas.scenicIndex].TotalMoney = total
this.updateData()
}
},
delInfor(index) {
this.datas.ScenicStatisticsList[this.datas.scenicIndex].ReimburseList.ReimburseDetailsList.splice(index, 1)
......@@ -335,7 +337,8 @@
},
getRenderingData() {
this.datas = this.ScenicList[this.dataIndex]
this.ReimDatas = JSON.parse(JSON.stringify(this.datas.ScenicStatisticsList[this.datas.scenicIndex]
if(this.datas&&this.datas.ScenicStatisticsList&&this.datas.ScenicStatisticsList[this.datas.scenicIndex]&&this.datas.ScenicStatisticsList[this.datas.scenicIndex].ReimburseList.ReimburseDetailsList.length>0) this.ReimDatas = JSON.parse(JSON.stringify(this.datas.ScenicStatisticsList[this.datas.scenicIndex]
.ReimburseList.ReimburseDetailsList[0]))
},
showOptionVisible(index) {
......@@ -387,11 +390,11 @@
UserNum: 0,
UnitPrice: 0,
}
this.datas.ScenicStatisticsList[this.datas.scenicIndex].ReimburseList.ReimburseDetailsList.push(JSON.parse(
if(this.datas&&this.datas.ScenicStatisticsList&&this.datas.ScenicStatisticsList[this.datas.scenicIndex]&&this.datas.ScenicStatisticsList[this.datas.scenicIndex].ReimburseList) this.datas.ScenicStatisticsList[this.datas.scenicIndex].ReimburseList.ReimburseDetailsList.push(JSON.parse(
JSON.stringify(this.ReimDatas)))
},
onSuccess(infor) {
this.datas.ScenicStatisticsList[this.datas.scenicIndex].ReimburseList.VoucherPicList.push({
if(this.datas&&this.datas.ScenicStatisticsList&&this.datas.ScenicStatisticsList[this.datas.scenicIndex]&&this.datas.ScenicStatisticsList[this.datas.scenicIndex].ReimburseList) this.datas.ScenicStatisticsList[this.datas.scenicIndex].ReimburseList.VoucherPicList.push({
FileName: infor.name,
url: infor.url,
})
......
pages/teamLeader/reimbursementInfor.vue
View file @ 6ce2a44f
......@@ -514,10 +514,16 @@
}
if (msg == '' && obj.ShopId == null &&
(obj.ShopMoney > 0 || obj.CurrencyId || obj.VoucherPicList.length > 0 ||
obj.Remark != null || obj.EnterTime != null)
obj.Remark != null || obj.EnterTime != null)&&this.params.IsSelectShop
) {
msg = `请选择购物名称`
}
if (msg == '' && obj.ShopName == null &&
(obj.ShopMoney > 0 || obj.CurrencyId || obj.VoucherPicList.length > 0 ||
obj.Remark != null || obj.EnterTime != null)&&!this.params.IsSelectShop
) {
msg = `请输入购物名称`
}
if (msg == '' && (obj.CurrencyId == 0 || obj.CurrencyId == null) &&
(obj.ShopMoney > 0 || obj.ShopId != null || obj.VoucherPicList.length > 0 ||
obj.Remark != null || obj.EnterTime != null)
......@@ -543,11 +549,13 @@
icon: "none",
})
}
if (this.loading) return
this.loading = true
uni.showLoading({
title: '保存中...'
})
return
this.apipost("dmcstatistics_post_SetNewLeaderApplyList_V2", this.params, (res) => {
this.loading = false;
if (res.resultCode == 1) {
......
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