05/15 10:49

11

src/App.vue

@@ -7,7 +7,7 @@
 
 <script>
 export default {
-  name: 'App'
+  name: 'App',
 }
 </script>
 <style >
@@ -294,5 +294,4 @@ input[type="number"] {
   color: #333;
   opacity: 1;
 }
-
 </style>

src/layout/components/TagsView.vue

@@ -21,6 +21,7 @@
       <li @click="closeSelectedTag(selectedTag)">关闭</li>
       <li @click="closeOthersTags">关闭其他</li>
       <li @click="closeAllTags">关闭所有</li>
+      <li @click="refresh(selectedTag)">刷新</li>
     </ul>
   </div>
 </template>
@@ -127,6 +128,10 @@ export default {
     },
     closeMenu () {
       this.visible = false
+    },
+    refresh (view) {
+      // this.$router.push(view.fullPath)
+      location.reload()
     }
   }
 }

src/views/resetTeaming/index.vue

@@ -2,7 +2,7 @@
   <div class="m-container">
     <h2>
       <el-page-header @back="onCancel"
-                      :content="name"></el-page-header>
+                      content="乐团修改"></el-page-header>
 
     </h2>
     <div class="m-core">
@@ -104,7 +104,7 @@ export default {
       return permission(str)
     },
     getName (val) {
-      this.name = val
+      // this.name = val
     }
   },
 }

src/views/teamBuild/teamSeting/components/salarySet.vue

@@ -50,9 +50,11 @@
               <span>课酬:</span>
               <!-- &&scope.row.teacherDefaultMusicGroupSalaryList[0].mainTeacherSalary &&scope.row.teacherDefaultMusicGroupSalaryList[0].mainTeacherSalary-->
               <el-input style="width: 80px;margin-right:10px"
+                        :disabled="true"
                         v-if='scope.row.teacherDefaultMusicGroupSalaryList&&scope.row.teacherDefaultMusicGroupSalaryList[0]&&scope.row.teacherRole =="TEACHING"'
                         v-model.trim="scope.row.teacherDefaultMusicGroupSalaryList[0].assistantTeacher30MinSalary"></el-input>
               <el-input style="width: 80px;margin-right:10px"
+                        :disabled="true"
                         v-if='scope.row.teacherDefaultMusicGroupSalaryList&&scope.row.teacherDefaultMusicGroupSalaryList[0]&&scope.row.teacherRole =="BISHOP"'
                         v-model.trim="scope.row.teacherDefaultMusicGroupSalaryList[0].mainTeacher30MinSalary"></el-input>
             </div>
@@ -96,12 +98,14 @@
                 <div v-if="scope.row.teacherRole =='TEACHING'">
                   <span>课酬:</span>
                   <el-input style="width: 80px;margin-right:10px"
+                            :disabled="true"
                             v-model.trim="scope.row.teacherDefaultMusicGroupSalaryList[index].assistantTeacher90MinSalary"></el-input>
                 </div>
                 <!-- 梯度{{index+1}}: -->
                 <div v-if="scope.row.teacherRole =='BISHOP'">
                   <span>课酬:</span>
                   <el-input style="width: 80px;margin-right:10px"
+                            :disabled="true"
                             v-model.trim="scope.row.teacherDefaultMusicGroupSalaryList[index].mainTeacher90MinSalary"></el-input>
                 </div>
               </div>

src/views/teamBuild/teamSeting/components/setImprovement.vue

@@ -14,15 +14,19 @@
         <el-table :header-cell-style="{background:'#EDEEF0',color:'#444'}"
                   :data='tableList'>
           <el-table-column label="班级名称"
+                           align="center"
                            prop="name">
           </el-table-column>
           <el-table-column label="声部"
+                           align="center"
                            prop="subjectName">
           </el-table-column>
           <el-table-column label="预计人数"
+                           align="center"
                            prop="expectStudentNum">
           </el-table-column>
           <el-table-column label="实际人数"
+                           align="center"
                            prop="studentNum">
           </el-table-column>
           <el-table-column label="操作">
@@ -270,6 +274,7 @@ export default {
           getClassAllStudent({ classGroupId: this.activeClass }).then(res => {
             if (res.code == 200) {
               this.classList = res.data;
+              this.getList();
             }
           })
         }

src/views/teamDetail/components/resetClass.vue

@@ -135,8 +135,8 @@
                @click="addNewClass('MIX')">新建合奏班</div>
           <div class="add"
                @click="addNewClass('HIGH')">基础技能班</div>
-          <div class="add"
-               @click="addNewClass('HIGH_ONLINE')">线上基础技能班</div>
+          <!-- <div class="add"
+               @click="addNewClass('HIGH_ONLINE')">线上基础技能班</div> -->
         </div>
       </div>
     </div>
@@ -1144,34 +1144,36 @@ export default {
         this.$message.error("至少添加一名学员");
         return;
       }
-      if (this.activeType == 'HIGH_ONLINE') {
+      // if (this.activeType == 'HIGH_ONLINE') {
 
-        superFindClassGroups({ classGroupId: this.activeClass }).then(res => {
-          if (res.code == 200) {
-            let maxNum = res.data.rows[0].expectStudentNum;
-            if (arr.length + this.activeListStudent.length > maxNum) {
-              this.$message.error('超过预计招生人数');
-              return;
-            } else if (this.activeListStudent.length > 5 || this.activeListStudent.length < 3) {
-              this.$message.error('线上技能班必须为3-5人');
-              return;
-            } else {
-              addStudents({
-                classGroupId: this.activeClass,
-                userIdsStr: arr.join(",")
-              }).then(res => {
-                if (res.code == 200) {
-                  this.studentVisible = false;
-                  this.$message.success("添加成功");
-                  this.getList();
-                  return
-                }
-              });
-            }
-          }
-        })
-      }else {
-        addStudents({
+      //   superFindClassGroups({ classGroupId: this.activeClass }).then(res => {
+      //     if (res.code == 200) {
+      //       let maxNum = res.data.rows[0].expectStudentNum;
+      //       if (arr.length + this.activeListStudent.length > maxNum) {
+      //         this.$message.error('超过预计招生人数');
+      //         return;
+      //       } else if (this.activeListStudent.length > 5 || this.activeListStudent.length < 3) {
+      //         this.$message.error('线上技能班必须为3-5人');
+      //         return;
+      //       } else {
+      //         addStudents({
+      //           classGroupId: this.activeClass,
+      //           userIdsStr: arr.join(",")
+      //         }).then(res => {
+      //           if (res.code == 200) {
+      //             this.studentVisible = false;
+      //             this.$message.success("添加成功");
+      //             this.getList();
+      //             return
+      //           }
+      //         });
+      //       }
+      //     }
+      //   })
+      // } else {
+
+      // }
+      addStudents({
         classGroupId: this.activeClass,
         userIdsStr: arr.join(",")
       }).then(res => {
@@ -1181,8 +1183,7 @@ export default {
           this.getList();
         }
       });
-      }
-       
+
     },
     SelectionMix (val) {
       this.activeSingleLists = val;