12/22 老师弹窗优化

dist/static/css/chunk-362c5604.c301c4fd.css → dist/static/css/chunk-0268ac20.289756c1.css

@@ -1 +1 @@
-[data-v-2d1b31cc] .dialog-footer{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}[data-v-cd4b7950] .el-calendar-day{-webkit-box-sizing:border-box;box-sizing:border-box;height:80px!important;min-width:118px}[data-v-cd4b7950] .current.is-selected{border:2px solid #137f79}[data-v-cd4b7950] .current.is-selected .el-calendar-day{height:76px!important}.vipDot[data-v-cd4b7950]{background-color:#2aaea6}.teamDot[data-v-cd4b7950],.vipDot[data-v-cd4b7950]{width:30px;height:30px;margin-top:10px;display:inline-block;border-radius:50%;text-align:center;line-height:30px;color:#fff;font-size:14px}.teamDot[data-v-cd4b7950]{background-color:#5a79f6}.newDot[data-v-cd4b7950]{width:30px;height:30px;margin-top:10px;background-color:#34b1f6;display:inline-block;border-radius:50%;text-align:center;line-height:30px;color:#fff;font-size:14px}
+[data-v-68cbd11d] .dialog-footer{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}[data-v-cd4b7950] .el-calendar-day{-webkit-box-sizing:border-box;box-sizing:border-box;height:80px!important;min-width:118px}[data-v-cd4b7950] .current.is-selected{border:2px solid #137f79}[data-v-cd4b7950] .current.is-selected .el-calendar-day{height:76px!important}.vipDot[data-v-cd4b7950]{background-color:#2aaea6}.teamDot[data-v-cd4b7950],.vipDot[data-v-cd4b7950]{width:30px;height:30px;margin-top:10px;display:inline-block;border-radius:50%;text-align:center;line-height:30px;color:#fff;font-size:14px}.teamDot[data-v-cd4b7950]{background-color:#5a79f6}.newDot[data-v-cd4b7950]{width:30px;height:30px;margin-top:10px;background-color:#34b1f6;display:inline-block;border-radius:50%;text-align:center;line-height:30px;color:#fff;font-size:14px}

dist/static/css/chunk-08223b54.c42f80a0.css

@@ -0,0 +1 @@
+.el-button+.el-button[data-v-6615b6e2]{margin-left:0}

dist/static/css/chunk-5529f295.59a556c2.css

@@ -1 +0,0 @@
-.el-button+.el-button[data-v-6c13aaf8]{margin-left:0}

src/components/remote-search/index.vue

@@ -41,12 +41,10 @@ export default {
       constant: this.number || 50,
       placeholder:placeholder[this.commit],
       selectWidt:this.width || 180,
-      first:ture,
-      isFather
+      isFirst:true
     };
   },
   async mounted() {
-    this.first = true
     await this.$store.dispatch(this.commit);
 
     this.list = this.selects[this.enumer[this.commit]];
@@ -56,8 +54,8 @@ export default {
         ? this.list
         : slice(this.list, 0, this.constant);
 
-  throttle(this.getOptions,800)('')
-  console.log(this.value)
+    throttle(this.getOptions,800)('')
+
   },
   methods: {
     remoteMethod(query) {
@@ -66,19 +64,19 @@ export default {
 
     },
     getOptions(query) {
-      console.log('进来了',this.value)
-      let flag = (query&&item.userName.toLowerCase().indexOf(query.toLowerCase())>-1) || item.userId == query
       this.options = this.list.filter(item=>{
+         let flag = (query&&item.userName.toLowerCase().indexOf(query.toLowerCase())>-1) || item.userId == query
         if(this.multiple){
+
           return flag || this.value.includes(item.userId)
         }else{
            return flag || item.userId == this.value
         }
 
       })
-      this.first = true;
     },
     changeValue(val){
+      this.isFirst = false
        this.$emit("input", val);
        this.$emit("change",val)
     }
@@ -90,6 +88,18 @@ export default {
         setEducations: "educations",
       };
     },
+  },
+  watch:{
+    value:{
+      immediate:true,
+      deep:true,
+      handler(val){
+      if(val&&this.isFirst){
+        throttle(this.getOptions,800)('')
+      }
+      }
+
+    }
   }
 };
 </script>

src/views/teacherManager/teacherList.vue

@@ -219,6 +219,13 @@
               }}</el-button>
             </template>
           </el-table-column>
