Merge branch '03/03SAVECHECK' into online

src/views/teamBuild/components/teamBaseInfo.vue

@@ -525,45 +525,53 @@ export default {
               //   this.$listeners.getBaseInfo(res.data);
               // }
 
-              // 头部
-              this.topFrom.name = res.data.musicGroup.name;
-
-              this.topFrom.time = res.data.musicGroup.applyExpireDate;
-              this.topFrom.type = res.data.musicGroup.chargeTypeId;
-              this.topFrom.startClass = res.data.musicGroup.enrollClasses.split(
-                ","
-              );
-              this.topFrom.paymentPattern = res.data.musicGroup.paymentPattern;
-              this.topFrom.paymentValidStartDate =
-                res.data.musicGroup.paymentValidStartDate;
-              this.topFrom.paymentValidEndDate =
-                res.data.musicGroup.paymentValidEndDate;
-              this.topFrom.section = res.data.musicGroup.organId;
-              this.topFrom.school = res.data.musicGroup.cooperationOrganId;
-              this.topFrom.teacher = res.data.musicGroup.educationalTeacherId;
-              this.topFrom.boss = res.data.musicGroup.teamTeacherId;
-              this.topFrom.address = res.data.musicGroup.schoolId;
-              this.topFrom.salary = res.data.musicGroup.settlementType;
-              this.topFrom.head = res.data.musicGroup.directorUserId
-                ? res.data.musicGroup.directorUserId
-                : null;
-              this.topFrom.isClass = res.data.musicGroup.isClassroomLessons;
-              this.topFrom.startTime = res.data.musicGroup.expectStartGroupDate;
-              this.topFrom.ownershipType = res.data.musicGroup.ownershipType;
-              this.topFrom.repairUserId = res.data.musicGroup.repairUserId
-                ? res.data.musicGroup.repairUserId
-                : null;
-              this.topFrom.feeType = res.data.musicGroup.feeType
-                ? res.data.musicGroup.feeType
-                : null;
-              // // 循环缴费月
-              // this.payList.chioseMonth = res.data.months;
-              if (res.data.musicGroup.organId) {
-                // 获取员工
-                queryEmployByOrganId({
-                  organId: res.data.musicGroup.organId,
-                  rows: 1000,
-                }).then((res) => {
+            // 头部
+            this.topFrom.name = res.data.musicGroup.name;
+            this.$emit("getName", this.topFrom.name);
+            this.topFrom.time = res.data.musicGroup.applyExpireDate;
+            this.topFrom.type = res.data.musicGroup.chargeTypeId;
+            this.topFrom.startClass = res.data.musicGroup.enrollClasses.split(
+              ","
+            );
+            this.topFrom.paymentPattern = res.data.musicGroup.paymentPattern;
+            this.topFrom.paymentValidStartDate =
+              res.data.musicGroup.paymentValidStartDate;
+            this.topFrom.paymentValidEndDate =
+              res.data.musicGroup.paymentValidEndDate;
+            this.topFrom.section = res.data.musicGroup.organId;
+            this.topFrom.courseViewType = res.data.musicGroup.courseViewType;
+            this.topFrom.school = res.data.musicGroup.cooperationOrganId;
+            this.topFrom.teacher = res.data.musicGroup.educationalTeacherId;
+            this.topFrom.boss = res.data.musicGroup.teamTeacherId;
+            this.topFrom.address = res.data.musicGroup.schoolId;
+            this.topFrom.salary = res.data.musicGroup.settlementType;
+            this.topFrom.head = res.data.musicGroup.directorUserId
+              ? res.data.musicGroup.directorUserId
+              : null;
+            this.topFrom.isClass = res.data.musicGroup.isClassroomLessons;
+            this.topFrom.startTime = res.data.musicGroup.expectStartGroupDate;
+            this.topFrom.ownershipType = res.data.musicGroup.ownershipType;
+            this.topFrom.repairUserId = res.data.musicGroup.repairUserId
+              ? res.data.musicGroup.repairUserId
+              : null;
+            this.topFrom.feeType = res.data.musicGroup.feeType
+              ? res.data.musicGroup.feeType
+              : null;
+            // // 循环缴费月
+            // this.payList.chioseMonth = res.data.months;
+            if (res.data.musicGroup.organId) {
+              // 获取员工
+              queryEmployByOrganId({
+                organId: res.data.musicGroup.organId,
+                rows: 1000,
+              }).then((res) => {
+                if (res.code == 200) {
+                  this.orgianList = res.data.rows;
+                }
+              });
+              // 获取合作单位
+              queryByOrganId({ organId: res.data.musicGroup.organId }).then(
+                (res) => {
                   if (res.code == 200) {
                     this.orgianList = res.data.rows;
                   }