11

pages/teamLeader/components/report/productInfor3.vue

@@ -235,23 +235,19 @@
 				dataIndex: 0,
 				ReimIndex: 0,
 				ReimDatas: {},
-				BusList: [], //车信息
-				HotelOrderListReport: [], //酒店信息，合团
-				DiningList: [], //餐厅
-				ScenicList: [], //景点
-				OtherList: [], //其他订单信息
-				TipList: [], //小费收入
-				TeamList: [], //团费小计
-				SelfPlayingIncomeList: [], //自费收入
-				SelfPlayingExpendList: [], //自费支出
-				LeaderShopList: [], //购物报账
+				DiningList: [], //餐厅 
 			}
 		},
 		watch: {
-			dataIndex3: {
+			data: {
 				handler(newVal, oldVal) {
-					if (newVal != oldVal) {
-						this.initData();
+					if (newVal && oldVal) {
+						if (newVal.dataIndex3 != oldVal.dataIndex3) {
+							this.initData();
+						} else if (oldVal.DiningList[this.dataIndex3].diningIndex != newVal.DiningList[this.dataIndex3]
+							.diningIndex) {
+							this.initData();
+						}
 					}
 				},
 				deep: true,

pages/teamLeader/components/report/productInfor4.vue

@@ -237,16 +237,23 @@
 			}
 		},
 		watch: {
-			dataIndex4: {
+			data: {
 				handler(newVal, oldVal) {
-					if (newVal != oldVal) {
-						this.initData();
+					if (newVal && oldVal) {
+						//切换日期
+						if (newVal.dataIndex4 != oldVal.dataIndex4) {
+							this.initData();
+						} 
+						//切换同一天的景点
+						else if (oldVal.ScenicList[this.dataIndex3].scenicIndex != newVal.ScenicList[this.dataIndex3]
+							.scenicIndex) {
+							this.initData();
+						}
 					}
 				},
 				deep: true,
 				immediate: true
 			},
-
 		},
 		mounted() {
 			this.initData();
@@ -260,13 +267,6 @@
 				this.getTotal()
 			},
 			getNum() {
-				// if (type == '数量') {
-				// 	this.datas.ScenicStatisticsList[this.datas.scenicIndex].ReimburseList.ReimburseDetailsList[index]
-				// 		.UserNum = e.value
-				// } else if (type == '金额') {
-				// 	this.datas.ScenicStatisticsList[this.datas.scenicIndex].ReimburseList.ReimburseDetailsList[index]
-				// 		.UnitPrice = e.value
-				// }
 				this.getTotal()
 			},
 			getTotal() {

pages/teamLeader/reimbursementInfor.vue

@@ -101,7 +101,8 @@
 				@change="getNewData" :optionList="diningTypeList">
 			</productInfor3>
 			<!-- 门票信息-->
-			<productInfor4 v-else-if="params.type==4" :data="params" :dataIndex4="params.dataIndex4" @change="getNewData" :optionList="scenicTypeList">
+			<productInfor4 v-else-if="params.type==4" :data="params" :dataIndex4="params.dataIndex4"
+				@change="getNewData" :optionList="scenicTypeList">
 			</productInfor4>
 			<!-- 其它信息-->
 			<otherInfor1 v-else-if="params.type==5" :currencyList="currencyList" :data="params" @change="getNewData"
@@ -541,6 +542,7 @@
 					title: '保存中...'
 				})
 				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) {
@@ -550,7 +552,6 @@
 							icon: 'success',
 							duration: 2000
 						});
-						uni.hideLoading()
 						this.init()
 					}
 
@@ -573,7 +574,9 @@
 				this.scrollLeft = item.left
 			},
 			init() {
-				uni.showLoading()
+				uni.showLoading({
+					title: '数据加载中...'
+				});
 				this.apipost("dmcstatistics_post_GetNewLeaderPayMoneyStatics", this.msg, (res) => {
 					console.log("dmcstatistics_post_GetNewLeaderPayMoneyStatics", JSON.parse(JSON.stringify(res
 						.data)));