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

src/components/remote-search/index.vue

@@ -28,7 +28,7 @@ const placeholder = {
   setTeachers: "请选择老师",
   setEducations: "请选乐团主管",
 };
-import { throttle, slice } from "lodash";
+import { throttle, slice, uniqBy } from "lodash";
 import selects from "@/store/modules/selects";
 export default {
   name: "remote-search",
@@ -37,6 +37,7 @@ export default {
     return {
       options: [],
       list: [],
+      listById: {},
       loading: false,
       constant: this.number || 50,
       placeholder: placeholder[this.commit],
@@ -52,7 +53,11 @@ export default {
     async getList() {
       await this.$store.dispatch(this.commit);
       this.list = this.selects[this.enumer[this.commit]];
-
+      const data = {}
+      for (const item of this.list) {
+        data[item.userId] = item
+      }
+      this.listById = data
       this.options =
         this.list.length <= this.constant
           ? this.list
@@ -63,7 +68,7 @@ export default {
       // throttle
       throttle(this.getOptions, 800)(query);
     },
-    getOptions(query) {
+    async getOptions(query) {
       if (query) {
         let flag;
         this.options = this.list.filter((item) => {
@@ -77,7 +82,13 @@ export default {
           }
         });
       } else {
-          this.getList();
+          await this.getList()
+          const optionids = this.options.map(item => item.userId)
+          const valueItem = this.listById[this.value]
+          if (!optionids.includes(this.value) && valueItem) {
+            this.options.push(valueItem)
+            this.options = uniqBy(this.options, 'userId')
+          }
       }
     },
     changeValue(val) {

src/views/teacherManager/teacherDetail/components/teacherInfo.vue

@@ -170,7 +170,7 @@
           </el-row>
              <el-row>
             <el-col :span="12">
-              <el-form-item label="转证日期"
+              <el-form-item label="转正日期"
                             :label-width="formLabelWidth">
                 <el-input disabled
                           v-model.trim="topForm.formalStaffDate"></el-input>

src/views/teacherManager/teacherList.vue

@@ -107,7 +107,7 @@
             v-model.trim="searchForm.isProbationPeriod"
             clearable
             filterable
-            placeholder="人事状态"
+            placeholder="员工状态"
           >
             <el-option label="正式" value="0"></el-option>
             <el-option label="试用" value="1"></el-option>
@@ -184,7 +184,7 @@
               scope.row.jobNature | jobNature
             }}</template>
           </el-table-column>
-          <el-table-column align="center" label="人事状态">
+          <el-table-column align="center" label="员工状态">
             <template slot-scope="scope">
               {{ scope.row.isProbationPeriod == 0 ? "正式" : "试用" }}
             </template>
@@ -219,7 +219,7 @@
               }}</el-button>
             </template>
           </el-table-column>
-             <el-table-column align="center" label="转证日期">
+             <el-table-column align="center" label="转正日期">
             <template slot-scope="scope">
               <div>
                 {{scope.row.formalStaffDate | dayjsFormat}}

src/views/teacherManager/teacherOperation/components/teacherOperation.vue

@@ -135,7 +135,7 @@
           <el-row>
             <el-col :span="12">
               <el-form-item
-                label="人事状态"
+                label="员工状态"
                 prop="isProbationPeriod"
                 :label-width="formLabelWidth"
               >
@@ -143,7 +143,7 @@
                   v-model.trim="topForm.isProbationPeriod"
                   clearable
                   filterable
-                  placeholder="人事状态"
+                  placeholder="员工状态"
                 >
                   <el-option label="正式" :value="0"></el-option>
                   <el-option label="试用" :value="1"></el-option>
@@ -282,12 +282,12 @@
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="转证日期" :label-width="formLabelWidth">
+              <el-form-item label="转正日期" :label-width="formLabelWidth">
                 <el-date-picker
                    v-model="topForm.formalStaffDate"
                     value-format="yyyy-MM-dd"
                   type="date"
-                  placeholder="选择转证日期"
+                  placeholder="选择转正日期"
                 >
                 </el-date-picker>
               </el-form-item>
@@ -439,7 +439,7 @@ export default {
           { required: true, message: "请选择工作类型", trigger: "change" },
         ],
         isProbationPeriod: [
-          { required: true, message: "请选择人事状态", trigger: "change" },
+          { required: true, message: "请选择员工状态", trigger: "change" },
         ],
         organId: [
           { required: true, message: "请选择所属分部", trigger: "change" },