Merge branch 'Inspection' of http://git.dayaedu.com/molingzhide/dy-admin-manager into Inspection

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="'getRemindMatterData'" 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>

src/views/main/schedule-branch/modals/create.vue

@@ -173,7 +173,8 @@ export default {
             rows: 999
           })
           this.technicians = res.data.rows
-          this.$set(this.form, 'group', group.map(item => ({...item, userId: ''})))
+          console.log(this.form.group.map(item => ({...item, userId: ''})))
+          this.$set(this.form, 'group', this.form.group.map(item => ({...item, userId: ''})))
         } catch (error) {}
       }
     }

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 {
         // 下校巡查

src/views/main/teamSchedule/scheduleDetail.vue

@@ -166,6 +166,7 @@ export default {
           rows: 9999,
         });
         this.dataList = result.data.rows;
+         this.taskList = [];
         for (let i in this.dataList) {
           this.setCourseTime(this.dataList[i]);
           this.taskList.push(this.dataList[i]);