Merge branch 'feature/4月-菜单和权限' into dev

src/views/apps/cloudDaily/dailyRecord.vue

@@ -413,11 +413,6 @@ export default {
     }
   },
   mounted() {
-    let that = this;
-    that.activeBrand = that.brandId;
-    if (!!that.brandId) {
-      that.getTableList();
-    }
     let start = new Date();
     start = new Date(start.setMonth(start.getMonth() - 3));
     const end = new Date();
@@ -440,6 +435,11 @@ export default {
         .padStart(2, '0')
     );
     this.conditionObj.dateRange = [startDate.join('-'), endDate.join('-')];
+    let that = this;
+    that.activeBrand = that.brandId;
+    if (!!that.brandId) {
+      that.getTableList();
+    }
   },
   components: {
     multipleDel,