05/14 10:42

筹备中乐团 线上基础技能班单声部

src/views/teamBuild/teamSeting/components/setClassV2.vue

@@ -142,10 +142,9 @@
         <el-form-item label="声部"
                       prop="subjectIdList"
                       :rules="[{ required: true, message: '请选择声部',trigger: 'blur'}]"
-                      v-if=" newClassForm.type == 'HIGH_ONLINE' || newClassForm.type =='HIGH'">
+                      v-if="newClassForm.type =='HIGH'">
           <el-select v-model.trim="newClassForm.subjectIdList"
                      clearable
-                     filterable
                      multiple>
             <el-option v-for="(item,index) in soundList"
                        :key="index"
@@ -153,6 +152,18 @@
                        :value="item.id"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="声部"
+                      prop="subjectIdList"
+                      :rules="[{ required: true, message: '请选择声部',trigger: 'blur'}]"
+                      v-if=" newClassForm.type == 'HIGH_ONLINE'">
+          <el-select v-model.trim="newClassForm.subjectIdList"
+                     clearable>
+            <el-option v-for="(item,index) in soundList"
+                       :key="index"
+                       :label="item.name"
+                       :value="item.id"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="预计招生数"
                       prop="expectStudentNum"
                       :rules="[{ required: true, message: '请输入预计招生数',trigger: 'blur'},{pattern:/[3-5]/,message:'班级人数必须为3-5人',trigger: 'blur'}]"
@@ -535,8 +546,8 @@
                           style="width:200px!important;"
                           type="date"
                           placeholder="选择日期"></el-date-picker>
-          <!-- <el-checkbox style="margin-left:10px;"
-                       v-model.trim="teacherForm.checked">是否跳过节假日</el-checkbox> -->
+          <el-checkbox style="margin-left:10px;"
+                       v-model.trim="arrangeForm.checked">是否跳过节假日</el-checkbox>
         </el-form-item>
         <el-form-item label="排课次数"
                       :rules="[{ required: true, message: '请输入排课次数',trigger: 'blur'}]"
@@ -614,6 +625,10 @@ import {
   removeStudents,
   addStudents
 } from "@/api/studentManager";
+import {
+  sysConfigList
+} from "@/api/generalSettings";
+
 export default {
   components: { pagination },
   props: {
@@ -715,10 +730,11 @@ export default {
         classNum: null,
         courseType: null,
         courseTime: null,
-        teachMode: null
+        teachMode: null,
+        checked: false,
       }, // 排课信息
       chioseTab: [], // 记录选中的项
-      isholiday: false,
+
       classCardList: [] // 课表的集合
     };
   },
@@ -738,9 +754,17 @@ export default {
         this.soundList = res.data;
       }
     });
-
+    // 获取节假日
     this.init();
+    sysConfigList({ group: 'holiday' }).then(res => {
+      if (res.code == 200 && res.data.length > 0) {
+        if (res.data[0].paranValue) {
+          this.holidayList = JSON.parse(res.data[0].paranValue)
+        }
+
 
+      }
+    })
 
   },
   activated () {
@@ -1297,10 +1321,8 @@ export default {
           weekArr[i].dayOfWeek - date.getDay() >= 0 ? num = weekArr[i].dayOfWeek - date.getDay() : num = weekArr[i].dayOfWeek - date.getDay() + 7
 
           let dataStr = this.getThinkDate(date, num);
-          let monthDay = this.getThinkDate(date1, num, 2)
-
-
-          if (this.isholiday) {
+          let monthDay = this.getThinkDate(date1, num)
+          if (this.arrangeForm.checked) {
             if (this.holidayList.indexOf(monthDay) != -1) {
               // 这里说明有节假日
               continue
@@ -1412,6 +1434,21 @@ export default {
         this.activeListStudent = [];
       }
     },
+    infoVisible (val) {
+      if (!val) {
+        this.teacherForm = {
+          isAdd: null,
+          coreTeacher: "",
+          assistant: [],
+          courseType: "",
+          courseTime: "",
+          checked: false,
+          courseNum: "",
+          mixClassGroupId: ""
+        }
+        this.$refs['teacherForm'].resetFields()
+      }
+    }
 
   }
 };