Skip to content

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

修复

parent 021e2907
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 177 additions and 136 deletions
pages/teamLeader/components/headeDatas.vue
View file @ 6ce2a44f
This diff is collapsed.
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