Merge branch 'Nov16thResetMusic' of http://git.dayaedu.com/molingzhide/dy-admin-manager into Nov16thResetMusic

src/views/teamDetail/components/salaryList.vue

@@ -33,7 +33,7 @@
           </template>
         </el-table-column>
         <el-table-column align='center'
-                         prop="classGroupName"
+                         prop="courseScheduleName"
                          label="班级名称">
         </el-table-column>
         <el-table-column align='center'
@@ -47,7 +47,24 @@
         </el-table-column>
         <el-table-column align='center'
                          prop="teacherNum"
-                         label="老师人数">
+                         label="主教老师">
+          <template slot-scope="scope">
+            <div>
+              {{scope.row.masterTeacherName }}({{scope.row.masterTeacherId}})
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column align='center'
+                         prop="teacherNum"
+                         label="助教老师">
+          <template slot-scope="scope">
+            <div>
+              <p v-for="(item,index) in scope.row.teachingTeachers"
+                 :key="index"
+                 v-if="item.teacherRole == 'TEACHING'"> {{item.userName }}({{item.userId}})</p>
+
+            </div>
+          </template>
         </el-table-column>
 
         <el-table-column align='center'

src/views/teamDetail/teamList.vue

@@ -315,9 +315,7 @@ export default {
       }
 
       sessionStorage.setItem('resetCode', '1')
-      this.$nextTick(res => {
-        this.getList();
-      })
+
       getEmployeeOrgan().then(res => {
         if (res.code == 200) {
           this.organList = res.data;
@@ -332,6 +330,7 @@ export default {
       // 获取乐团合作单位(学校)
       // getCooperation().then(res => {
       // })
+      this.getList();
     },
     permission (str) {
       return permission(str)