Merge branch 'V1.7.3_report_feature' into develop

src/pages/SchoolReport/SchoolReport.vue

@@ -2596,7 +2596,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
 
 											e[item] = e[item] > 0 ? e[item] +
 												'%↑' : (e[item] < 0 ? e[item].toString().slice(1) + '%↓' :
-													0);
+													'-');
 										}
 									}
 								}
@@ -2642,15 +2642,27 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
 						let tmpCalculatList = [];
 						let calculateTypeList = ['就餐', '未就餐', '均值', '较上', '总计'];
 						calculateTypeList.forEach(e => {
-							tmpCalculatList.push({
-								"calculateType": e,
-								"breakfastAmount": 0,
-								"lunchAmount": 0,
-								"supperAmount": 0,
-								"otherAmount": 0,
-								"totalAmount": 0,
-								"consumerDetailsSumArr": [e, 0, 0, 0, 0, 0]
-							})
+							if (e == '较上') {
+								tmpCalculatList.push({
+									"calculateType": e,
+									"breakfastAmount": '-',
+									"lunchAmount": '-',
+									"supperAmount": '-',
+									"otherAmount": '-',
+									"totalAmount": '-',
+									"consumerDetailsSumArr": [e, '-', '-', '-', '-', '-']
+								})
+							} else {
+								tmpCalculatList.push({
+									"calculateType": e,
+									"breakfastAmount": 0,
+									"lunchAmount": 0,
+									"supperAmount": 0,
+									"otherAmount": 0,
+									"totalAmount": 0,
+									"consumerDetailsSumArr": [e, 0, 0, 0, 0, 0]
+								})
+							}
 						});
 						this.campusConsumerDetailObj.campusConsumerDetailCalculateList = JSON.parse(JSON.stringify(
 							tmpCalculatList));