Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/components/schedul/appoint-form.vue

@@ -55,7 +55,7 @@
             </template>
           </q-field>
         </div>
-        <q-select filled stack-label option-value="Name" option-label="Name" v-model="addMsg.ClassContent"
+        <q-select filled stack-label option-value="Name" option-label="Name" @input="getTeacherChoose(addMsg.ClassContent)" v-model="addMsg.ClassContent"
           ref="ClassContent" :options="ContentList" :rules="[val => !!val || '请选择主讲内容']" label="主讲内容" :dense="false"
           class="col-6 q-pb-lg" emit-value map-options />
         <q-select filled stack-label option-value="TId" option-label="TeacherName" v-model="addMsg.TeacherId"
@@ -114,6 +114,7 @@
           ClassContent: "", //主讲内容
         },
         TeacherList: [], //教师
+        AllTeacherList: [],
         ClassRoomList: [], //教室
         saveAppointLoading: false,
         isShowTeacher: false, //显示选择框
@@ -152,11 +153,13 @@
         getTeacherDropDownList({}).then(res => {
           if (res.Code == 1) {
             this.TeacherList = res.Data;
+            this.AllTeacherList = res.Data;
             var obj = {
               TeacherName: '请选择',
               TId: 0
             }
             this.TeacherList.unshift(obj);
+            this.AllTeacherList.unshift(obj);
           }
         });
       },
@@ -232,6 +235,24 @@
           this.addMsg.EndTime = obj.EndTime;
           this.addMsg.ClassContent = obj.ClassContent;
         }
+      },
+      //选择主讲内容赋值选择教师
+      getTeacherChoose(content){
+        var TList = [];
+        this.addMsg.TeacherId='';
+        this.TeacherList = this.AllTeacherList;
+        this.TeacherList.forEach(x=>{
+          this.ContentList.forEach(y=>{
+            if(y.Name==content){
+              if(x.TId>0){
+                if(x.ChooseSpecialty.indexOf(y.Id)>-1){
+                  TList.push(x);
+                }
+              }
+            }
+          })
+        })
+        this.TeacherList = TList;
       }
     }
   }

src/components/school/teacher/teacher-form.vue

@@ -22,7 +22,7 @@
           <q-select filled stack-label option-value="PostId" option-label="PostName" v-model="objOption.Post_Id"
             ref="Post_Id" :options="PostList" label="岗位" :dense="false" class="col-6 q-pr-lg" emit-value map-options />
           <q-input filled stack-label maxlength="5" :dense="false" v-model="objOption.BaseStuNum" ref="BaseStuNum"
-            class="col-6 q-pb-lg q-pr-lg" label="带班基础人数" @keyup.native="checkInteger(objOption,'BaseStuNum')" />
+            class="col-6 q-pb-lg" label="带班基础人数" @keyup.native="checkInteger(objOption,'BaseStuNum')" />
           <q-input filled stack-label maxlength="5" :dense="false" v-model="objOption.BaseHourFee" ref="BaseHourFee"
             class="col-6 q-pr-lg" label="基础课时费" @keyup.native="checkPrice(objOption,'BaseHourFee')" />
           <q-select filled stack-label option-value="Id" option-label="Name" v-model="chooseSpecialty" ref="School_Id"
@@ -341,11 +341,11 @@
           !this.$refs.TeacherTel.hasError
         ) {
           let err_msg = ""
-          if (this.objOption.TeacherIcon == '') {
-            err_msg = "请上传教师形象照"
-          } else if (this.objOption.TeacherHead == '') {
-            err_msg = "请上传用户头像"
-          }
+          // if (this.objOption.TeacherIcon == '') {
+          //   err_msg = "请上传教师形象照"
+          // } else if (this.objOption.TeacherHead == '') {
+          //   err_msg = "请上传用户头像"
+          // }
           if (err_msg == "") {
             this.objOption.TeachTag = JSON.stringify(this.tags)
             saveTeacher(this.objOption).then(res => {