Merge branch 'v_req_0831' into uat

src/pages/SchoolReport/SchoolReport.vue

@@ -83,7 +83,7 @@
 						<view :class="['consumer-report-img','attendance-report-img','pubTalk-report-img'][tabIndex-1]">
 						</view>
 						<!-- 消费报告 -->
-						<view v-show="tabIndex==1&&consumerDetailCalculateObj.totalData>0"
+						<view v-show="tabIndex==1&&consumerSummaryAmountOBj.consumergrossamount"
 							class="school-report-context-card-one-context">
 							<!-- <view class="school-report-context-card-one-context-item">
 								<view class="school-report-context-card-one-context-dot">
@@ -192,9 +192,9 @@
 								</view>
 							</view> -->
 						</view>
-						<view v-show="tabIndex==1&&consumerDetailCalculateObj.totalData<=0"
+						<view v-show="tabIndex==1&&consumerSummaryAmountOBj.consumergrossamount==0"
 							class="school-report-context-card-one-context">
-							<view class="school-report-context-card-one-context-nodata">
+							<view class="school-report-context-card-one-context-nodata" style="padding-top: 0">
 								<view class="card-one-nodata-img">
 									<image :src="ImgUrl+'SchoolReport/defaultnull.png'" mode=""></image>
 								</view>
@@ -271,7 +271,7 @@
 						</view>
 						<view class="school-report-context-card-four-conclusion">
 							<view class="school-report-context-card-four-conclusion-item"
-								:class="consumerDetailCalculateObj.totalData>0?'':'card-four-conclusion-nodata'" v-if="consumerDetailCalculateObj.totalData>0">
+								:class="consumerSummaryAmountOBj.consumergrossamount?'':'card-four-conclusion-nodata'" v-if="consumerSummaryAmountOBj.consumergrossamount>0">
 								<!-- <text>消费<text
 										class="consume-total">{{consumerAmountObj.consumergrossamount}}</text>元，超过同年级<text
 										class="consume-total">{{consumerAmountObj.gtgraderate}}%</text>的同学<text
@@ -297,7 +297,7 @@
 									孩子本{{['月','周'][reportTypeIndex]}}无消费记录
 								</text> -->
 							</view>
-              <view class="school-report-context-card-one-context-nodata" v-if="!consumerDetailCalculateObj.totalData" style="padding-top: 50rpx; margin-bottom: 74rpx;">
+              <view class="school-report-context-card-one-context-nodata" v-if="!consumerSummaryAmountOBj.consumergrossamount" style="padding-top: 50rpx; margin-bottom: 74rpx;">
 								<view class="card-one-nodata-img">
 									<image :src="ImgUrl+'SchoolReport/defaultnull.png'" mode=""></image>
 								</view>
@@ -1865,6 +1865,8 @@ export default {
       });
       await this.getCateringAbnormalGroupList();
       let arr = this.cateringAbnormalGroupList;
+      // arr = arr.sort((a,b) =>  Date.parse(b.statisticalDate) -  Date.parse(a.statisticalDate))
+      arr.sort((a, b) => a.statisticalDate.localeCompare(b.statisticalDate));
       let str = "";
       arr.forEach((x) => {
         let date = moment(x.date).format("M.D");
@@ -1872,7 +1874,7 @@ export default {
       });
       str = str.substring(0, str.length - 1);
       this.dateForStr = str;
-      console.log(this.cateringAbnormalGroupList, "bbbbbbbbbbbbbbbbbbbbbbb");
+      console.log(arr, "bbbbbbbbbbbbbbbbbbbbbbb");
       this.attendanceSituations.attendanceDate = this.formatDate(this.minDate);
       // 查询用户信息
       this.queryCampusStudentInfo();
@@ -1930,6 +1932,7 @@ export default {
             "ddddddddddddddddddddddddddddd"
           );
           let arr = this.cateringAbnormalGroupList;
+          arr.sort((a, b) => a.statisticalDate.localeCompare(b.statisticalDate));
           this.cateringAbnormalGroupList_ = arr.filter(
             (x) =>
               x.statisticalDate ==