Merge branch '04/14resetSalaryName' into test

src/views/teamDetail/teamClassList.vue

@@ -3,7 +3,12 @@
   <div class="m-container">
     <h2>
       <div class="squrt"></div>
-      班级列表 <filter-search :keys="['lessThenThreeHighOnline']" @reload="getList" :moreKeys="['organId']"/>
+      班级列表
+      <filter-search
+        :keys="['lessThenThreeHighOnline']"
+        @reload="getList"
+        :moreKeys="['organId']"
+      />
     </h2>
     <div class="m-core">
       <save-form
@@ -42,7 +47,11 @@
         <el-form-item>
           <el-select
             v-model.trim="searchForm.groupType"
-            @change="()=>{searchForm.type=''}"
+            @change="
+              () => {
+                searchForm.type = '';
+              }
+            "
             filterable
             placeholder="课程组类型"
           >
@@ -60,7 +69,7 @@
             v-model.trim="searchForm.type"
             filterable
             clearable
-            :disabled='searchForm.groupType!="MUSIC"'
+            :disabled="searchForm.groupType != 'MUSIC'"
             placeholder="班级类型"
           >
             <el-option
@@ -74,7 +83,12 @@
         <el-form-item>
           <el-button native-type="submit" type="primary">搜索</el-button>
           <el-button native-type="reset" type="danger">重置</el-button>
-          <el-button  type="primary"   v-permission="'export/classGroup'"  @click='exportClassGroup'>导出</el-button>
+          <el-button
+            type="primary"
+            v-permission="'export/classGroup'"
+            @click="exportClassGroup"
+            >导出</el-button
+          >
         </el-form-item>
       </save-form>
       <div class="tableWrap">
@@ -83,16 +97,20 @@
           :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
           :data="tableList"
         >
-          <el-table-column align="center" prop="musicGroupId" label="乐团&课程组编号">
+          <el-table-column
+            align="center"
+            prop="musicGroupId"
+            label="乐团&课程组编号"
+          >
             <template slot-scope="scope">
               <copy-text>{{ scope.row.musicGroupId }}</copy-text>
             </template>
           </el-table-column>
-                   <el-table-column align="center" prop="musicGroupId" label="程组编号">
+          <!-- <el-table-column align="center" prop="musicGroupId" label="课程编号">
             <template slot-scope="scope">
               <copy-text>{{ scope.row.id }}</copy-text>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column
             align="center"
             prop="musicGroupName"
@@ -158,7 +176,12 @@
               <div>{{ scope.row.totalClassTimes }}</div>
             </template>
           </el-table-column>
-          <el-table-column fixed="right" width="160px" align="center" label="操作">
+          <el-table-column
+            fixed="right"
+            width="160px"
+            align="center"
+            label="操作"
+          >
             <!--    -->
             <template slot-scope="scope">
               <el-button
@@ -166,7 +189,7 @@
                 @click="addCompound(scope.row)"
                 v-if="
                   scope.row.type != 'MUSIC_NETWORK' &&
-                   scope.row.groupType== 'MUSIC'&&
+                  scope.row.groupType == 'MUSIC' &&
                   !isAddCom(scope.row) &&
                   permission('classGroup/spanGroupMergeClassSplitClassAffirm')
                 "
@@ -187,9 +210,9 @@
                   permission('classGroup/delSingle?page=teamCLassList') &&
                   scope.row.groupType === 'MUSIC' &&
                   (scope.row.studentNum == '0' ||
-                  scope.row.totalClassTimes == '0')
+                    scope.row.totalClassTimes == '0')
                 "
-                  @click="removeClass(scope)"
+                @click="removeClass(scope)"
                 >删除</el-button
               >
             </template>
@@ -226,7 +249,7 @@ import { getClassGroupPage, removeSingleClass } from "@/api/buildTeam";
 import { permission } from "@/utils/directivePage";
 import classCompound from "./componentClass/classCompound";
 import { Export } from "@/utils/downLoadFile";
-import qs from 'qs'
+import qs from "qs";
 export default {
   components: { pagination, classCompound },
   data() {
@@ -256,12 +279,12 @@ export default {
   created() {},
   //生命周期 - 挂载完成（可以访问DOM元素）
   mounted() {
-    const { query } = this.$route
+    const { query } = this.$route;
     if (query.type) {
-      this.searchForm.type = query.type
+      this.searchForm.type = query.type;
     }
     if (query.organId) {
-      this.searchForm.organIdList = [Number(query.organId)]
+      this.searchForm.organIdList = [Number(query.organId)];
     }
     // 获取分部
     this.$store.dispatch("setBranchs");
@@ -294,17 +317,17 @@ export default {
     },
     onReSet() {
       this.$refs.searchForm.resetFields();
-      this.searchForm.groupType = 'MUSIC'
+      this.searchForm.groupType = "MUSIC";
       this.search();
     },
     async removeClass(scope) {
       try {
-        await this.$confirm('是否确定删除该班级?', '提示', {
-          type: 'warning'
-        })
-        await removeSingleClass({ classGroupId: scope.row.id })
-        this.$message.success('删除成功')
-        this.getList()
+        await this.$confirm("是否确定删除该班级?", "提示", {
+          type: "warning",
+        });
+        await removeSingleClass({ classGroupId: scope.row.id });
+        this.$message.success("删除成功");
+        this.getList();
       } catch (error) {}
     },
     addCompound(row) {
@@ -368,18 +391,22 @@ export default {
     permission(str, parent) {
       return permission(str, parent);
     },
-    exportClassGroup(){
-        let params = this.searchForm;
+    exportClassGroup() {
+      let params = this.searchForm;
       Export(
         this,
         {
-            method: 'post',
+          method: "post",
           url: "/api-web/export/classGroup",
-           params:qs.stringify({...params, organIdList: this.searchForm.organIdList.join(","), lessThenThreeHighOnline: this.$route.query.lessThenThreeHighOnline,})
+          params: qs.stringify({
+            ...params,
+            organIdList: this.searchForm.organIdList.join(","),
+            lessThenThreeHighOnline: this.$route.query.lessThenThreeHighOnline,
+          }),
         },
         "是否确认导出报表？"
       );
-    }
+    },
   },
 };
 </script>