Merge branch 'iteration_201225' into online

src/components/remote-search/index.vue

@@ -3,7 +3,6 @@
     <el-select
       :value="value"
       filterable
-      clearable
       remote
       reserve-keyword
       clearable

src/views/workBenchManager/classFeesIsOk.vue

@@ -69,7 +69,8 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-select
+          <remoteSearch :commit='"setTeachers"'  v-model='searchForm.teacherId' />
+          <!-- <el-select
             placeholder="老师姓名"
             v-model="searchForm.teacherId"
             clearable
@@ -81,7 +82,7 @@
               :value="item.id"
               :key="index"
             ></el-option>
-          </el-select>
+          </el-select> -->
         </el-form-item>
         <el-form-item>
           <el-select
@@ -359,6 +360,7 @@ import numeral from "numeral";
 import axios from "axios";
 import { getToken } from "@/utils/auth";
 import pagination from "@/components/Pagination/index";
+import remoteSearch from '@/components/remote-search/index'
 import load from "@/utils/loading";
 import {
   findIsSettlementCourseSalarys,
@@ -368,7 +370,7 @@ import {
 } from "@/api/journal";
 import { courseListType } from "@/utils/searchArray";
 export default {
-  components: { pagination },
+  components: { pagination, remoteSearch },
   data() {
     return {
       searchForm: {
@@ -413,9 +415,6 @@ export default {
     // 获取分部
     this.init();
   },
-  activated() {
-    this.init();
-  },
   methods: {
     init() {
       if (!this.searchForm.month) {

src/views/workBenchManager/payAppeal.vue

@@ -300,9 +300,6 @@ export default {
 
     this.init();
   },
-  activated() {
-    this.init();
-  },
   methods: {
     init() {
       this.getList();