+             <el-table-column align="center" label="离职日期">
+            <template slot-scope="scope">
+              <div>
+                {{scope.row.demissionDate | dayjsFormat}}
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column
             align="center"
             fixed="right"
@@ -396,43 +403,6 @@ export default {
       await this.$store.dispatch('setBranchs')
 
       await this.$store.dispatch('setSubjects')
-      // getEmployeeOrgan().then((res) => {
-      //   if (res.code == 200) {
-      //     this.branchList = [];
-      //     res.data.forEach((item) => {
-      //       this.branchList.push({
-      //         label: item.name,
-      //         value: item.id,
-      //       });
-      //     });
-      //   }
-      // });
-
-      // subjectListTree({
-      //   delFlag: "NO",
-      //   rows: 9999,
-      // }).then((res) => {
-      //   let result = res.data;
-      //   if (res.code == 200) {
-      //     let tempArray = [];
-      //     result.rows.forEach((item, index) => {
-      //       let subject = [];
-      //       item.subjects.forEach((s) => {
-      //         subject.push({
-      //           value: s.id,
-      //           label: s.name,
-      //         });
-      //       });
-
-      //       tempArray[index] = {
-      //         label: item.name,
-      //         options: subject,
-      //       };
-      //     });
-      //     this.subjectList = tempArray;
-      //   }
-      // });
-      // this.getList();
     },
     onTeacher(type, row) {
       let params = {

src/views/teamDetail/componentCourse/resetClass.vue

@@ -20,7 +20,7 @@
       <el-form-item label="主教老师" v-else prop="teacher">
         <remote-search :commit="'setTeachers'" v-model="maskForm.teacher" :width='220'/>
       </el-form-item>
-      <!-- <el-form-item
+      <el-form-item
         label="助教老师"
         v-if="
           maskForm.type != 'MUSIC_NETWORK' &&
@@ -30,7 +30,7 @@
         prop="assistant"
       >
          <remote-search :commit="'setTeachers'" v-model="maskForm.assistant" :width='220'  :multiple='true'/>
-      </el-form-item> -->
+      </el-form-item>
       <el-form-item label="上课日期" prop="date">
         <el-date-picker
           v-model.trim="maskForm.date"

src/views/teamDetail/components/courseList.vue

@@ -187,6 +187,7 @@
                :before-close="handleClose"
                :visible.sync="courseVisible">
       <el-form :model="maskForm"
+      v-if="courseVisible"
                class="maskForm"
                ref="maskForm"
                :rules="maskRules"
@@ -195,28 +196,12 @@
                :inline="true">
         <el-form-item label="主教老师"
                       prop="teacher">
-          <el-select v-model.trim="maskForm.teacher"
-                     clearable
-                     filterable>
-            <el-option v-for="(item,index) in teacherList"
-                       :key="index"
-                       :value="item.id"
-                       :label="item.realName"></el-option>
-          </el-select>
+         <remote-search :commit="'setTeachers'" v-model="maskForm.teacher" :width='220'/>
         </el-form-item>
         <el-form-item label="助教老师"
                       v-if="maskForm.courseScheduleType != 'MUSIC_NETWORK'&&maskForm.courseScheduleType != 'HIGH_ONLINE'"
                       prop="assistant">
-          <el-select v-model.trim="maskForm.assistant"
-                     clearable
-                     filterable
-                     multiple
-                     collapse-tags>
-            <el-option v-for="(item,index) in teacherList"
-                       :key="index"
-                       :value="item.id"
-                       :label="item.realName"></el-option>
-          </el-select>
+          <remote-search :commit="'setTeachers'" v-model="maskForm.assistant" :width='220'  :multiple='true'/>
         </el-form-item>
         <el-form-item label="上课日期"
                       prop="date">