Browse Source

Merge branch 'Inspection' into online

wolyshaw 4 years ago
parent
commit
600adc7d14
2 changed files with 7 additions and 7 deletions
  1. 6 6
      src/views/main/index.vue
  2. 1 1
      src/views/main/teamSchedule/index.vue

+ 6 - 6
src/views/main/index.vue

@@ -4,20 +4,20 @@
       <div class="squrt"></div>控制台 <filter-search v-if="$route.query.tabrouter === 'teamSchedule'" searchKey="ids" @reload="reloadItem"/>
     </h2>
     <div class="m-core">
-      <tab-router v-permission="'newIndex'">
-        <el-tab-pane lazy label="基本信息" name="baseinfo">
+      <tab-router>
+        <el-tab-pane v-permission="'newIndex'" lazy label="基本信息" name="baseinfo">
           <baseinfo/>
         </el-tab-pane>
-        <el-tab-pane lazy label="异常处理" name="abnormal">
+        <el-tab-pane v-permission="'getIndexErrData'" lazy label="异常处理" name="abnormal">
           <abnormal/>
         </el-tab-pane>
-        <el-tab-pane lazy label="事项提醒" name="reminders">
+        <el-tab-pane v-permission="'getRemindMatterDatalazy'" label="事项提醒" name="reminders">
           <reminders/>
         </el-tab-pane>
-        <el-tab-pane lazy label="【乐团主管】日程安排" name="teamSchedule">
+        <el-tab-pane v-permission="'inspectionItemPlan/queryPage'" lazy label="【乐团主管】日程安排" name="teamSchedule">
           <teamSchedule ref="teamSchedule" />
         </el-tab-pane>
-        <el-tab-pane lazy label="【分部经理】日程安排" name="ScheduleBranch">
+        <el-tab-pane v-permission="'inspection/queryPage'" lazy label="【分部经理】日程安排" name="ScheduleBranch">
           <ScheduleBranch/>
         </el-tab-pane>
       </tab-router>

+ 1 - 1
src/views/main/teamSchedule/index.vue

@@ -237,7 +237,7 @@ export default {
         // 跳到回访页面 搜索条件 教务老师 时间范围
         this.$router.push({
           path: "/business/returnVisitList",
-          query: { teacher: row.userName, timer: [startTIme, endTIme] },
+          query: { teacher: row.userName, timer: [startTime, endTime] },
         });
       } else {
         // 下校巡查