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

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

@@ -20,14 +20,16 @@
             nodeKey="DeptId" :multiple="false" labelKey="DeptName" childrenKey="ChildList" tipText="选择部门"
             @getChild="getChild" classStr="col-6 q-pr-lg q-pb-lg"></selectTree>
           <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 q-pb-lg" emit-value
-            map-options />
+            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')" />
           <q-input filled stack-label maxlength="5" :dense="false" v-model="objOption.BaseHourFee" ref="BaseHourFee"
-            class="col-6 q-pr-lg q-pb-lg" label="基础课时费" @keyup.native="checkPrice(objOption,'BaseHourFee')" />
+            class="col-6 q-pr-lg" label="基础课时费" @keyup.native="checkPrice(objOption,'BaseHourFee')" />
+          <q-input type="textarea" filled stack-label maxlength="450" :dense="false" v-model="objOption.Specialty"
+            class="col-12 q-pr-lg" label="老师擅长" />
         </div>
-        <div class="row wrap">
+
+        <div class="row wrap" style="margin-top:20px;">
           <div class="col-6 q-pr-lg q-pb-lg">
             <q-uploader style="display: inline-block;height: 320px;max-width: 100%; background-repeat:no-repeat"
               :style="{'background-image':'url(' + objOption.TeacherHead + ')'}" max-files="1" hide-upload-btn
@@ -43,7 +45,11 @@
             </q-uploader>
           </div>
         </div>
-        <ext-editor :defaultMsg="objOption.TeacherIntro" classStr="col-12" @getEditValue="getEditValue"></ext-editor>
+        <div class="text-caption q-mb-lg q-px-md text-grey-6">老师介绍</div>
+        <div class="row wrap">
+          <ext-editor :defaultMsg="objOption.TeacherIntro" classStr="col-12" @getEditValue="getEditValue">
+          </ext-editor>
+        </div>
         <div class="row wrap">
           <div class="col-6 q-pr-lg q-pb-lg">
             <q-toggle size="md" label="是否显示" color="primary" :false-value="0" :true-value="1"
@@ -136,6 +142,7 @@
           Post_Id: 0, //岗位编号
           BaseStuNum: 0, //带班基础人数
           BaseHourFee: 0, //基础课时费
+          Specialty:"",//老师擅长
         },
         optionTitle: "",
         schoolList: [],
@@ -249,6 +256,7 @@
           this.objOption.Post_Id = this.saveObj.Post_Id;
           this.objOption.BaseStuNum = this.saveObj.BaseStuNum;
           this.objOption.BaseHourFee = this.saveObj.BaseHourFee;
+          this.objOption.Specialty=this.saveObj.Specialty;
           if (this.objOption.School_Id) {
             this.queryDeptTree();
           }
@@ -261,7 +269,6 @@
           }
         } else {
           this.optionTitle = "新增教师";
-
         }
       },
       removeTag(i) {

src/pages/course/classPlan.vue

@@ -2,15 +2,13 @@
   <div class="page-body MainPlan">
     <div class="col row wrap q-col-gutter-md">
       <div class="col-2">
-        <el-select v-model="msg.TeacherId" style="width:100%;" placeholder="教师团队" size="small"
-          @change="getPlanList()">
+        <el-select v-model="msg.TeacherId" style="width:100%;" placeholder="教师团队" size="small" @change="getPlanList()">
           <el-option v-for="item in TeacherList" :key="item.TeacherName" :label="item.TeacherName" :value="item.TId">
           </el-option>
         </el-select>
       </div>
       <div class="col-2">
-        <el-select v-model="msg.ClassRoomId" style="width:100%;" placeholder="教室" size="small"
-          @change="getPlanList()">
+        <el-select v-model="msg.ClassRoomId" style="width:100%;" placeholder="教室" size="small" @change="getPlanList()">
           <el-option v-for="item in ClassRoomList" :key="item.RoomName" :label="item.RoomName" :value="item.RoomId">
           </el-option>
         </el-select>
@@ -25,6 +23,16 @@
           style="width:100%;" @change="getPlanList()" clear-icon="iconfont icon-guanbi">
         </el-date-picker>
       </div>
+      <div class="col-2">
+        <el-select v-model="msg.ClassType" style="width:100%;" placeholder="类型" size="small" @change="getPlanList()">
+          <el-option :key="0" label="全部" :value="0">
+          </el-option>
+          <el-option :key="1" label="正常" :value="1">
+          </el-option>
+          <el-option :key="2" label="试听课" :value="2">
+          </el-option>
+        </el-select>
+      </div>
     </div>
     <classmateForm :dataList="dataList"></classmateForm>
   </div>
@@ -56,11 +64,12 @@
         ClassRoomId: 0,
         dataList: {},
         activeNames: [1],
-        msg:{
+        msg: {
           StartTime: "",
           EndTime: '',
           TeacherId: 0,
-          ClassRoomId: 0
+          ClassRoomId: 0,
+          ClassType:0,
         }
       };
     },