1204 18:00

11

dist/static/css/chunk-1fc81792.4c5321f1.css

@@ -1 +0,0 @@
-.floor[data-v-b7cb25c4]{padding-right:20px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;width:100%;height:48px;line-height:48px;background:#edeef0;font-size:14px;color:#444;-webkit-box-align:center;-ms-flex-align:center;align-items:center;position:relative;z-index:1}.floor .remove[data-v-b7cb25c4]{background:#f85043;margin-left:164px}.floor .add[data-v-b7cb25c4],.floor .remove[data-v-b7cb25c4]{width:98px;height:32px;border-radius:3px;color:#fff;line-height:32px;text-align:center;cursor:pointer}.floor .add[data-v-b7cb25c4]{background:#14928a;margin-left:20px}.studentMask[data-v-b7cb25c4]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.studentMask .left[data-v-b7cb25c4]{width:200px;margin-right:20px}.studentMask .left .wrap[data-v-b7cb25c4]{margin-bottom:20px}.studentMask .left h4[data-v-b7cb25c4]{font-size:16px;color:#444;line-height:38px}.studentMask .left .chioseStudentList[data-v-b7cb25c4]{height:500px;overflow-y:auto;border:1px solid #ccc}.studentMask .left .chioseStudentList .studentItem[data-v-b7cb25c4]{padding-left:10px;line-height:25px}.studentMask .right[data-v-b7cb25c4]{width:calc(100% - 200px)}.studentMask .right .tableList[data-v-b7cb25c4]{max-height:500px;overflow-y:auto}.resetClassForm .el-date-editor.el-input[data-v-b7cb25c4],.resetClassForm .el-date-editor.el-input__inner[data-v-b7cb25c4]{width:180px}.el-date-editor.el-input[data-v-b7cb25c4],.el-date-editor.el-input__inner[data-v-b7cb25c4]{width:100px}

dist/static/css/chunk-db3b2dc8.d464e511.css

@@ -0,0 +1 @@
+.floor[data-v-5c0241c8]{padding-right:20px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;width:100%;height:48px;line-height:48px;background:#edeef0;font-size:14px;color:#444;-webkit-box-align:center;-ms-flex-align:center;align-items:center;position:relative;z-index:1}.floor .remove[data-v-5c0241c8]{background:#f85043;margin-left:164px}.floor .add[data-v-5c0241c8],.floor .remove[data-v-5c0241c8]{width:98px;height:32px;border-radius:3px;color:#fff;line-height:32px;text-align:center;cursor:pointer}.floor .add[data-v-5c0241c8]{background:#14928a;margin-left:20px}.studentMask[data-v-5c0241c8]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.studentMask .left[data-v-5c0241c8]{width:200px;margin-right:20px}.studentMask .left .wrap[data-v-5c0241c8]{margin-bottom:20px}.studentMask .left h4[data-v-5c0241c8]{font-size:16px;color:#444;line-height:38px}.studentMask .left .chioseStudentList[data-v-5c0241c8]{height:500px;overflow-y:auto;border:1px solid #ccc}.studentMask .left .chioseStudentList .studentItem[data-v-5c0241c8]{padding-left:10px;line-height:25px}.studentMask .right[data-v-5c0241c8]{width:calc(100% - 200px)}.studentMask .right .tableList[data-v-5c0241c8]{max-height:500px;overflow-y:auto}.resetClassForm .el-date-editor.el-input[data-v-5c0241c8],.resetClassForm .el-date-editor.el-input__inner[data-v-5c0241c8]{width:180px}.el-date-editor.el-input[data-v-5c0241c8],.el-date-editor.el-input__inner[data-v-5c0241c8]{width:100px}

src/views/teamDetail/components/classList.vue

@@ -51,11 +51,11 @@
                          prop="studyNum"
                          label="在读人数">
         </el-table-column>
-        <el-table-column align='center'
+        <!-- <el-table-column align='center'
                          prop="quitNum"
                          label="退团人数">
 
-        </el-table-column>
+        </el-table-column> -->
         <!-- <el-table-column align='center'
                          label="新增人数">
         </el-table-column> -->

src/views/teamDetail/components/resetClass.vue

@@ -902,9 +902,24 @@ export default {
       //     }
       //   })
       // }
+      // res.data - activeListStudent
       getMusicGroupStuNoClassType({ musicGroupId: this.teamid, type }).then(res => {
         if (res.code == 200) {
-          this.studentList = res.data
+          // this.studentList = res.data.concat(this.activeListStudent).filter(item=>{
+          //   return res.data
+          // });
+          let idarr1 = [];
+          let idarr2 = [];
+          let arr3 = res.data.concat(this.activeListStudent);
+          for (let i in res.data) {
+            idarr1.push(res.data[i].userId);
+          }
+          for (let j in this.activeListStudent) {
+            idarr2.push(this.activeListStudent[j].userId);
+          }
+          this.studentList = arr3.filter(item => {
+            return idarr1.indexOf(item.userId) === -1 || (idarr2.indexOf(item.userId) === -1)
+          })
         }
       })
 
@@ -914,6 +929,7 @@ export default {
       // removeStudents({ classGroupId:}).then(res => {
       removeStudents({ classGroupId: this.activeClass, userId: item.userId }).then(res => {
         if (res.code == 200) {
+          this.$message.success('删除成功');
           item.isVisible = false;
           // 这里刷新 this.studentList this.activeListStudent 
           this.getList(this.activeMixClass);
@@ -942,6 +958,10 @@ export default {
       let arr = this.chioseStudent.map(item => {
         return item.userId;
       });
+      if (arr.length <= 0) {
+        this.$message.error('至少添加一名学员')
+        return;
+      }
       addStudents({ classGroupId: this.activeClass, userIdsStr: arr.join(',') }).then(res => {
         if (res.code == 200) {
           this.studentVisible = false;