11

pages/teamLeader/components/headeDatas.vue

@@ -127,6 +127,7 @@
 					<template v-else>暂无司机信息</template>
 				</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)">
 						<view class="nameTitle">
 							{{ datas.HotelOrderList[datas.hotelIndex].ReimburseList.ActualUseInfo?datas.HotelOrderList[datas.hotelIndex].ReimburseList.ActualUseInfo:datas.HotelOrderList[datas.hotelIndex].NewHotelName }}
@@ -213,9 +214,18 @@
 			</template>
 		</view>
 		<view class="headeDatasCurrency row justify-between" @click="showOptionVisible(2)">
-			<view>
+			<view v-if="params.type==1">
 				实际金额：¥{{ datas&&datas.TotalMoney>=0?datas.TotalMoney.toFixed(2):0.0 }}
 			</view>
+			<view v-else-if="params.type==2">
+				实际金额：¥{{ datas&&datas.HotelOrderList&&datas.HotelOrderList[datas.hotelIndex].TotalMoney>=0?datas.HotelOrderList[datas.hotelIndex].TotalMoney.toFixed(2):0.0 }}
+			</view>
+			<view v-else-if="params.type==3">
+				实际金额：¥{{ datas&&datas.DiningSummaryList[datas.diningIndex].TotalMoney>=0?datas.DiningSummaryList[datas.diningIndex].TotalMoney.toFixed(2):0.0 }}
+			</view>
+			<view v-else="params.type==4">
+				实际金额：¥{{ datas&&datas.ScenicStatisticsList[datas.scenicIndex].TotalMoney>=0?datas.ScenicStatisticsList[datas.scenicIndex].TotalMoney.toFixed(2):0.0 }}
+			</view>
 			<view class="row items-center">
 				<text style="color: red;">*</text>
 				<text class="ML10">币种：{{ currencyObj.name }}</text>

pages/teamLeader/components/report/productInfor2.vue

@@ -154,8 +154,7 @@
 						<text>数量</text>
 					</view>
 					<view class="inputBoxRight">
-						<input class="text-right" type="number" v-model="item.UserNum"
-							@input="getNum()" />
+						<input class="text-right" type="number" v-model="item.UserNum" @input="getNum()" />
 					</view>
 				</view>
 				<view class="inputBox row justify-between">
@@ -163,8 +162,7 @@
 						<text>单价</text>
 					</view>
 					<view class="inputBoxRight">
-						<input class="text-right" type="number" v-model="item.UnitPrice"
-							@input="getNum()" />
+						<input class="text-right" type="number" v-model="item.UnitPrice" @input="getNum()" />
 					</view>
 				</view>
 				<view class="inputBox row justify-between noBorder">
