Merge branch '11/24SAAS' into fine_music_score

src/views/teamBuild/components/teamBaseInfo.vue

@@ -355,6 +355,7 @@
               filterable
               :disabled="basdisabled || !topFrom.section"
               clearable
+              multiple
             >
               <el-option
                 v-for="(item, index) in gradeList"
@@ -448,7 +449,12 @@
                 :key="index"
                 :label="item.label"
                 :value="item.value"
-                :disabled="item.value <= topFrom.firstRecruitGrade"
+                :disabled="
+                  item.value <=
+                    (topFrom.firstRecruitGrade.length > 0
+                      ? Math.max(...topFrom.firstRecruitGrade)
+                      : 0)
+                "
               ></el-option>
             </el-select>
           </el-form-item>
@@ -701,7 +707,7 @@ export default {
         transactionTeacherId: null, // 衔接老师
         extracurricularTeacher: "NORMAL",
         musicGroupPlanMakingId: "", //建团编制
-        firstRecruitGrade: "", // 成团年级
+        firstRecruitGrade: [], // 成团年级
         defaultChargeStandard: "", // 收费标准
         singleTrainMinutes: "", //单次训练时长
         coursePlan: "", // 课程计划
@@ -1007,7 +1013,7 @@ export default {
       this.topFrom.head = "";
       this.topFrom.school = "";
       this.topFrom.address = "";
-      this.topFrom.firstRecruitGrade = "";
+      this.topFrom.firstRecruitGrade = [];
       this.topFrom.graduateGrade = "";
 
       // 发请求 根据分部id 查询所有员工
@@ -1195,7 +1201,7 @@ export default {
               memberCourseShowFlag: this.topFrom.memberCourseShowFlag,
               extracurricularTeacher: this.topFrom.extracurricularTeacher,
               musicGroupPlanMakingId: this.topFrom.musicGroupPlanMakingId,
-              firstRecruitGrade: this.topFrom.firstRecruitGrade,
+              firstRecruitGrade: this.topFrom.firstRecruitGrade.join(","),
               defaultChargeStandard: this.topFrom.defaultChargeStandard,
               singleTrainMinutes: this.topFrom.singleTrainMinutes,
               coursePlan: this.topFrom.coursePlan,
@@ -1325,7 +1331,7 @@ export default {
         memberCourseShowFlag: 0,
         extracurricularTeacher: "NORMAL",
         musicGroupPlanMakingId: "",
-        firstRecruitGrade: "",
+        firstRecruitGrade: [],
         defaultChargeStandard: "",
         singleTrainMinutes: "",
         coursePlan: "",
@@ -1583,8 +1589,9 @@ export default {
 
       this.topFrom.musicGroupPlanMakingId =
         res.data.musicGroup.musicGroupPlanMakingId;
-      this.topFrom.firstRecruitGrade =
-        res.data.musicGroup.firstRecruitGrade + "";
+      this.topFrom.firstRecruitGrade = res.data.musicGroup.firstRecruitGrade
+        ? res.data.musicGroup.firstRecruitGrade.split(",")
+        : [];
       this.topFrom.defaultChargeStandard =
         res.data.musicGroup.defaultChargeStandard;
       this.topFrom.singleTrainMinutes = res.data.musicGroup.singleTrainMinutes;