wolyshaw 4 лет назад
Родитель
Сommit
442237e50d

+ 5 - 0
src/components/tab-router/index.vue

@@ -33,6 +33,11 @@ export default {
       panelsByName: {},
     };
   },
+  watch: {
+    active() {
+      this.$emit('change', this.active)
+    }
+  },
   methods: {
     getAllPanel() {
       const data = {};

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

@@ -1,6 +1,6 @@
 <template>
   <div class="container">
-    <save-form inline :model="search" @submit="FetchList" @reset="FetchList">
+    <save-form inline :model="search" @submit="FetchList" @reset="FetchList" saveKey="/main/main/abnormal">
       <el-form-item prop="organIds">
         <el-select
           multiple

+ 2 - 1
src/views/main/baseinfo/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="container">
-    <save-form inline :model="search" @submit="FetchDetail" @reset="reset">
+    <save-form inline :model="search" @submit="FetchDetail" @reset="reset" saveKey="/main/main/baseInfo">
       <el-form-item prop="year">
         <el-date-picker
           v-model="search.year"
@@ -20,6 +20,7 @@
           clearable
           filterable
           collapse-tags
+          placeholder="请选择分部"
           v-model="search.organIds"
         >
           <el-option v-for="(item,index) in selects.branchs"

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

@@ -4,21 +4,21 @@
       <div class="squrt"></div>控制台 <filter-search v-if="$route.query.tabrouter === 'teamSchedule'" searchKey="ids" @reload="reloadItem"/>
     </h2>
     <div class="m-core">
-      <tab-router>
+      <tab-router @change="changeKey">
         <el-tab-pane v-permission="'newIndex'" lazy label="基本信息" name="baseinfo">
-          <baseinfo/>
+          <baseinfo v-if="activeKey === 'baseinfo'"/>
         </el-tab-pane>
         <el-tab-pane v-permission="'getIndexErrData'" lazy label="异常处理" name="abnormal">
-          <abnormal/>
+          <abnormal v-if="activeKey === 'abnormal'"/>
         </el-tab-pane>
         <el-tab-pane v-permission="'getRemindMatterData'" label="事项提醒" name="reminders">
-          <reminders/>
+          <reminders v-if="activeKey === 'reminders'"/>
         </el-tab-pane>
         <el-tab-pane v-permission="'inspectionItemPlan/queryPage'" lazy label="【乐团主管】日程安排" name="teamSchedule">
-          <teamSchedule ref="teamSchedule" />
+          <teamSchedule v-if="activeKey === 'teamSchedule'" ref="teamSchedule" />
         </el-tab-pane>
         <el-tab-pane v-permission="'inspection/queryPage'" lazy label="【分部经理】日程安排" name="ScheduleBranch">
-          <ScheduleBranch/>
+          <ScheduleBranch v-if="activeKey === 'ScheduleBranch'"/>
         </el-tab-pane>
       </tab-router>
     </div>
@@ -39,6 +39,11 @@ export default {
     ScheduleBranch,
     reminders,
   },
+  data() {
+    return {
+      activeKey: ''
+    }
+  },
   watch: {
     '$route.query'(newValue, oldValue) {
       if (newValue.tabrouter !== oldValue.tabrouter) {
@@ -47,6 +52,9 @@ export default {
     }
   },
   methods: {
+    changeKey(val) {
+      this.activeKey = val
+    },
     __init () {
       getIndex().then(res => {
         if (res.code == 200) {

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

@@ -1,6 +1,6 @@
 <template>
   <div class="container">
-    <save-form inline :model="search" @submit="FetchList" @reset="FetchList">
+    <save-form inline :model="search" @submit="FetchList" @reset="FetchList" saveKey="/main/main/reminders">
       <el-form-item prop="organIds">
         <el-select
           multiple

+ 7 - 6
src/views/main/schedule-branch/index.vue

@@ -1,13 +1,13 @@
 <template>
   <div>
-    <save-form inline :model="search" @submit="submit" @reset="reset">
+    <save-form inline :model="search" @submit="submit" @reset="reset" saveKey="/main/main/schedule-branch">
       <el-form-item prop="organIds">
         <el-select
           multiple
           clearable
           filterable
           collapse-tags
-          v-model="search.organIds"
+          v-model="search.organId"
           placeholder="请选择分部"
         >
           <el-option v-for="(item,index) in selects.branchs"
@@ -16,8 +16,8 @@
             :value="item.id"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item prop="organIds">
-        <remote-search :commit='"setTeachers"' :collapse-tags="true"  v-model='search.teacherIdList' :multiple="true" />
+      <el-form-item prop="teacherIdList">
+        <remote-search :commit='"setEducations"' :collapse-tags="true"  v-model='search.teacherIdList' :multiple="true" />
       </el-form-item>
       <el-form-item prop="month">
         <el-date-picker
@@ -70,6 +70,7 @@
     </el-table>
     <pagination :total.sync="rules.total"
       :page.sync="rules.page"
+      save-key="/main/main/schedule-branch"
       :limit.sync="rules.limit"
       :page-sizes="rules.page_size"
       @pagination="FetchList"
@@ -118,7 +119,7 @@ import create from './modals/create'
 import view from './modals/view'
 import View from './modals/view.vue';
 const initSearch = {
-  organIds: [],
+  organId: [],
   teacherIdList: [],
   month: '',
 }
@@ -183,7 +184,7 @@ export default {
       try {
         const res = await inspectionQueryPage({
           ...this.search,
-          organIds: this.search.organIds.join(','),
+          organId: this.search.organId.join(','),
           teacherIdList: this.search.teacherIdList.join(','),
           month: this.search.month ? this.$helpers.dayjs(this.search.month).format('YYYY-MM') : undefined,
           page: this.rules.page,

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

@@ -6,7 +6,7 @@
       ref="searchForm"
       @submit="search"
       @reset="onReSet"
-      save-key="teamSchedule"
+       saveKey="/main/main/teamSchedule"
     >
       <el-form-item prop="organId">
         <el-select