Merge branch 'ol_12_30' into online

src/api/repairManager.js

@@ -10,6 +10,14 @@ export function findTechnician (data) {
   })
 }
 
+export function findAllTechnician (data) {
+  return request({
+    url: api + '/employee/findAllTechnician',
+    method: 'get',
+    params: data
+  })
+}
+
 // studentRepair/queryPage
 export function studentRepairList (data) {
   return request({
@@ -26,4 +34,4 @@ export function repairSuccess (data) {
     method: 'post',
     data: qs.stringify(data)
   })
-}
+}

src/views/HumanResources/index.vue

@@ -115,6 +115,13 @@
             clearable
           ></el-input>
         </el-form-item>
+        <el-form-item prop="intentionCity">
+          <el-input
+            placeholder="工作意向"
+            v-model.trim="searchForm.intentionCity"
+            clearable
+          ></el-input>
+        </el-form-item>
         <el-form-item>
           <el-button @click="search" type="danger">搜索</el-button>
           <el-button
@@ -462,6 +469,7 @@ const initSearch = {
   userNameOrIdOrMobile: "",
   operator: "",
   dates: [],
+  intentionCity: '',
 };
 export default {
   components: { pagination, hrform, saveform },

src/views/repairManager/repairList.vue

@@ -348,7 +348,7 @@ import pagination from "@/components/Pagination/index";
 import load from "@/utils/loading";
 import { getSoundTree } from "@/api/buildTeam";
 import {
-  findTechnician,
+  findAllTechnician,
   studentRepairList,
   repairSuccess,
 } from "@/api/repairManager";
@@ -385,7 +385,7 @@ export default {
   created() {},
   //生命周期 - 挂载完成（可以访问DOM元素）
   mounted() {
-    findTechnician().then((res) => {
+    findAllTechnician().then((res) => {
       if (res.code == 200) {
         this.employeeList = res.data;
       }