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

src/api/system/index.js

@@ -365,3 +365,14 @@ export function RemoveClassType(data) {
   });
 }
 
+/**
+ * 获取班级类型下拉
+ */
+export function GetClassTypeList(data) {
+  return request({
+    url: '/Public/GetClassTypeList',
+    method: 'post',
+    data
+  });
+}
+

src/components/course/class-form.vue

@@ -273,7 +273,7 @@
               class="col-6 q-pr-lg q-pb-lg" label="学习课时" />
           </div>
           <div class="col-6">
-            <q-select filled stack-label option-value="Id" option-label="Name" v-model="objOption.ClassType"
+            <q-select filled stack-label option-value="CTypeId" option-label="CTypeName" v-model="objOption.ClassType"
               ref="CouseId" :options="classTypeList" label="班级类型" :dense="false" class="col-6 q-pr-lg q-pb-lg"
               emit-value map-options />
           </div>
@@ -299,6 +299,9 @@
   import {
     queryCourseDropdownList,
   } from '../../api/course/index'
+  import {
+    GetClassTypeList
+  } from '../../api/system/index'
   import {
     getTeacherDropDownList,
     getSchoolDropdown,
@@ -371,15 +374,7 @@
           Id: 4
         }],
         //班级类型
-        classTypeList: [{
-            Id: 1,
-            Name: "学生班"
-          },
-          {
-            Id: 2,
-            Name: "社会班"
-          },
-        ],
+        classTypeList: [],
         //周几
         weekList: [{
           label: '周一',
@@ -422,6 +417,7 @@
       this.CourseList();
       this.getClassRoomList();
       this.GetTeacherList();
+      this.GetClassTypeList();
     },
     mounted() {
       this.initObj()
@@ -641,6 +637,14 @@
       //删除学习时段
       deletePlanTime(index) {
         this.DefaultPlanTimeList.splice(index, 1);
+      },
+      //获取班级类型下拉
+      GetClassTypeList(){
+        GetClassTypeList({}).then(res => {
+          if (res.Code == 1) {
+            this.classTypeList = res.Data;
+          }
+        })
       }
     },
   }