Merge branch 'Nov16thResetMusic' into online

src/views/teamDetail/componentCourse/infoMsg.vue

@@ -72,6 +72,7 @@ export default {
         classDate: item.classDate,
         endClassTime: item.endClassTime,
         teachMode: item.teachMode,
+        schoolName: item.schoolName,
         timers: this.getTimers(item)
       }
     },

src/views/teamDetail/componentCourse/infoMsgContent.vue

@@ -13,16 +13,6 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="助教老师">
-            <!-- <div>{{item.teacherName}}</div> -->
-            <div v-if="diff.hasOwnProperty('teacherName')">
-              <el-tag v-if="before.teacherName" type="danger"><s>{{before.teacherName}}</s></el-tag>
-              <el-tag v-if="after.teacherName" type="success">{{after.teacherName}}</el-tag>
-            </div>
-            <div v-else>{{after.teacherName}}</div>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
           <el-form-item label="上课时间">
             <!-- <div>{{ item.startClassTime ? item.startClassTime.substr(0, 16) : '' }}-{{ item.endClassTime ? item.endClassTime.substr(11,5) : ''}}</div> -->
             <div v-if="diff.hasOwnProperty('startClassTime')">
@@ -52,6 +42,15 @@
             <div v-else>{{after.teachMode | teachMode}}</div>
           </el-form-item>
         </el-col>
+        <el-col :span="24">
+          <el-form-item label="教学地点">
+            <div v-if="diff.hasOwnProperty('schoolName')">
+              <el-tag type="danger"><s>{{before.schoolName}}</s></el-tag>
+              <el-tag type="success">{{after.schoolName}}</el-tag>
+            </div>
+            <div v-else>{{after.schoolName}}</div>
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
   </div>

src/views/teamDetail/componentCourse/resetClass.vue

@@ -158,8 +158,8 @@ export default {
       schoolList: []
     }
   },
-  mounted () {
-    getTeacher().then(res => {
+  async mounted () {
+    await getTeacher().then(res => {
       if (res.code == 200) {
         this.teacherList = res.data;
       }
@@ -249,12 +249,12 @@ export default {
             address: res.data.schoolId,
             teachMode: res.data.teachMode,
           }
-          this.maskForm.assistant = [];
-          for (let i in res.data.teachingTeachers) {
-            if (res.data.teachingTeachers[i].teacherRole == "TEACHING") {
-              this.maskForm.assistant.push(res.data.teachingTeachers[i].userId);
-            }
-          }
+          this.maskForm.assistant = res.data.teachingTeacherIdList;
+          // for (let i in res.data.teachingTeachers) {
+          //   if (res.data.teachingTeachers[i].teacherRole == "TEACHING") {
+          //     this.maskForm.assistant.push(res.data.teachingTeachers[i].userId);
+          //   }
+          // }
           let time = diffTimerFormMinute(dayjs(res.data.classDate).format('YYYY-MM-DD'), dayjs(res.data.startClassTime).format('HH:mm'), dayjs(res.data.endClassTime).format('HH:mm'))
           console.log(dayjs(res.data.startClassTime).format('HH:mm'))
           this.maskForm.timer = time;

src/views/teamDetail/components/baseInfo.vue

@@ -3,6 +3,8 @@
     <div class="baseTop">
       <div class="left">
         <el-form :inline="true"
+                 class="form-list"
+                 label-width="110px"
                  :model="topForm">
           <el-form-item label="乐团编号">
             <el-input v-model.trim="topForm.num"
@@ -38,8 +40,8 @@
           </el-form-item>
           <el-form-item label="上课地点">
             <el-input v-model.trim="topForm.add"
-                      disabled
-                      style="width:370px;"></el-input>
+                      type="textarea"
+                      disabled></el-input>
           </el-form-item>
           <el-form-item label="收费类型">
             <el-input v-model.trim="topForm.type"
@@ -367,5 +369,16 @@ export default {
       }
     }
   }
+  .form-list{
+    /deep/ .el-form-item__content{
+      width: 220px;
+      .el-select{
+        width: 100%!important;
+      }
+      .el-textarea.is-disabled .el-textarea__inner{
+        color: #606266;
+      }
+    }
+  }
 }
 </style>