11

pages/teamLeader/components/report/otherInfor1.vue

@@ -261,22 +261,6 @@
 			}
 		},
 		watch: {
-			data: {
-				handler(newVal, oldVal) {
-					this.params = JSON.parse(JSON.stringify(newVal))
-					this.OtherList = this.params.OtherOrderInfo.OtherList
-					this.OtherList.forEach(x => {
-						x.UseDate = x.UseDate ? this.$utils.formatDates(new Date(x.UseDate), 'yyyy-MM-dd') : null
-						let findIndex = this.options.findIndex(y => y.id == x.CostProject && x.ID > 0)
-						if (findIndex != -1) x.CostProjectStr = this.options[findIndex].name
-						let findIndex2 = this.currencyList.findIndex(y => y.id == x.Currency)
-						if (findIndex2 != -1) x.CurrencyName = this.currencyList[findIndex2].name
-					})
-					this.getRenderingData()
-				},
-				deep: true,
-				immediate: true
-			},
 			OtherList: {
 				handler(newVal, oldVal) {
 					this.updateData()
@@ -286,9 +270,21 @@
 			}
 		},
 		mounted() {
-
+			this.initData();
+			this.getRenderingData();
 		},
 		methods: {
+			initData() {
+				this.params = JSON.parse(JSON.stringify(this.data))
+				this.OtherList = this.params.OtherOrderInfo.OtherList
+				this.OtherList.forEach(x => {
+					x.UseDate = x.UseDate ? this.$utils.formatDates(new Date(x.UseDate), 'yyyy-MM-dd') : null
+					let findIndex = this.options.findIndex(y => y.id == x.CostProject && x.ID > 0)
+					if (findIndex != -1) x.CostProjectStr = this.options[findIndex].name
+					let findIndex2 = this.currencyList.findIndex(y => y.id == x.Currency)
+					if (findIndex2 != -1) x.CurrencyName = this.currencyList[findIndex2].name
+				})
+			},
 			showDateVisible(index) {
 				this.ReimIndex = index
 				this.time = this.OtherList[index].UseDate

pages/teamLeader/components/report/otherInfor2.vue

@@ -210,15 +210,6 @@
 			}
 		},
 		watch: {
-			data: {
-				handler(newVal, oldVal) {
-					this.params = JSON.parse(JSON.stringify(newVal))
-					this.TipList = this.params.OtherOrderInfo.TipList
-					this.getRenderingData()
-				},
-				deep: true,
-				immediate: true
-			},
 			TipList: {
 				handler(newVal, oldVal) {
 					this.updateData()
@@ -228,9 +219,14 @@
 			}
 		},
 		mounted() {
-
+			this.initData()
 		},
 		methods: {
+			initData() {
+				this.params = JSON.parse(JSON.stringify(this.data))
+				this.TipList = this.params.OtherOrderInfo.TipList
+				this.getRenderingData()
+			},
 			showDateVisible(index) {
 				this.ReimIndex = index
 				this.time = this.TipList[index].UseDate
@@ -242,7 +238,6 @@
 				this.TipList[this.ReimIndex].UseDate = this.time
 				this.dateVisible = false
 			},
-
 			delInfor(index) {
 				this.TipList.splice(index, 1)
 			},
@@ -273,7 +268,6 @@
 						id: this.TipList[this.ReimIndex].Currency,
 					}
 				}
-
 			},
 			close() {
 				this.optionVisible = false

pages/teamLeader/components/report/otherInfor3.vue

@@ -209,19 +209,6 @@
 			}
 		},
 		watch: {
-			data: {
-				handler(newVal, oldVal) {
-					this.params = JSON.parse(JSON.stringify(newVal))
-					this.TeamList = this.params.OtherOrderInfo.TeamList
-					this.TeamList.forEach(x => {
-						let findIndex = this.currencyList.findIndex(y => y.id == x.Currency)
-						if (findIndex != -1) x.CurrencyName = this.currencyList[findIndex].name
-					})
-					this.getRenderingData()
-				},
-				deep: true,
-				immediate: true
-			},
 			TeamList: {
 				handler(newVal, oldVal) {
 					this.updateData()
@@ -231,9 +218,18 @@
 			}
 		},
 		mounted() {
-
+			this.initData();
 		},
 		methods: {
+			initData() {
+				this.params = JSON.parse(JSON.stringify(this.data))
+				this.TeamList = this.params.OtherOrderInfo.TeamList
+				this.TeamList.forEach(x => {
+					let findIndex = this.currencyList.findIndex(y => y.id == x.Currency)
+					if (findIndex != -1) x.CurrencyName = this.currencyList[findIndex].name
+				})
+				this.getRenderingData()
+			},
 			showDateVisible(index) {
 				this.ReimIndex = index
 				this.time = this.TeamList[index].UseDate

pages/teamLeader/components/report/otherInfor4.vue

@@ -233,20 +233,6 @@
 			}
 		},
 		watch: {
-			data: {
-				handler(newVal, oldVal) {
-					this.params = JSON.parse(JSON.stringify(newVal))
-					this.SelfPlayingIncomeList = this.params.OtherOrderInfo.SelfPlayingIncomeList
-					this.SelfPlayingIncomeList.forEach(x => {
-						x.UseDate = x.UseDate ? this.$utils.formatDates(new Date(x.UseDate), 'yyyy-MM-dd') : null
-						let findIndex = this.currencyList.findIndex(y => y.id == x.Currency)
-						if (findIndex != -1) x.CurrencyName = this.currencyList[findIndex].name
-					})
-					this.getRenderingData()
-				},
-				deep: true,
-				immediate: true
-			},
 			SelfPlayingIncomeList: {
 				handler(newVal, oldVal) {
 					this.updateData()
@@ -256,9 +242,19 @@
 			}
 		},
 		mounted() {
-
+			this.initData();
 		},
 		methods: {
+			initData() {
+				this.params = JSON.parse(JSON.stringify(this.data))
+				this.SelfPlayingIncomeList = this.params.OtherOrderInfo.SelfPlayingIncomeList
+				this.SelfPlayingIncomeList.forEach(x => {
+					x.UseDate = x.UseDate ? this.$utils.formatDates(new Date(x.UseDate), 'yyyy-MM-dd') : null
+					let findIndex = this.currencyList.findIndex(y => y.id == x.Currency)
+					if (findIndex != -1) x.CurrencyName = this.currencyList[findIndex].name
+				})
+				this.getRenderingData()
+			},
 			showDateVisible(index) {
 				this.ReimIndex = index
 				this.time = this.SelfPlayingIncomeList[index].UseDate

pages/teamLeader/components/report/otherInfor5.vue

@@ -244,20 +244,6 @@
 			}
 		},
 		watch: {
-			data: {
-				handler(newVal, oldVal) {
-					this.params = JSON.parse(JSON.stringify(newVal))
-					this.SelfPlayingExpendList = this.params.OtherOrderInfo.SelfPlayingExpendList
-					this.SelfPlayingExpendList.forEach(x => {
-						x.UseDate = x.UseDate ? this.$utils.formatDates(new Date(x.UseDate), 'yyyy-MM-dd') : null
-						let findIndex = this.currencyList.findIndex(y => y.id == x.Currency)
-						if (findIndex != -1) x.CurrencyName = this.currencyList[findIndex].name
-					})
-					this.getRenderingData()
-				},
-				deep: true,
-				immediate: true
-			},
 			SelfPlayingExpendList: {
 				handler(newVal, oldVal) {
 					this.updateData()
@@ -267,9 +253,19 @@
 			}
 		},
 		mounted() {
-
+			this.initData();
 		},
 		methods: {
+			initData() {
+				this.params = JSON.parse(JSON.stringify(this.data))
+				this.SelfPlayingExpendList = this.params.OtherOrderInfo.SelfPlayingExpendList
+				this.SelfPlayingExpendList.forEach(x => {
+					x.UseDate = x.UseDate ? this.$utils.formatDates(new Date(x.UseDate), 'yyyy-MM-dd') : null
+					let findIndex = this.currencyList.findIndex(y => y.id == x.Currency)
+					if (findIndex != -1) x.CurrencyName = this.currencyList[findIndex].name
+				})
+				this.getRenderingData()
+			},
 			showDateVisible(index) {
 				this.ReimIndex = index
 				this.time = this.SelfPlayingExpendList[index].UseDate

pages/teamLeader/components/report/otherInfor6.vue

@@ -254,23 +254,7 @@
 			}
 		},
 		watch: {
-			data: {
-				handler(newVal, oldVal) {
-					this.params = JSON.parse(JSON.stringify(newVal))
-					this.LeaderShopList = this.params.LeaderShopList
-					this.LeaderShopList.forEach(x => {
-						x.EnterTime = x.EnterTime ? this.$utils.formatDates(new Date(x.EnterTime), 'yyyy-MM-dd') :
-							null
-						let findIndex = this.options.findIndex(y => y.id == x.ShopId)
-						if (findIndex != -1) x.ShopStr = this.options[findIndex].name
-						let findIndex2 = this.currencyList.findIndex(y => y.id == x.CurrencyId)
-						if (findIndex2 != -1) x.CurrencyName = this.currencyList[findIndex2].name
-					})
-					this.getRenderingData()
-				},
-				deep: true,
-				immediate: true
-			},
+
 			LeaderShopList: {
 				handler(newVal, oldVal) {
 					this.updateData()
@@ -280,9 +264,22 @@
 			}
 		},
 		mounted() {
-
+			this.initData();
 		},
 		methods: {
+			initData() {
+				this.params = JSON.parse(JSON.stringify(this.data))
+				this.LeaderShopList = this.params.LeaderShopList
+				this.LeaderShopList.forEach(x => {
+					x.EnterTime = x.EnterTime ? this.$utils.formatDates(new Date(x.EnterTime), 'yyyy-MM-dd') :
+						null
+					let findIndex = this.options.findIndex(y => y.id == x.ShopId)
+					if (findIndex != -1) x.ShopStr = this.options[findIndex].name
+					let findIndex2 = this.currencyList.findIndex(y => y.id == x.CurrencyId)
+					if (findIndex2 != -1) x.CurrencyName = this.currencyList[findIndex2].name
+				})
+				this.getRenderingData()
+			},
 			showDateVisible(index) {
 				this.ReimIndex = index
 				this.time = this.LeaderShopList[index].EnterTime

pages/teamLeader/reimbursementInfor.vue

@@ -542,7 +542,6 @@
 					title: '保存中...'
 				})
 				this.apipost("dmcstatistics_post_SetNewLeaderApplyList_V2", this.params, (res) => {
-					uni.hideLoading()
 					if (res.resultCode == 1) {
 						this.loading = false
 						uni.showToast({
@@ -552,6 +551,7 @@
 						});
 						this.init()
 					}
+					uni.hideLoading()
 				}, (failed) => {
 					this.loading = false
 					uni.showToast({
@@ -623,7 +623,7 @@
 									});
 								}
 							});
-							console.log("this.params.HotelOrderListReport",this.params.HotelOrderListReport)
+							console.log("this.params.HotelOrderListReport", this.params.HotelOrderListReport)
 						}
 
 						if (this.params && this.params.DiningList && this.params.DiningList.length > 0) {