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

src/components/layout/index.vue

@@ -7,10 +7,10 @@
       <div class="hb-layout-pager" :style="{ height: activedMenu.length > 3 ? `calc(100% - 30px)` : '100%', 'padding-bottom': pagePaddingBottom }">
         <!-- 页面内容 -->
         <!-- <router-view v-if="activeBrand" :brandId="activeBrand" :activeGroupId="activeGroup" :tabType="activeTab" @showTab="showTab"></router-view> -->
-        <keep-alive v-if="$route.meta.keepAlive">
-          <router-view :brand-id="enterpriseId"></router-view>
+        <keep-alive>
+          <router-view :brand-id="enterpriseId" v-if="$route.meta.keepAlive"></router-view>
         </keep-alive>
-        <router-view v-else :brand-id="enterpriseId"></router-view>
+        <router-view v-if="!$route.meta.keepAlive" :brand-id="enterpriseId"></router-view>
       </div>
     </div>
   </div>

src/main.js

@@ -75,8 +75,12 @@ router.beforeEach((to, from, next) => {
   } else {
     baseUrl = host;
   }
+  
+  const { fromPath = [] } = from.meta || {};
+  from.meta.keepAlive = fromPath.includes(to.path);
   next();
 });
+
 // 将按钮code挂到vue的原型上，供页面中埋点使用
 Vue.prototype.$buttonCode = buttonCode;
 

src/router/index.js

@@ -143,7 +143,8 @@ export const constantRouterMap = [
                 name: '话务任务记录',
                 component: _import('salesleads/trafficTask', 'taskRecord'),
                 meta: {
-                    keepAlive: true
+                    keepAlive: true,
+                    fromPath: ['/taskDetail']
                 }
                 
             },
@@ -234,7 +235,11 @@ export const constantRouterMap = [
                     {
                         path: '/memberGroupSet',
                         name: '客户分组设置',
-                        component: _import('apps/customerApp', 'memberGroupSet')
+                        component: _import('apps/customerApp', 'memberGroupSet'),
+                        meta: {
+                            keepAlive: true,
+                            fromPath: ['/addGroupTemplate', '/editGroupTemplate', '/storeRangeSet']
+                        }
                     },
                     {
                         path: '/memberSearchSet',
@@ -343,16 +348,14 @@ export const constantRouterMap = [
                         name: '月指标任务',
                         component: _import('apps/quota', 'monthTask'),
                         meta: {
-                            keepAlive: true
+                            keepAlive: true,
+                            fromPath: ['/monthTaskDetail']
                         }
                     },
                     {
                         path: '/monthTaskDetail',
                         name: '月指标任务详情',
-                        component: _import('apps/quota', 'monthTaskDetail'),
-                        meta: {
-                            keepAlive: true
-                        }
+                        component: _import('apps/quota', 'monthTaskDetail')
             },
                     // 卡券赠送
             {

src/views/apps/customerApp/memberGroupSetList.vue

@@ -179,6 +179,11 @@ export default {
     const that = this;
     that.getTableList();
     this.getTemplateCount();
+  },
+  activated() {
+    const that = this;
+    that.getTableList();
+    this.getTemplateCount();
   }
 };
 </script>

src/views/apps/quota/monthTask.vue

@@ -297,6 +297,13 @@ export default {
       }
     }
   },
+  activated() {
+    let that = this;
+    that.activeBrand = that.brandId;
+    if (!!that.brandId) {
+      that.getTableList();
+    }
+  },
   mounted() {
     let that = this;
     that.activeBrand = that.brandId;

src/views/salesleads/trafficTask/taskRecord.vue

@@ -95,6 +95,7 @@ import { _debounce } from '@/common/js/public';
 import showMsg from '@/common/js/showmsg';
 import errMsg from '@/common/js/error';
 export default {
+  name: 'TaskRecord',
   props: {
     brandId: {
       type: String,
@@ -425,6 +426,16 @@ export default {
       }
     }
   },
+  activated() {
+    const that = this;
+    // this.conditionObj.dateRange = that.initDataRange();
+    that.activeBrand = that.brandId;
+    if (!!this.brandId) {
+      that.$nextTick(() => {
+        that.getTableList();
+      });
+    }
+  },
   mounted() {
     const that = this;
     // this.conditionObj.dateRange = that.initDataRange();