Skip to content

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

no message

parent 290145b7
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 48 deletions
pages/teamLeader/billDetails.vue
View file @ a47c9888
...@@ -165,33 +165,35 @@ ...@@ -165,33 +165,35 @@
</view> </view>
</view> </view>
<view> <view>
<!-- <template v-for="(item,index) in TeamUsePriceList"> <template v-if="TeamUsePriceList&&TeamUsePriceList.length>0">
<view v-if="item.TotalPrice>0" class="billDetailsCTop one"> <template v-for="(item,index) in TeamUsePriceList">
<view class="billDetailsCHeader row justify-between items-center" <view class="billDetailsCTop one">
@click="showTeamUse(index)"> <view class="billDetailsCHeader row justify-between items-center"
<view class="billDetailsCHeaderL"> @click="showTeamUse(index)">
<view class="fz28">{{ item.month }}月{{ item.day }}日</view> <view class="billDetailsCHeaderL">
<view class="fz20 MT10">{{ item.year }}年</view> <view class="fz28">{{ item.month }}月{{ item.day }}日</view>
</view> <view class="fz20 MT10">{{ item.year }}年</view>
<view class="billDetailsCHeaderR row items-center fontBold"> </view>
<text>¥{{ item.TotalPrice }}</text> <view class="billDetailsCHeaderR row items-center fontBold">
<img class="ML20" :src="!item.showList?downImg[0]:downImg[1]"/> <text>¥{{ item.TotalPrice }}</text>
<img class="ML20" :src="!item.showList?downImg[0]:downImg[1]"/>
</view>
</view> </view>
</view> <view v-if="item.showList">
<view v-if="item.showList"> <template v-for="child in item.list">
<template v-for="child in item.list"> <view class="billDetailsCCBox row items-center fz28">
<view v-if="child.price>0" class="billDetailsCCBox row items-center fz28"> <img :src="typeImgs[child.index]" />
<img :src="typeImgs[child.index]" /> <view class="billDetailsCCR flex1 row justify-between items-center">
<view class="billDetailsCCR flex1 row justify-between items-center"> <view class="ML23 fz28">{{ child.name }}</view>
<view class="ML23 fz28">{{ child.name }}</view> <text class="fz28 fontWeight500">¥{{ child.price }}</text>
<text class="fz28 fontWeight500">¥{{ child.price }}</text> </view>
</view> </view>
</view> </template>
</template> <u-empty v-if="item.list.length==0||!item.list" text="暂无数据" mode="data" paddingTop="0"></u-empty>
<u-empty v-if="item.list.length==0||!item.list" text="暂无数据" mode="data" paddingTop="0"></u-empty> </view>
</view> </view>
</view> </template>
</template> --> </template>
<view class="billDetailsCTop"> <view class="billDetailsCTop">
<view class="billDetailsCHeader billDetailsCHeaderOth row justify-between items-center" <view class="billDetailsCHeader billDetailsCHeaderOth row justify-between items-center"
@click="showOther=!showOther"> @click="showOther=!showOther">
...@@ -264,7 +266,7 @@ export default { ...@@ -264,7 +266,7 @@ export default {
date: '', date: '',
year: '', year: '',
month: '', month: '',
showList: false, showList: true,
list:[] list:[]
}, },
showOther: false, showOther: false,
...@@ -348,6 +350,7 @@ export default { ...@@ -348,6 +350,7 @@ export default {
price: x.DiningTotalPrice, price: x.DiningTotalPrice,
index: 3, index: 3,
}) })
this.TotalList[0].price += x.BusTotalPrice this.TotalList[0].price += x.BusTotalPrice
this.TotalList[1].price += x.HouseTotalPrice this.TotalList[1].price += x.HouseTotalPrice
this.TotalList[2].price += x.ScenicTotalPrice this.TotalList[2].price += x.ScenicTotalPrice
...@@ -368,9 +371,10 @@ export default { ...@@ -368,9 +371,10 @@ export default {
this.apipost("dmcstatistics_post_GetTotalPrice_V2", this.msg, (res) => { this.apipost("dmcstatistics_post_GetTotalPrice_V2", this.msg, (res) => {
if (res.resultCode == 1) { if (res.resultCode == 1) {
uni.hideLoading() uni.hideLoading()
this.dataList = res.data.sort((a,b)=>{ this.dataList = res.data
return new Date(b.TeamUsePriceList[0].UseTime) - new Date(a.TeamUsePriceList[0].UseTime) //this.dataList = res.data.sort((a,b)=>{
}) // return new Date(b.TeamUsePriceList[0].UseTime) - new Date(a.TeamUsePriceList[0].UseTime)
// })
this.dataList.forEach(x=>{ this.dataList.forEach(x=>{
if(x.TeamUsePriceList) x.TeamUsePriceList.forEach(y=>{ if(x.TeamUsePriceList) x.TeamUsePriceList.forEach(y=>{
y.date = this.$utils.formatDates(new Date(y.UseTime),'yyyy-MM-dd') y.date = this.$utils.formatDates(new Date(y.UseTime),'yyyy-MM-dd')
...@@ -387,6 +391,9 @@ export default { ...@@ -387,6 +391,9 @@ export default {
id: res.data[i].CurrencyId, id: res.data[i].CurrencyId,
}) })
} }
if(this.dataList[this.currentIndex].OtherTotalPriceList&&this.dataList[this.currentIndex].OtherTotalPriceList.length>0){
this.showOther = true
}
this.newTeamUsePrice() this.newTeamUsePrice()
} }
}, (failed) => { }, (failed) => {
......
pages/teamLeader/schedule.vue
View file @ a47c9888
...@@ -370,26 +370,45 @@ export default { ...@@ -370,26 +370,45 @@ export default {
arrList(this.inforData1.PrincipalList) arrList(this.inforData1.PrincipalList)
this.PrincipalList.forEach((item,index)=> { this.PrincipalList.forEach((item,index)=> {
let data = this.inforData1.PrincipalList[0] let data = this.inforData1.PrincipalList[0]
data.CreateByNameList.push({ let findIndex1 = data.CreateByNameList.findIndex(x=>x.name==item.CreateByName)
name: item.CreateByName, if(findIndex1==-1){
tel: item.CreateByMobile data.CreateByNameList.push({
}) name: item.CreateByName,
data.HConfirmNameList.push({ tel: item.CreateByMobile
name:item.HConfirmName, })
tel:item.HConfirmMobile }
})
data.BConfirmNameList.push({ let findIndex2 = data.HConfirmNameList.findIndex(x=>x.name==item.HConfirmName)
name:item.BConfirmName, if(findIndex2==-1){
tel:item.BConfirmMobile data.HConfirmNameList.push({
}) name:item.HConfirmName,
data.DConfirmNameList.push({ tel:item.HConfirmMobile
name:item.DConfirmName, })
tel:item.DConfirmMobile }
})
data.TConfirmNameList.push({ let findIndex3 = data.BConfirmNameList.findIndex(x=>x.name==item.BConfirmName)
name:item.TConfirmName, if(findIndex3==-1){
tel:item.TConfirmMobile data.BConfirmNameList.push({
}) name:item.BConfirmName,
tel:item.BConfirmMobile
})
}
let findIndex4 = data.DConfirmNameList.findIndex(x=>x.name==item.DConfirmName)
if(findIndex4==-1){
data.DConfirmNameList.push({
name:item.DConfirmName,
tel:item.DConfirmMobile
})
}
let findIndex5 = data.TConfirmNameList.findIndex(x=>x.name==item.TConfirmName)
if(findIndex5==-1){
data.TConfirmNameList.push({
name:item.TConfirmName,
tel:item.TConfirmMobile
})
}
}) })
uni.hideLoading() uni.hideLoading()
} }
......
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