更新日志

src/router/notKeepAliveList.js

@@ -25,5 +25,5 @@ export default [
   '/business/attendanceList',
   '/business/returnVisitList',
   '/business/levelManager',
-
+  '/journal/journal', // 日志
 ]

src/views/workBenchManager/journal/index.vue

@@ -4,13 +4,15 @@
       <div class="squrt"></div>系统日志
     </h2>
     <div class="m-core">
-      <el-tabs @tab-click="onTabClick">
-        <el-tab-pane label="系统通知" value="SYSTEM"></el-tab-pane>
-        <el-tab-pane label="学生申诉" value="STUDENT"></el-tab-pane>
-        <!-- <el-tab-pane label="退团退课" value="MUSICGROUP"></el-tab-pane> -->
-        <el-tab-pane label="请假处理" value="LEAVE"></el-tab-pane>
-        <el-tab-pane label="VIP申请审核" value="VIPAPPLY"></el-tab-pane>
-      </el-tabs>
+      <location-hash v-model="searchForm.group" @change="onTabClick">
+        <el-tabs v-model="activeIndex" @tab-click="onTabClick">
+          <el-tab-pane label="系统通知" v-if="permissionList.journalItem" name="SYSTEM" value="SYSTEM"></el-tab-pane>
+          <el-tab-pane label="学生申诉" v-if="permissionList.studentComplain" name="STUDENT" value="STUDENT"></el-tab-pane>
+          <!-- <el-tab-pane label="退团退课" value="MUSICGROUP"></el-tab-pane> -->
+          <el-tab-pane label="请假处理" v-if="permissionList.leaveOperation" name="LEAVE" value="LEAVE"></el-tab-pane>
+          <el-tab-pane label="VIP申请审核" v-if="permissionList.vipApply" name="VIPAPPLY" value="VIPAPPLY"></el-tab-pane>
+        </el-tabs>
+      </location-hash>
       <el-form :inline="true"
                 ref="searchForm"
                :model="searchForm">
@@ -104,20 +106,30 @@ import { journalType } from '@/constant'
 import StudentModel from './model/student'
 import LeaveModel from './model/leave'
 import vipApplyModel from './model/vipApply'
+import { permission } from '@/utils/directivePage'
 export default {
   components: { pagination, StudentModel, LeaveModel, vipApplyModel },
   name: 'journal',
   data () {
+    const query = this.$route.query
     return {
+      permissionList: {
+        journalItem: permission('/journalItem'),
+        studentComplain: permission('/studentComplain'),
+        musicGroupCourse: permission('/musicGroupCourse'),
+        leaveOperation: permission('/leaveOperation'),
+        vipApply: permission('/vipApply')
+      },
       dialogSystem: false,
       dialogStudent: false,
       dialogLeave: false,
       dialogVipApply: false,
       dialogTitle: null,
       dialogDetail: {},
+      activeIndex: query.opt || 'SYSTEM',
       searchForm: {
         search: null,
-        group: 'SYSTEM',
+        group: query.opt || 'SYSTEM',
         readStatus: 0
       },
       tableList: [],
@@ -132,6 +144,7 @@ export default {
   },
   mounted() {
     this.getList()
+    console.log(this.searchForm.group)
   },
   methods: {
     onSearch() {
@@ -141,6 +154,8 @@ export default {
     onTabClick(elm) {
       // 判断 group 是否一致
       const searchForm = this.searchForm
+      console.log(searchForm)
+      this.activeIndex = searchForm.group
       if(elm.$attrs.value == searchForm.group) {
         return
       }

src/views/workBenchManager/journal/model/leave.vue

@@ -20,7 +20,7 @@
         <el-table :data="vipCourse"
                     style="width: 100%"
                     :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-            <el-table-column label="编号" prop="before.id"></el-table-column>
+            <el-table-column label="编号" width="100px" prop="before.id"></el-table-column>
             <el-table-column label="类型"
                             width="100px">
                 <template slot-scope="scope">
@@ -36,25 +36,27 @@
             <el-table-column label="调整前日期">
                 <template slot-scope="scope">
                     {{ scope.row.before.classDate | formatTimer }}
+                    {{ scope.row.before.startClassTime | getFormatTime(scope.row.before.endClassTime) }}
                 </template>
             </el-table-column>
-            <el-table-column label="上课时间">
+            <!-- <el-table-column label="调整前时间">
                 <template slot-scope="scope">
                     {{ scope.row.before.startClassTime | getFormatTime(scope.row.before.endClassTime) }}
                 </template>
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column label="调整后日期">
             <template slot-scope="scope"
                         v-if="scope.row.before.type == 'VIP'">
                 {{ scope.row.after.classDate | formatTimer }}
-            </template>
-            </el-table-column>
-            <el-table-column label="调整后时间">
-            <template slot-scope="scope"
-                        v-if="scope.row.before.type == 'VIP'">
                 {{ scope.row.after.startClassTime | getFormatTime(scope.row.after.endClassTime) }}
             </template>
             </el-table-column>
+            <!-- <el-table-column label="调整后时间">
+                <template slot-scope="scope"
+                            v-if="scope.row.before.type == 'VIP'">
+                    {{ scope.row.after.startClassTime | getFormatTime(scope.row.after.endClassTime) }}
+                </template>
+            </el-table-column> -->
         </el-table>
 
         <el-table :data="musicGroupCourse"