Merge branch 'Inspection' into online

src/views/main/index.vue

@@ -5,21 +5,21 @@
     </h2>
     <div class="m-core">
       <tab-router @change="changeKey">
-        <el-tab-pane v-permission="'newIndex'" lazy label="基本信息" name="baseinfo">
+        <el-tab-pane v-if="permission('newIndex')" lazy label="基本信息" name="baseinfo">
           <baseinfo v-if="activeKey === 'baseinfo'"/>
         </el-tab-pane>
-        <el-tab-pane v-permission="'getIndexErrData'" lazy name="abnormal">
+        <el-tab-pane v-if="permission('getIndexErrData')" lazy name="abnormal">
           <el-badge slot="label" class="badge" is-dot :hidden="!status.indexErrData">异常处理</el-badge>
           <abnormal v-if="activeKey === 'abnormal'"/>
         </el-tab-pane>
-        <el-tab-pane v-permission="'getRemindMatterData'" name="reminders">
+        <el-tab-pane v-if="permission('getRemindMatterData')" name="reminders">
           <el-badge slot="label" class="badge" is-dot :hidden="!status.remindMatterData">事项提醒</el-badge>
           <reminders v-if="activeKey === 'reminders'"/>
         </el-tab-pane>
-        <el-tab-pane v-permission="'inspectionItemPlan/queryPage'" lazy label="【乐团主管】日程安排" name="teamSchedule">
+        <el-tab-pane v-if="permission('inspectionItemPlan/queryPage')" lazy label="【乐团主管】日程安排" name="teamSchedule">
           <teamSchedule v-if="activeKey === 'teamSchedule'" ref="teamSchedule" />
         </el-tab-pane>
-        <el-tab-pane v-permission="'inspection/queryPage'" lazy label="【分部经理】日程安排" name="ScheduleBranch">
+        <el-tab-pane v-if="permission('inspection/queryPage')" lazy label="【分部经理】日程安排" name="ScheduleBranch">
           <ScheduleBranch v-if="activeKey === 'ScheduleBranch'"/>
         </el-tab-pane>
       </tab-router>
@@ -27,6 +27,7 @@
   </div>
 </template>
 <script>
+import { permission } from '@/utils/directivePage'
 import baseinfo from './baseinfo'
 import abnormal from './abnormal'
 import teamSchedule from './teamSchedule'
@@ -60,6 +61,7 @@ export default {
     }
   },
   methods: {
+    permission,
     changeKey(val) {
       this.activeKey = val
     },

src/views/main/teamSchedule/index.vue

@@ -121,7 +121,7 @@
                 type="text"
                 :disabled="scope.row.times < scope.row.submittedTimes"
                 @click="resetLine(scope.row)"
-                >处理方式</el-button
+                >立即处理</el-button
               >
             </auth>
           </div>

src/views/vipClass/vipDetail/components/teacherRecord.vue

@@ -71,7 +71,7 @@
     </save-form>
     <!-- 列表 -->
     <div class="tableWrap">
-      <el-table :data="tableList">
+      <el-table :data="tableList" :header-cell-style="{background:'#EDEEF0',color:'#444'}">
         <el-table-column align="center" label="课程编号" prop="id">
         </el-table-column>
         <el-table-column