@@ -239,16 +237,25 @@
 			}
 		},
 		watch: {
-			dataIndex2: {
+
+			data: {
 				handler(newVal, oldVal) {
-					if (newVal != oldVal) {
+					if (newVal && oldVal) {
+						//切换酒店日期
+						if (newVal.dataIndex2 != oldVal.dataIndex2) {
+							this.initData();
+						}
+						//切换同一天酒店
+						else if (oldVal.HotelOrderListReport[this.dataIndex2].hotelIndex != newVal.HotelOrderListReport[
+								this.dataIndex2]
+							.hotelIndex) {
 							this.initData();
 						}
+					}
 				},
 				deep: true,
 				immediate: true
 			},
-
 		},
 		mounted() {
 			this.initData();

pages/teamLeader/components/report/productInfor3.vue

@@ -242,9 +242,12 @@
 			data: {
 				handler(newVal, oldVal) {
 					if (newVal && oldVal) {
+						//切换用餐日期
 						if (newVal.dataIndex3 != oldVal.dataIndex3) {
 							this.initData();
-						} else if (oldVal.DiningList[this.dataIndex3].diningIndex != newVal.DiningList[this.dataIndex3]
+						} 
+						//切换同一天餐厅
+						else if (oldVal.DiningList[this.dataIndex3].diningIndex != newVal.DiningList[this.dataIndex3]
 							.diningIndex) {
 							this.initData();
 						}

pages/teamLeader/components/report/productInfor4.vue

@@ -245,7 +245,7 @@
 							this.initData();
 						} 
 						//切换同一天的景点
-						else if (oldVal.ScenicList[this.dataIndex3].scenicIndex != newVal.ScenicList[this.dataIndex3]
+						else if (oldVal.ScenicList[this.dataIndex4].scenicIndex != newVal.ScenicList[this.dataIndex4]
 							.scenicIndex) {
 							this.initData();
 						}

pages/teamLeader/reimbursementInfor.vue

@@ -543,8 +543,6 @@
 				})
 				this.apipost("dmcstatistics_post_SetNewLeaderApplyList_V2", this.params, (res) => {
 					uni.hideLoading()
-					console.log("dmcstatistics_post_SetNewLeaderApplyList_V2", JSON.parse(JSON.stringify(res
-						.data)));
 					if (res.resultCode == 1) {
 						this.loading = false
 						uni.showToast({
@@ -554,7 +552,6 @@
 						});
 						this.init()
 					}
-
 				}, (failed) => {
 					this.loading = false
 					uni.showToast({
@@ -578,30 +575,109 @@
 					title: '数据加载中...'
 				});
 				this.apipost("dmcstatistics_post_GetNewLeaderPayMoneyStatics", this.msg, (res) => {
-					console.log("dmcstatistics_post_GetNewLeaderPayMoneyStatics", JSON.parse(JSON.stringify(res
-						.data)));
+
 					if (res.resultCode == 1) {
 						this.params = res.data;
+						console.log("dmcstatistics_post_GetNewLeaderPayMoneyStatics", JSON.parse(JSON.stringify(
+							this.params)));
 						for (let i = 1; i < 5; i++) {
 							this.$set(this.params, `dataIndex${i}`, 0);
 						}
 						this.$set(this.params, `type`, this.oldDataIndex);
-						for (let i = 0; i < this.params.ScenicList.length; i++) {
-							this.$set(this.params.ScenicList[i], `TotalMoney`, 0);
-							this.$set(this.params.ScenicList[i], `scenicIndex`, 0);
+
+						if (this.params.BusList && this.params.BusList.length > 0) {
+							for (let i = 0; i < this.params.BusList.length; i++) {
+								this.$set(this.params.BusList, `TotalMoney`, 0);
+							}
+							this.params.BusList.forEach(item => {
+								var totalMoney = 0;
+								if (item.ReimburseList && item.ReimburseList.ReimburseDetailsList && item
+									.ReimburseList.ReimburseDetailsList.length > 0) {
+									item.ReimburseList.ReimburseDetailsList.forEach(subItem => {
+										totalMoney += subItem.UserNum * subItem.UnitPrice
+									})
 								}
-						for (let i = 0; i < this.params.DiningList.length; i++) {
-							this.$set(this.params.DiningList[i], `TotalMoney`, 0);
-							this.$set(this.params.DiningList[i], `diningIndex`, 0);
+								item.TotalMoney = totalMoney;
+							})
 						}
+
+						if (this.params && this.params.HotelOrderListReport && this.params.HotelOrderListReport
+							.length > 0) {
 							for (let i = 0; i < this.params.HotelOrderListReport.length; i++) {
 								this.$set(this.params.HotelOrderListReport[i], `TotalMoney`, 0);
 								this.$set(this.params.HotelOrderListReport[i], `hotelIndex`, 0);
 							}
+							this.params.HotelOrderListReport.forEach(item => {
+								if (item.HotelOrderList && item.HotelOrderList.length > 0) {
+									item.HotelOrderList.forEach(subItem => {
+										var totalMoney = 0;
+										if (subItem.ReimburseList.ReimburseDetailsList && subItem
+											.ReimburseList.ReimburseDetailsList.length > 0) {
+											subItem.ReimburseList.ReimburseDetailsList.forEach(
+												childItem => {
+													totalMoney += childItem.UserNum * childItem
+														.UnitPrice
+												})
+										}
+										subItem.TotalMoney = totalMoney;
+									});
+								}
+							});
+							console.log("this.params.HotelOrderListReport",this.params.HotelOrderListReport)
+						}
+
+						if (this.params && this.params.DiningList && this.params.DiningList.length > 0) {
+							for (let i = 0; i < this.params.DiningList.length; i++) {
+								this.$set(this.params.DiningList[i], `TotalMoney`, 0);
+								this.$set(this.params.DiningList[i], `diningIndex`, 0);
+							}
+							this.params.DiningList.forEach(item => {
+								if (item.DiningSummaryList && item.DiningSummaryList.length > 0) {
+									item.DiningSummaryList.forEach(subItem => {
+										var totalMoney = 0;
+										if (subItem.ReimburseList && subItem.ReimburseList
+											.ReimburseDetailsList && subItem.ReimburseList
+											.ReimburseDetailsList.length > 0) {
+											subItem.ReimburseList.ReimburseDetailsList.forEach(
+												childItem => {
+													totalMoney += childItem.UserNum * childItem
+														.UnitPrice
+												})
+										}
+										subItem.TotalMoney = totalMoney;
+									})
+								}
+							})
+						}
+
+
+						if (this.params && this.params.ScenicList && this.params.ScenicList.length > 0) {
+							for (let i = 0; i < this.params.ScenicList.length; i++) {
+								this.$set(this.params.ScenicList[i], `TotalMoney`, 0);
+								this.$set(this.params.ScenicList[i], `scenicIndex`, 0);
+							}
+							this.params.ScenicList.forEach(item => {
+								if (item.ScenicStatisticsList && item.ScenicStatisticsList.length > 0) {
+									item.ScenicStatisticsList.forEach(subItem => {
+										var totalMoney = 0;
+										if (subItem.ReimburseList && subItem.ReimburseList
+											.ReimburseDetailsList && subItem.ReimburseList
+											.ReimburseDetailsList.length > 0) {
+											subItem.ReimburseList.ReimburseDetailsList.forEach(
+												childItem => {
+													totalMoney += childItem.UserNum * childItem
+														.UnitPrice
+												})
+										}
+										subItem.TotalMoney = totalMoney;
+									})
+								}
+
+							});
+						}
 						if (res.data.CountryIds) {
 							this.getShoppingType(res.data.CountryIds)
 						}
-
 						for (let i = 0; i < this.params.OtherOrderInfo.OtherList.length; i++) {
 							let obj = this.params.OtherOrderInfo.OtherList[i]
 							if (obj.UseDate == null && obj.UnitPrice == 0 && obj.Rebate == 0 && obj.VoucherPic !=