Merge branch 'iteration-20240909' into 11/24SAAS

src/api/studentManager.js

@@ -153,7 +153,7 @@ export function getClassAllStudent(data) {
   return request({
     url: api + `/classGroupStudent/findAllStudent`,
     method: "POST",
-    data: qs.stringify(data)
+    data
   });
 }
 

src/views/teamDetail/componentClass/classCompound.vue

@@ -112,6 +112,7 @@
         :disabledList="allStudentList"
         :list="studentList"
         :chioseList="activeRow.studentList"
+        :activeRow="activeRow"
         v-if="studentListModalVisible"
         :showOk="true"
         :isChiose="true"
@@ -262,33 +263,23 @@ export default {
     showStudentList(row) {
       // row.id
       this.activeRow = row;
-      getClassAllStudent({ classGroupId: row.id }).then((res) => {
-        if (res.code == 200) {
-          this.studentList = res.data.map((item) => {
-            return {
-              userId: item.userId,
-              nickName: item.name,
-              gender: item.gender,
-              phone: item.parentsPhone,
-              subjectNames: item.subjectName,
-            };
-          });
-          this.studentListModalVisible = true;
-        }
-      });
+      
+      this.studentListModalVisible = true;
     },
     closeStudentView(list) {
-      this.activeRow.studentList = list;
-      this.activeRow.chioseStudentNum = list.length;
-      this.dataList = this.dataList.map((item, index) => {
-        if (item.id == this.activeRow.id) {
-          return this.activeRow;
-        } else {
-          return item;
-        }
-      });
-      this.$emit("updataCompoundList", this.dataList);
-      this.studentListModalVisible = false;
+      if(list && list.length > 0) {
+        this.activeRow.studentList = list;
+        this.activeRow.chioseStudentNum = list.length;
+        this.dataList = this.dataList.map((item, index) => {
+          if (item.id == this.activeRow.id) {
+            return this.activeRow;
+          } else {
+            return item;
+          }
+        });
+        this.$emit("updataCompoundList", this.dataList);
+        this.studentListModalVisible = false;
+      }
     },
     changeMasterClass(val) {
       this.dataList.forEach((classes) => {

src/views/teamDetail/componentClass/student-list.vue

@@ -1,20 +1,48 @@
 <template>
   <div>
+    <el-form :modal="searchForm" ref="searchFormRef" class="forms" inline>
+      <el-form-item prop="search">
+        <el-input
+          v-model="searchForm.search"
+          placeholder="请输入姓名/手机号"
+          clearable
+        ></el-input>
+      </el-form-item>
+      <el-form-item prop="subjectId">
+        <el-select
+          v-model="searchForm.subjectId"
+          clearable
+          placeholder="请选择专业"
+        >
+          <el-option
+            v-for="(item, i) in selects.subjects"
+              :key="i"
+              :label="item.name"
+              :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="onSearch" type="primary">搜索</el-button>
+        <el-button @click="onReset" type="danger">重置</el-button>
+      </el-form-item>
+    </el-form>
     <el-table
       :data="list"
-      ref='studentTable'
+      ref="studentTable"
       style
       :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
       tooltip-effect="dark"
-
-       @selection-change="handleSelectionChange"
-       max-height='300px'
+      @selection-change="handleSelectionChange"
+      max-height="300px"
     >
-     <el-table-column v-if="isChiose"
-      type="selection"
-      :selectable="checkSelectable"
-      width="55">
-    </el-table-column>
+      <el-table-column
+        v-if="isChiose"
+        type="selection"
+        :selectable="checkSelectable"
+        width="55"
+      >
+      </el-table-column>
       <el-table-column
         prop="userId"
         align="center"
@@ -27,17 +55,12 @@
         width="120"
         label="学员姓名"
       ></el-table-column>
-      <el-table-column
-        prop="name"
-        align="center"
-        width="120"
-        label="性别"
-      >
-      <template slot-scope="scope">
-        <div>
-          {{scope.row.gender| sex}}
-        </div>
-      </template>
+      <el-table-column prop="name" align="center" width="120" label="性别">
+        <template slot-scope="scope">
+          <div>
+            {{ scope.row.gender | sex }}
+          </div>
+        </template>
       </el-table-column>
       <el-table-column
         prop="phone"
@@ -52,55 +75,120 @@
       ></el-table-column>
     </el-table>
     <div slot="footer" class="dialog-footer" v-if="showOk">
-      <el-button type="primary" @click="$listeners.close(selectList)">确 定</el-button>
+      <span style="display: flex;align-items: center; font-size: 16px;padding-right: 8px">当前选中：<span style="color: red;">{{ selectList ? selectList.length : 0 }}</span>人</span>
+      <el-button type="primary" @click="$listeners.close(selectList)"
+        >确 定</el-button
+      >
     </div>
     <div style="clear: both;" v-if="showOk"></div>
   </div>
 </template>
 <script>
+import { getClassAllStudent } from "@/api/studentManager";
 export default {
-  props: ['list','isChiose','chioseList','showOk','disabledList','classId'],
-  data(){
-    return{
-      selectList:this.chioseList
-    }
-  },mounted(){
-    if(this.chioseList){
-          let idList = this.chioseList.map((item,index)=>{
-      return item.userId
-    })
-    this.list.forEach((item,index)=>{
-      if(idList.indexOf(item.userId)!= -1){
-        this.$refs.studentTable.toggleRowSelection(item,true);
-      }
-    })
-    }
+  props: [
+    "isChiose",
+    "chioseList",
+    "showOk",
+    "disabledList",
+    "classId",
+    "activeRow"
+  ],
+  data() {
+    return {
+      list: [],
+      loading: false,
+      soundList: [],
+      searchForm: {
+        search: "",
+        subjectId: null,
+      },
+      selectList: this.chioseList
+    };
+  },
+ async mounted() {
+    await this.$store.dispatch("setSubjects");
+    this.getList()
   },
-  methods:{
-    handleSelectionChange(val){
-      this.selectList = val
+  methods: {
+    onSearch() {
+      this.getList()
+    },
+    onReset() {
+      // this.$refs.searchFormRef.resetFields()
+      this.searchForm.search = ""
+      this.searchForm.subjectId = null
+      this.getList()
+    },
+    getList() {
+      getClassAllStudent({ classGroupId: this.activeRow.id, ...this.searchForm }).then(res => {
+        if (res.code == 200) {
+          this.loading = true
+          this.list = res.data.map(item => {
+            return {
+              userId: item.userId,
+              nickName: item.name,
+              gender: item.gender,
+              phone: item.parentsPhone,
+              subjectNames: item.subjectName
+            };
+          });
+          this.$nextTick(() => {
+            if (this.selectList) {
+              let idList = this.selectList.map((item, index) => {
+                return item.userId;
+              });
+              this.list.forEach((item, index) => {
+                if (idList.indexOf(item.userId) != -1) {
+                  this.$refs.studentTable.toggleRowSelection(item, true);
+                }
+              });
+            }
+            this.loading = false;
+          });
+        }
+      });
+    },
+    handleSelectionChange(val) {
+       if(this.loading) return
+      this.selectList = val;
+    },
+    onTableSelect(rows, row) {
+      let idList = this.selectList.map((group) => {
+        return group.userId;
+      });
+      if (idList.indexOf(row.userId) != -1) {
+        this.selectList.splice(idList.indexOf(row.userId), 1);
+        if (this.selectList.length <= 0) {
+          this.clearCom();
+        }
+      }
+    },
+    clearCom() {
+      this.selectList = [];
+      this.$refs.studentTable.clearSelection();
     },
-    checkSelectable(row){
-      let flag = true
-      if(this.disabledList&&this.disabledList.length >0){
-        this.disabledList.forEach(stu=>{
-          if(stu.userId == row.userId &&stu.classId!=this.classId){
-            flag = false
+    checkSelectable(row) {
+      let flag = true;
+      if (this.disabledList && this.disabledList.length > 0) {
+        this.disabledList.forEach(stu => {
+          if (stu.userId == row.userId && stu.classId != this.classId) {
+            flag = false;
           }
-        })
+        });
       }
-      return flag
+      return flag;
     }
   }
 };
 </script>
 <style lang="scss" scoped>
-::v-deep .dialog-footer{
+::v-deep .dialog-footer {
   margin-top: 10px;
 }
-  .dialog-footer {
-  float: right;
-
+.dialog-footer {
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
 }
-
 </style>

src/views/teamDetail/components/modals/classList-group.vue

@@ -2,7 +2,7 @@
   <div>
     <el-form :model="form" ref="form">
       <classListItem v-for="(item, index) in form.classList" :key="index" :index="index" :item="item"
-        @deteleClass="deteleClass" :form="form" :classList="activeClassList" @filterClassList="filterClassList" />
+        @deteleClass="deteleClass" :soundList="soundList" :form="form" :classList="activeClassList" @filterClassList="filterClassList" />
     </el-form>
     <!-- <el-button
       icon="el-icon-circle-plus-outline"
@@ -26,7 +26,7 @@ import classListItem from "./classList-item";
 import classPayList from "./class-pay-list";
 import { getDefaultPaymentCalender } from "@/api/buildTeam";
 export default {
-  props: ["classList", "courseTypesByType", "teacherList"],
+  props: ["classList", "courseTypesByType", "teacherList", "soundList"],
   components: { classListItem, classPayList },
   data() {
     return {

src/views/teamDetail/components/modals/classList-item.vue

@@ -26,7 +26,7 @@
           :value="item.id"
           v-for="(item, index) in classList"
           :key="index"
-          :disabled='item.disabled'
+          :disabled="item.disabled"
         ></el-option>
       </el-select>
       <el-button
@@ -62,13 +62,14 @@
 
     <el-dialog
       title="学员列表"
-      width="700px"
+      width="1400px"
       :visible.sync="studentListModalVisible"
       append-to-body
       v-if="studentListModalVisible"
     >
       <viewStudentList
-        :list="studentList"
+        :soundList="soundList"
+        :classId="item.classId"
         :chioseList="item.studentList"
         v-if="studentListModalVisible"
         :showOk="true"
@@ -85,7 +86,7 @@ import viewStudentList from "./view-student-list";
 import paymentCycle from "@/views/resetTeaming/modals/payment-cycle";
 import extraClass from "../../../resetTeaming/modals/extra-class";
 export default {
-  props: ["item", "index", "classList", "form"],
+  props: ["item", "index", "classList", "form", "soundList"],
   components: { viewStudentList, paymentCycle, extraClass },
   data() {
     return {
@@ -94,11 +95,11 @@ export default {
       organizationCourseUnitPriceSettingsByType: [],
       eclass: [],
       isNoCourse: false,
-      activeClassList: [],
+      activeClassList: []
     };
   },
   mounted() {
-    this.activeClassList =this.classList
+    this.activeClassList = this.classList;
   },
   methods: {
     async changeValue(val) {
@@ -118,27 +119,35 @@ export default {
     deteleClass() {
       this.$emit("deteleClass", this.index);
     },
-
     lookStudentList() {
       if (!this.item.classId) {
         this.$message.error("请先选择班级,再查询学生列表");
         return;
       }
       // 查学生
-      getClassAllStudent({ classGroupId: this.item.classId }).then((res) => {
-        if (res.code == 200) {
-          this.studentList = res.data.map((item) => {
-            return {
-              userId: item.userId,
-              nickName: item.name,
-              gender: item.gender,
-              phone: item.parentsPhone,
-              subjectNames: item.subjectName,
-            };
-          });
-          this.studentListModalVisible = true;
-        }
-      });
+      // getClassAllStudent({ classGroupId: this.item.classId }).then(res => {
+      //   if (res.code == 200) {
+      //     this.studentList = res.data.map(item => {
+      //       return {
+      //         userId: item.userId,
+      //         nickName: item.name,
+      //         gender: item.gender,
+      //         phone: item.parentsPhone,
+      //         subjectNames: item.subjectName,
+      //         single: item.single,
+      //         mix: item.mix,
+      //         classroom: item.classroom,
+      //         comprehensive: item.comprehensive,
+      //         highOnline: item.highOnline,
+      //         trainingSingle: item.trainingSingle,
+      //         trainingMix: item.trainingMix,
+      //         high: item.high
+      //       };
+      //     });
+      //     this.studentListModalVisible = true;
+      //   }
+      // });
+      this.studentListModalVisible = true;
     },
     closeStudentView(list) {
       this.item.studentList = list;
@@ -153,8 +162,8 @@ export default {
       }
     },
     priceChange() {},
-    syncAllMoney() {},
-  },
+    syncAllMoney() {}
+  }
 };
 </script>
 <style lang="scss" scoped>

src/views/teamDetail/components/modals/member-class-setting.vue

@@ -94,9 +94,10 @@
       v-if="studentListModalVisible"
     >
       <viewStudentList
-        :list="studentList"
+        :activeRow="{id: detail.id}"
+        :select="false"
         v-if="studentListModalVisible"
-        :showOk="true"
+        :showOk="false"
         :isChiose="false"
         @close="studentListModalVisible = false"
       />
@@ -171,19 +172,19 @@ export default {
     } catch (error) {}
     // console.log('courseTypeList',this.courseTypeList)
     // 获取班级的学生列表
-    getClassAllStudent({ classGroupId: this.detail.id }).then((res) => {
-      if (res.code == 200) {
-        this.studentList = res.data.map((item) => {
-          return {
-            userId: item.userId,
-            nickName: item.name,
-            gender: item.gender,
-            phone: item.parentsPhone,
-            subjectNames: item.subjectName,
-          };
-        });
-      }
-    });
+    // getClassAllStudent({ classGroupId: this.detail.id }).then((res) => {
+    //   if (res.code == 200) {
+    //     this.studentList = res.data.map((item) => {
+    //       return {
+    //         userId: item.userId,
+    //         nickName: item.name,
+    //         gender: item.gender,
+    //         phone: item.parentsPhone,
+    //         subjectNames: item.subjectName,
+    //       };
+    //     });
+    //   }
+    // });
     this.setCourseTypeListByName(); // 获取课程名称和枚举的键值对
     this.formatClasss(); // 初始化班级
     this.FetchHoliday(); // 设置节假日

src/views/teamDetail/components/modals/student-reset-view.vue

@@ -4,7 +4,7 @@
       :closable='false' class="alert" show-icon>
     </el-alert>
     <classListGroup :classList="classList" ref='classListGroup' :courseTypesByType='courseTypesByType'
-      :teacherList='teacherList' />
+      :teacherList='teacherList' :soundList="soundList" />
     <div slot="footer" class="dialog-footer">
       <el-button @click="close">取 消</el-button>
       <el-button type="primary" @click="gotoSecond">下一步</el-button>
@@ -15,7 +15,7 @@
 <script>
 import classListGroup from './classList-group'
 export default {
-  props: ['classList', 'courseTypesByType', 'teacherList'],
+  props: ['classList', 'courseTypesByType', 'teacherList', 'soundList'],
   components: {
     classListGroup
   },
@@ -23,7 +23,8 @@ export default {
     return {
 
     }
-  }, methods: {
+  },
+  methods: {
     close() {
       this.$emit('close')
     },

src/views/teamDetail/components/modals/view-student-list.vue

@@ -1,24 +1,67 @@
 <template>
   <div>
+    <el-form :modal="searchForm" ref="searchFormRef" class="forms" inline>
+      <el-form-item prop="search">
+        <el-input
+          v-model="searchForm.search"
+          placeholder="请输入姓名/手机号"
+          clearable
+        ></el-input>
+      </el-form-item>
+      <el-form-item prop="subjectId">
+        <el-select
+          v-model="searchForm.subjectId"
+          clearable
+          placeholder="请选择专业"
+        >
+          <el-option
+            v-for="item in soundList"
+            :value="item.id"
+            :label="item.name"
+            :key="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item prop="courseType">
+        <el-select
+          v-model="searchForm.courseType"
+          clearable
+          placeholder="请选择课程剩余时长"
+        >
+          <el-option
+            v-for="item in courseTypeList"
+            :key="item.id"
+            :value="item.id"
+            :label="item.name"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="onSearch" type="primary">搜索</el-button>
+        <el-button @click="onReset" type="danger">重置</el-button>
+      </el-form-item>
+    </el-form>
     <el-table
       :data="list"
-      ref='studentTable'
-      style
+      ref="studentTable"
       :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
       tooltip-effect="dark"
-
-       @selection-change="handleSelectionChange"
-       max-height='300px'
+      @selection-change="handleSelectionChange"
+      @select="onTableSelect"
+      max-height="300px"
+      @sort-change="sortChang"
     >
-     <el-table-column v-if="isChiose"
-      type="selection"
-      :selectable="checkSelectable"
-      width="55">
-    </el-table-column>
+      <el-table-column
+        v-if="isChiose"
+        type="selection"
+        :selectable="checkSelectable"
+        width="55"
+      >
+      </el-table-column>
       <el-table-column
         prop="userId"
         align="center"
-        width="120"
+        width="80"
         label="学员编号"
       ></el-table-column>
       <el-table-column
@@ -27,17 +70,12 @@
         width="120"
         label="学员姓名"
       ></el-table-column>
-      <el-table-column
-        prop="name"
-        align="center"
-        width="120"
-        label="性别"
-      >
-      <template slot-scope="scope">
-        <div>
-          {{scope.row.gender| sex}}
-        </div>
-      </template>
+      <el-table-column prop="name" align="center" width="80" label="性别">
+        <template slot-scope="scope">
+          <div>
+            {{ scope.row.gender | sex }}
+          </div>
+        </template>
       </el-table-column>
       <el-table-column
         prop="phone"
@@ -48,59 +86,253 @@
       <el-table-column
         prop="subjectNames"
         align="center"
+        width="80"
         label="专业"
       ></el-table-column>
+      <el-table-column
+        prop="single"
+        align="center"
+        label="声部课"
+        sortable
+      >
+        <template slot-scope="scope">
+          {{ scope.row.single || 0 }}分钟
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="mix"
+        align="center"
+        label="合奏课"
+        sortable
+      >
+        <template slot-scope="scope">
+          {{ scope.row.mix || 0 }}分钟
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="trainingSingle"
+        align="center"
+        label="集训声部课"
+        sortable
+      >
+        <template slot-scope="scope">
+          {{ scope.row.trainingSingle || 0 }}分钟
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="trainingMix"
+        align="center"
+        label="集训合奏课"
+        sortable
+      >
+        <template slot-scope="scope">
+          {{ scope.row.trainingMix || 0 }}分钟
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="high"
+        align="center"
+        label="基础技能课"
+        sortable
+      >
+        <template slot-scope="scope">
+          {{ scope.row.high || 0 }}分钟
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="highOnline"
+        align="center"
+        label="线上基础技能课"
+        sortable
+      >
+        <template slot-scope="scope">
+          {{ scope.row.highOnline || 0 }}分钟
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="comprehensive"
+        align="center"
+        label="综合课"
+        sortable
+      >
+        <template slot-scope="scope">
+          {{ scope.row.comprehensive || 0 }}分钟
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="classroom"
+        align="center"
+        label="课堂课"
+        sortable
+      >
+        <template slot-scope="scope">
+          {{ scope.row.classroom || 0 }}分钟
+        </template>
+      </el-table-column>
     </el-table>
     <div slot="footer" class="dialog-footer" v-if="showOk">
-      <el-button type="primary" @click="$listeners.close(selectList)">确 定</el-button>
+      <span style="display: flex;align-items: center; font-size: 16px;padding-right: 8px">当前选中：<span style="color: red;">{{ selectList.length || 0 }}</span>人</span>
+      <el-button type="primary" @click="$listeners.close(selectList)"
+        >确 定</el-button
+      >
     </div>
     <div style="clear: both;" v-if="showOk"></div>
   </div>
 </template>
 <script>
+import { getClassAllStudent } from "@/api/studentManager";
 export default {
-  props: ['list','isChiose','chioseList','showOk','disabledList'],
-  data(){
-    return{
-      selectList:this.chioseList
-    }
-  },mounted(){
-    if(this.chioseList){
-          let idList = this.chioseList.map((item,index)=>{
-      return item.userId
-    })
-    this.list.forEach((item,index)=>{
-      if(idList.indexOf(item.userId)!= -1){
-        this.$refs.studentTable.toggleRowSelection(item,true);
-      }
-    })
-    }
+  props: ["isChiose", "chioseList", "showOk", "disabledList", "soundList", "search", "classId"],
+  data() {
+    return {
+      list: [],
+      searchForm: {
+        search: "",
+        courseType: null,
+        subjectId: null,
+        sortField: null,
+        sortType: null,
+      },
+      // classroom,comprehensive,high,high_online,mix,single,training_mix,training_single,no_course
+      // 课堂 综合 基础技能 线上基础技能 合奏 声部 集训合奏 集训声部 无排课时长
+      courseTypeList: [{
+        id: 'no_course',
+        name: '无排课时长'
+      }, {
+        id: 'single',
+        name: '声部课'
+      }, {
+        id: 'mix',
+        name: '合奏课'
+      }, {
+        id: 'trainingSingle',
+        name: '集训声部课'
+      }, {
+        id: 'trainingMix',
+        name: '集训合奏课'
+      }, {
+        id: 'high',
+        name: '基础技能课'
+      }, {
+        id: 'highOnline',
+        name: '线上基础技能课'
+      }, {
+        id: 'comprehensive',
+        name: '综合课'
+      }, {
+        id: 'classroom',
+        name: '课堂课'
+      }],
+      selectList: this.chioseList,
+      loading: false,
+    };
+  },
+  mounted() {
+    this.getList()
   },
-  methods:{
-    handleSelectionChange(val){
-      this.selectList = val
+  methods: {
+    getList() {
+      getClassAllStudent({ classGroupId: this.classId, ...this.searchForm }).then(res => {
+        if (res.code == 200) {
+          this.loading = true;
+          this.list = res.data?.map(item => {
+            return {
+              userId: item.userId,
+              nickName: item.name,
+              gender: item.gender,
+              phone: item.parentsPhone,
+              subjectNames: item.subjectName,
+              single: item.single,
+              mix: item.mix,
+              classroom: item.classroom,
+              comprehensive: item.comprehensive,
+              highOnline: item.highOnline,
+              trainingSingle: item.trainingSingle,
+              trainingMix: item.trainingMix,
+              high: item.high
+            };
+          });
+          this.$nextTick(() => {
+            if (this.selectList) {
+              let idList = this.selectList.map((item, index) => {
+                return item.userId;
+              });
+              this.list.forEach((item, index) => {
+                if (idList.indexOf(item.userId) != -1) {
+                  console.log(idList, item.userId)
+                  this.$refs.studentTable.toggleRowSelection(item, true);
+                }
+              });
+
+              this.loading = false
+            }
+          })
+        }
+      });
+    },
+    sortChang(val) {
+      const dates = {
+        ascending: "ASC",
+        descending: "DESC",
+      };
+
+      if(val.prop && val.order) {
+        this.searchForm.sortField = val.prop
+        this.searchForm.sortType = dates[val.order]
+      } else {
+        this.searchForm.sortField = null
+        this.searchForm.sortType = null
+      }
+      this.getList();
+    },
+    onSearch() {
+      this.getList()
     },
-    checkSelectable(row){
-      let flag = true
-      if(this.disabledList&&this.disabledList.length >0){
-        this.disabledList.forEach(stu=>{
-          if(stu.userId == row.userId){
-            flag = false
+    onReset() {
+      // this.$refs.searchFormRef.resetFields()
+      this.searchForm.search = ""
+      this.searchForm.courseType = null
+      this.searchForm.subjectId = null
+      this.getList()
+    },
+    handleSelectionChange(val) {
+      if(this.loading) return
+      this.selectList = val;
+    },
+    onTableSelect(rows, row) {
+      let idList = this.selectList.map((group) => {
+        return group.userId;
+      });
+      if (idList.indexOf(row.userId) != -1) {
+        this.selectList.splice(idList.indexOf(row.userId), 1);
+        if (this.selectList.length <= 0) {
+          this.clearCom();
+        }
+      }
+    },
+    clearCom() {
+      this.selectList = [];
+      this.$refs.studentTable.clearSelection();
+    },
+    checkSelectable(row) {
+      let flag = true;
+      if (this.disabledList && this.disabledList.length > 0) {
+        this.disabledList.forEach(stu => {
+          if (stu.userId == row.userId) {
+            flag = false;
           }
-        })
+        });
       }
-      return flag
+      return flag;
     }
   }
 };
 </script>
 <style lang="scss" scoped>
-::v-deep .dialog-footer{
+::v-deep .dialog-footer {
   margin-top: 10px;
 }
-  .dialog-footer {
+.dialog-footer {
   float: right;
-
 }
-
 </style>

src/views/teamDetail/components/resetClass.vue

@@ -30,9 +30,9 @@
       <div class="btnList">
         <el-button type="primary" v-permission="'courseSchedule/coursePostpone'" v-if="team_status == 'PROGRESS'"
           @click="postpone" style="margin-bottom: 20px">课程顺延</el-button>
-        <el-button type="primary" v-permission="'/memberClassList'"
+        <!-- <el-button type="primary" v-permission="'/memberClassList'"
           v-if="courseViewType == 2 && team_status == 'PROGRESS'" @click="gotoMemberCourse"
-          style="margin-bottom: 20px">会员课程排课</el-button>
+          style="margin-bottom: 20px">会员课程排课</el-button> -->
         <!-- <div
           class="newBand"
           style="width: 120px"
@@ -140,7 +140,7 @@
         </el-table>
         <div class="floor">
           <div class="left">
-            <div class="add" @click="studentResetVisiable = true" v-if="permission('classGroup/mergeClassSplitClassAffirm') &&
+            <div class="add" @click="openStudentReset" v-if="permission('classGroup/mergeClassSplitClassAffirm') &&
               team_status == 'PROGRESS'
               ">
               拆分班级
@@ -349,7 +349,7 @@
 
     <el-dialog title="学员班级调整" width="800px" :visible.sync="studentResetVisiable">
       <studentResetView :teacherList="teacherList" :courseTypesByType="courseTypesByType" v-if="studentResetVisiable"
-        :classList="mergeList" @close="closeStudentReset" />
+        :classList="mergeList" :soundList="activeSoundList" @close="closeStudentReset" />
     </el-dialog>
 
     <el-dialog title="课程顺延" :visible.sync="postponeVisible" width="600px" :before-close="handleClose">
@@ -1406,6 +1406,10 @@ export default {
       this.weekList[index].endClassTime = "";
       console.log();
     },
+    openStudentReset() {
+      this.activeSoundList = this.soundList;
+      this.studentResetVisiable = true;
+    },
     closeStudentReset() {
       this.studentResetVisiable = false;
     },

vue.config.js

@@ -19,7 +19,7 @@ const name = defaultSettings.title || "管乐迷后台管理系统"; // page tit
 // let target = "http://192.168.3.43:8805"; //邹璇
 // let target = "http://192.168.0.127:8000"; //勇哥
 // let target = "http://192.168.3.14:8005"; // 原谅
-let target = "https://test.gym.lexiaoya.cn"; //测试环境
+let target = "https://dev.gym.lexiaoya.cn"; //测试环境
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
   /**