Skip to content

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

修复

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