Merge branch 'feature/12月迭代' into dev

src/views/recharge/board.vue

@@ -19,7 +19,8 @@
             <span v-if="config.isMoreAccount">(当前所在计费部门：{{ config.departmentName }})</span>
           </div>
           <p class="fz22 vertical-middle money">
-            <span @click="$router.push('/recharge/record')">{{ (config.balance / 100) | amount }}<i class="el-icon-arrow-right arrow"/></span>
+            <span v-if="$getButtonLimit($buttonCode.marketingRechargeBoardRecord)" class="active" @click="$router.push('/recharge/record')">{{ (config.balance / 100) | amount }}<i class="el-icon-arrow-right arrow"/></span>
+            <span v-else>{{ (config.balance / 100) | amount }}<i class="el-icon-arrow-right arrow"/></span>
           </p>
           <el-button v-if="$getButtonLimit($buttonCode.marketingRechargeBoardRecharge)" :limit-code="$buttonCode.marketingRechargeBoardRecharge" class="vertical-middle pl20 pr20" type="primary" @click="$router.push('/recharge/do')">充值</el-button>
           <el-button v-if="$getButtonLimit($buttonCode.marketingRechargeBoardRecord)" :limit-code="$buttonCode.marketingRechargeBoardRecord" class="vertical-middle pl20 pr20" @click="$router.push('/recharge/record')">记录</el-button>
@@ -29,7 +30,8 @@
             所有账户余额（元）<span class="tip"><i class="iconfont icon-anquanbaozhang" />已开启多账户计费模式</span>
           </div>
           <p class="fz22 vertical-middle money">
-            <span @click="$router.push('/recharge/accountDetail')">{{ (config.allDepartmentTotal / 100) | amount }}<i class="el-icon-arrow-right arrow"/></span>
+            <span v-if="$getButtonLimit($buttonCode.marketingAccountDetail)" class="active" @click="$router.push('/recharge/accountDetail')">{{ (config.allDepartmentTotal / 100) | amount }}<i class="el-icon-arrow-right arrow"/></span>
+            <span v-else>{{ (config.allDepartmentTotal / 100) | amount }}<i class="el-icon-arrow-right arrow"/></span>
           </p>
           <!--该按钮待埋点-->
           <el-button v-if="$getButtonLimit($buttonCode.marketingAccountDetail)" :limit-code="$buttonCode.marketingAccountDetail" class="vertical-middle" @click="$router.push('/recharge/accountDetail')">账户明细</el-button>
@@ -477,16 +479,18 @@ export default {
     color: #303133;
     line-height: 37px;
     & span {
-      cursor: pointer;
       font-weight: 600;
       i {
         position: relative;
         top: -4px;
       }
-      &:hover {
-        color: #1890ff;
-        .arrow {
+      &.active {
+        cursor: pointer;
+        &:hover {
           color: #1890ff;
+          .arrow {
+            color: #1890ff;
+          }
         }
       }
     }

src/views/recharge/record.vue

@@ -97,11 +97,10 @@ export default {
     };
   },
   async created() {
-    this.deparment.departId = this.$route.query.id || '';
     this.getDepartmentList();
     this.$store.commit('mutations_breadcrumb', [{ name: '企业管理', path: '' }, { name: '计费中心', path: '/recharge' }, { name: '记录', path: '' }]); // eslint-disable-line
     const config = await this.getAuth(); // rechartge_mixin
-    this.deparment.departId = config.accountDepartId;
+    this.deparment.departId = this.$route.query.id || config.accountDepartId;
     await this.getRule(); // 该接口调取完后select-depart组件挂载所以在之前一步初始化departId
     this.rechargeRecord();
   },