合并master

src/views/main/baseinfo/business.vue

@@ -181,7 +181,7 @@ export default {
     },
     async FetchDetail() {
       this.loading = true;
-      const data = this.data;
+      let data = [];
       try {
         const { dates, ...rest } = this.search;
         const res = await getIndex({

src/views/main/baseinfo/index.vue

@@ -221,7 +221,7 @@ export default {
       }
     },
     resetDate(data) {
-      this.dataInfo = data;
+      this.dataInfo = {...this.dataInfo,...data};
     },
   },
 };

src/views/main/baseinfo/management.vue

@@ -225,7 +225,7 @@ export default {
     },
     async FetchDetail() {
       this.loading = true;
-      const data = this.data;
+      let data = [];
       try {
         const { dates, ...rest } = this.search;
         const res = await getIndex({