Merge branch 'iteration_201225' into iteration_adminOptimiz

src/components/remote-search/index.vue

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

src/views/afterSchoolManager/afterSchoolList.vue

@@ -36,8 +36,8 @@
                           type="daterange"
                           value-format="yyyy-MM-dd"
                           range-separator="至"
-                          start-placeholder="分配开始日期"
-                          end-placeholder="分配结束日期"
+                          start-placeholder="截止开始日期"
+                          end-placeholder="截止结束日期"
                           :picker-options="{
         firstDayOfWeek: 1
     }"></el-date-picker>

src/views/workBenchManager/classFeesIsOk.vue

@@ -32,6 +32,7 @@
           <el-input
             v-model.trim="searchForm.search"
             @keyup.enter.native="search"
+            clearable
             placeholder="课程编号、课程组名称"
           ></el-input>
         </el-form-item>
@@ -68,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
@@ -80,7 +82,7 @@
               :value="item.id"
               :key="index"
             ></el-option>
-          </el-select>
+          </el-select> -->
         </el-form-item>
         <el-form-item>
           <el-select
@@ -358,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,
@@ -367,7 +370,7 @@ import {
 } from "@/api/journal";
 import { courseListType } from "@/utils/searchArray";
 export default {
-  components: { pagination },
+  components: { pagination, remoteSearch },
   data() {
     return {
       searchForm: {
@@ -412,9 +415,6 @@ export default {
     // 获取分部
     this.init();
   },
-  activated() {
-    this.init();
-  },
   methods: {
     init() {
       if (!this.searchForm.month) {

src/views/workBenchManager/payAppeal.vue

@@ -10,6 +10,7 @@
         <el-form-item>
           <el-input
             v-model.trim="searchForm.search"
+            clearable
             @keyup.enter.native="search"
             placeholder="老师名称"
           ></el-input>
@@ -299,9 +300,6 @@ export default {
 
     this.init();
   },
-  activated() {
-    this.init();
-  },
   methods: {
     init() {
       this.getList();

src/views/workBenchManager/requestProcessing.vue

@@ -62,10 +62,11 @@
         <el-form-item>
           <el-date-picker
             :clearable="true"
+            style="width: 100% !important;"
             v-model="searchForm.salarySettlementMonth"
             type="month"
             value-format="yyyy-MM"
-            placeholder="选择申诉年月"
+            placeholder="选择归属年月"
           ></el-date-picker>
         </el-form-item>
         <el-form-item>