Merge branch '11/24SAAS' of http://git.dayaedu.com/yonge/dy-admin-manager into 11/24SAAS

src/views/categroyManager/insideSetting/branchManager.vue

@@ -204,14 +204,14 @@
               clearable
             >
               <el-option
-                v-for="item in educationList"
-                :key="item.key"
-                :label="item.value"
-                :value="item.key"
+                v-for="(item, key) in educationList"
+                :key="key"
+                :label="item"
+                :value="key"
               >
-                <span style="float: left">{{ item.value }}</span>
+                <span style="float: left">{{ item }}</span>
                 <span style="float: right; color: #8492a6; font-size: 13px">{{
-                  String(item.key)
+                  String(key)
                 }}</span>
               </el-option>
             </el-select>

src/views/teamBuild/components/teamBaseInfo.vue

@@ -252,7 +252,7 @@
               v-for="(item, key) in educationList"
               :key="key"
               :label="item"
-              :value="key"
+              :value="Number(key)"
             >
               <span style="float: left">{{ item }}</span>
               <span style="float: right; color: #8492a6; font-size: 13px">{{
@@ -455,7 +455,7 @@ export default {
         section: "", //所属分部
         courseViewType: "", // 收费模式
         school: "", // 合作单位
-        teacher: "", // 乐团主管
+        teacher: null, // 乐团主管
         name: "", //乐团名称
         boss: "", // 运营主管
         time: "", // 报名截止时间
@@ -767,7 +767,7 @@ export default {
     },
     changeSection(val) {
       // 修改分部的时候 重置运营主管 重置乐团主管 重置乐队指导 合作单位  教学点
-      this.topFrom.teacher = "";
+      this.topFrom.teacher = null;
       this.topFrom.boss = "";
       this.topFrom.head = "";
       this.topFrom.school = "";
@@ -834,14 +834,14 @@ export default {
     },
     chioseSchool(val) {
       // 清除教学点
-      this.topFrom.teacher = "";
+      this.topFrom.teacher = null;
       if (val) {
         console.log(this.cooperationList);
         this.cooperationList.forEach((item) => {
           if (item.id == val) {
             console.log(item);
             this.$set(this.topFrom, "teacher", item.educationUserId);
-            // this.topFrom.teacher = item.educationUserId;
+            console.log(this.topFrom)
           }
         });
       }