提交更新

src/pages/SchoolReport/SchoolReport.vue

@@ -41,8 +41,8 @@
 			<view class="school-report-context">
 				<view class="school-report-context-tab">
 					<view class="school-report-context-tab-item">
-						<view v-if="isService" class="school-report-context-tab-item-one" :class="tabIndex==1?'active':''"
-							@tap="tabTap(1)">
+						<view v-if="isService" class="school-report-context-tab-item-one"
+							:class="tabIndex==1?'active':''" @tap="tabTap(1)">
 							<text>消费报告</text>
 						</view>
 						<view v-if="isAttendanceService" class="school-report-context-tab-item-one"
@@ -814,7 +814,7 @@
 				// 会员信息 
 				// 消费
 				isOpen: false,
-				isService:false,
+				isService: false,
 				// 出入校
 				isAttendanceOpen: false,
 				isAttendanceService: false,
@@ -837,8 +837,8 @@
 			}
 			this.showReport = true;
 			if (new Date().getTime() <= new Date('2022/06/30').getTime()) {
-				this.isService=true;
-			}else{
+				this.isService = true;
+			} else {
 				this.queryIsDredgeMember(1001);
 			}
 			// 有无进出校公话服务
@@ -938,7 +938,28 @@
 			},
 			tabTap: function(num) {
 				this.tabIndex = num;
+				this.tabTapHandler(this.tabIndex);
+			},
+			tabTapHandler: function(num, flag) {
+				this.minDate = new Date(this.dataRangeArr[this.dataRangeIndex].startDate);
+				this.maxDate = new Date(this.dataRangeArr[this.dataRangeIndex].endDate);
 				if (num == 1) {
+					this.diningSituations.diningSituationsDate = this.formatDate(this.minDate);
+					this.diningSituations.diningSituationsRequestDate = this.dataRangeArr[this.dataRangeIndex]
+						.startDate;
+					let tmpDate = this.formatDateTwo(this.minDate);
+					this.queryNotRepastDetails(this.dataRangeArr[this.dataRangeIndex].startDate, this.dataRangeArr[this
+						.dataRangeIndex].endDate).then(() => {
+						if (this.diningSituations.notRepastDetailsDTOS) {
+							let today = this.diningSituations.notRepastDetailsDTOS.filter(e => e.repastDate ===
+								tmpDate)[
+								0];
+							this.diningSituations.notRepastDetails = today;
+						} else {
+							this.diningSituations.notRepastDetails = {};
+						}
+					});
+					this.queryConsumerTrend();
 					this.$nextTick(() => {
 						if (this.isOpen) {
 							this.queryStudentConsumerPreference(1).then(e => this.piechart());
@@ -950,10 +971,16 @@
 						}
 					})
 				} else if (num == 2) {
+					if (flag) {
+						this.attendanceSituations.attendanceDate = this.formatDate(this.minDate);
+						this.statisAttendanceAbnormal();
+						this.attendanceReprotDatail(this.dataRangeArr[this.dataRangeIndex].startDate);
+					} else {
 						this.memberInfo.differDay = '';
 						this.memberInfo.invalidDateStr = '';
 						this.memberInfo.leastAmount = '';
 						this.queryIsDredgeMember(3002).then(() => {
+							this.attendanceSituations.attendanceDate = this.formatDate(this.minDate);
 							this.statisAttendanceAbnormal();
 							if (this.isAttendanceOpen) {
 								this.attendanceReprotDatail(this.dataRangeArr[this.dataRangeIndex].startDate)
@@ -966,22 +993,47 @@
 									});
 							}
 						})
+					}
+				} else {
+					if (flag) {
+						if (this.isPubTalkOpen) {
+							this.getPubTalkReport().then(() => {
+								this.$nextTick(() => {
+									this.callNumberBarchart();
+									this.callDurationBarchart();
+									this.leaveMessageBarchart();
+								})
+							})
+						} else {
+							this.getPubTalkReport().then(() => {
+								this.$nextTick(() => {
+									this.callNumberBarchart();
+								})
+							})
+						}
 					} else {
 						this.memberInfo.differDay = '';
 						this.memberInfo.invalidDateStr = '';
 						this.memberInfo.leastAmount = '';
 						this.queryIsDredgeMember(2002).then(e => {
-						if (isPubTalkOpen) {
+							if (this.isPubTalkOpen) {
+								this.getPubTalkReport().then(() => {
 									this.$nextTick(() => {
 										this.callNumberBarchart();
 										this.callDurationBarchart();
 										this.leaveMessageBarchart();
 									})
+								})
 							} else {
+								this.getPubTalkReport().then(() => {
+									this.$nextTick(() => {
 										this.callNumberBarchart();
+									})
+								})
 							}
 						})
 					}
+				}
 			},
 			toImage: function() {
 				this.$nextTick(() => {
@@ -1046,44 +1098,7 @@
 					}
 					this.dataRangeArr = tmpArr;
 				}
-				this.minDate = new Date(this.dataRangeArr[this.dataRangeIndex].startDate);
-				this.maxDate = new Date(this.dataRangeArr[this.dataRangeIndex].endDate);
-				if (this.tabIndex == 1) {
-					this.diningSituations.diningSituationsDate = this.formatDate(this.minDate);
-					this.diningSituations.diningSituationsRequestDate = this.dataRangeArr[this.dataRangeIndex]
-						.startDate;
-					let tmpDate = this.formatDateTwo(this.minDate);
-					this.queryNotRepastDetails(this.dataRangeArr[this.dataRangeIndex].startDate, this.dataRangeArr[this
-						.dataRangeIndex].endDate).then(() => {
-						if (this.diningSituations.notRepastDetailsDTOS) {
-							let today = this.diningSituations.notRepastDetailsDTOS.filter(e => e.repastDate ===
-								tmpDate)[0];
-							this.diningSituations.notRepastDetails = today;
-						} else {
-							this.diningSituations.notRepastDetails = {};
-						}
-					});
-					this.queryConsumerTrend();
-					if (this.isOpen) {
-						this.queryStudentConsumerPreference(1).then(e => this.piechart());
-						this.queryDayConsumerTrend(1).then(e => this.linechart(this.reportTypeIndex));
-					} else {
-						this.queryStudentConsumerPreference();
-						this.queryDayConsumerTrend();
-					}
-				} else if (this.tabIndex == 2) {
-					this.attendanceSituations.attendanceDate = this.formatDate(this.minDate);
-					this.statisAttendanceAbnormal();
-					this.attendanceReprotDatail(this.dataRangeArr[this.dataRangeIndex].startDate);
-				} else {
-					this.getPubTalkReport().then(() => {
-						this.$nextTick(() => {
-							this.callNumberBarchart();
-							this.callDurationBarchart();
-							this.leaveMessageBarchart();
-						})
-					})
-				}
+				this.tabTapHandler(this.tabIndex,1);
 			},
 			formatter(day) {
 				const year = day.date.getFullYear();
@@ -1878,12 +1893,14 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
 					var tempList = data.data;
 					if (tempList && tempList.length) {
 						tempList.forEach(e => {
+							if (e.attendDetailReportDTOList && e.attendDetailReportDTOList.length) {
 								e.attendDetailReportDTOList.forEach(c => {
 									c.border = c.describeContent && c
 										.describeContent != '当日早到冠军' ?
 										'4rpx solid #F9793F' :
 										'4rpx solid rgba(0, 0, 0, 0.25)'
 								})
+							}
 						})
 						this.attendanceReportDatail = tempList || [];
 					} else {