mo 5 年之前
父节点
当前提交
218ee9f543

+ 16 - 0
src/api/buildTeam.js

@@ -142,6 +142,14 @@ export function getNoClassStudentAll (data) {
     url: api + '/studentRegistration/getMusicGroupNoClassStu',
     method: 'get',
     params: data
+  })
+}
+// 新增班级
+export function createClass (data) {
+  return request({
+    url: api + '/classGroup/create',
+    method: 'post',
+    data: data
 
   })
 }
@@ -789,6 +797,14 @@ export function getMusicGroupAllClass (data) {
   })
 }
 
+// 获取乐团下所有班级
+export function getMusicGroupClass (data) {
+  return request({
+    url: api + `/classGroup/queryPage`,
+    method: 'get',
+    params: data
+  })
+}
 // 乐团【报名中、缴费中】 学生详情列表导出
 export function studentApplyDetailExport (data) {
   return request({

+ 1 - 3
src/templateList.vue

@@ -79,9 +79,7 @@ export default {
 
   },
   activated () {
-    if (!this.isInit) {
-      this.init();
-    }
+    this.init();
   },
   methods: {
     init () {

+ 25 - 24
src/utils/vueFilter.js

@@ -86,9 +86,9 @@ Vue.filter('coursesType', (value) => {
     TRAINING_SINGLE: '集训单技课',
     TRAINING_MIX: '集训合奏课',
     CLASSROOM: '课堂课',
-    PRACTICE:'网管课',
-    COMM:'对外课',
-    MUSIC:'乐团课'
+    PRACTICE: '网管课',
+    COMM: '对外课',
+    MUSIC: '乐团课'
   }
   return template[value]
 })
@@ -125,14 +125,14 @@ Vue.filter('formatTimer', (value) => {
 })
 Vue.filter('timerForMinFormat', (value) => {
   if (value) {
-    return value.substring(0,5) 
+    return value.substring(0, 5)
   } else {
     return value
   }
 })
 Vue.filter('dateForMinFormat', (value) => {
   if (value) {
-    return value.substring(0,16)
+    return value.substring(0, 16)
   } else {
     return value
   }
@@ -214,9 +214,9 @@ Vue.filter('orderType', value => {
     SMALL_CLASS_TO_BUY: "VIP购买",
     SPORADIC: '零星收费',
     LUCK: "福袋活动",
-    PRACTICE:'网管课',
-    PRACTICE_GROUP_BUY:'网管课购买',
-    PRACTICE_GROUP_RENEW:'网管课续费'
+    PRACTICE: '网管课',
+    PRACTICE_GROUP_BUY: '网管课购买',
+    PRACTICE_GROUP_RENEW: '网管课续费'
 
   }
   return template[value]
@@ -337,7 +337,8 @@ Vue.filter('classType', value => {
     VIP: 'VIP',
     DEMO: '试听',
     SNAP: "临时班",
-    PRACTICE:'网管课'
+    PRACTICE: '网管课',
+    HIGH_ONLINE: '线上基础技能班'
   }
   return template[value]
 })
@@ -385,12 +386,12 @@ Vue.filter('paymentChannelStatus', value => {
 // edition
 Vue.filter('editionFilter', value => {
   let template = {
-    'ios-teacher':'苹果-老师端',
-        'ios-student':'苹果-学生端',
-        'ios-education':'苹果-教务端',
-        'android-teacher':'安卓-老师端',
-        'android-student':'安卓-学生端',
-        'android-education':'安卓-教务端',
+    'ios-teacher': '苹果-老师端',
+    'ios-student': '苹果-学生端',
+    'ios-education': '苹果-教务端',
+    'android-teacher': '安卓-老师端',
+    'android-student': '安卓-学生端',
+    'android-education': '安卓-教务端',
   }
   return template[value]
 })
@@ -401,9 +402,9 @@ Vue.filter('payStatus', value => {
   let template = {
     WAIT_PAY: "等待支付",
     ING: "交易中",
-    SUCCESS:'成功交易',
-    FAILED:'交易失败',
-    CLOSE:'交易关闭'
+    SUCCESS: '成功交易',
+    FAILED: '交易失败',
+    CLOSE: '交易关闭'
   }
   return template[value]
 })
@@ -413,8 +414,8 @@ Vue.filter('courseGroup', value => {
   let template = {
     NORMAL: "正常",
     LOCK: "锁定",
-    FINISH:'结束',
-    CANCEL:'取消',
+    FINISH: '结束',
+    CANCEL: '取消',
   }
   return template[value]
 })
@@ -422,8 +423,8 @@ Vue.filter('courseGroup', value => {
 Vue.filter('comCourseGroup', value => {
   let template = {
     NORMAL: "进行中",
-    FINISH:'结束',
-    CANCEL:'关闭',
+    FINISH: '结束',
+    CANCEL: '关闭',
   }
   return template[value]
 })
@@ -431,8 +432,8 @@ Vue.filter('comCourseGroup', value => {
 Vue.filter('comType', value => {
   let template = {
     FREE: "免费",
-    CHARGE:'收费',
-    TRIAL:'试听课',
+    CHARGE: '收费',
+    TRIAL: '试听课',
   }
   return template[value]
 })

+ 1 - 3
src/views/repairManager/repairList.vue

@@ -269,9 +269,7 @@ export default {
 
   },
   activated () {
-    if (!this.isInit) {
-      this.init();
-    }
+    this.init();
   },
   methods: {
     init () {

+ 3 - 3
src/views/resetTeaming/index.vue

@@ -77,12 +77,12 @@ export default {
     let obj = {}
     obj.name = this.activeIndex
     this.handleClick(obj)
-  }, 
-  activated() {
+  },
+  activated () {
     this.__init()
   },
   methods: {
-    __init() {
+    __init () {
       this.activeIndex = sessionStorage.getItem('resetCode') || '1';
       this.teamid = this.$route.query.id;
       if (this.$route.query.search) {

+ 291 - 272
src/views/teamBuild/components/teamBaseInfo.vue

@@ -3,331 +3,343 @@
     <div class="banseLeft">
       <div class="head">乐团基本信息:</div>
       <!-- <div class="num">乐团编号:dywh01</div> -->
-      <el-form :model="topFrom" :inline="true" ref="topinfo" style="margin-left:11px;">
-        <el-form-item label="收费类型" prop="type" :rules="[{ required: true, message: '收费类型不能为空'}]">
-          <el-select v-model.trim="topFrom.type" filterable clearable>
-            <el-option
-              v-for="(item,index) in typeList"
-              :key="index"
-              :label="item.name"
-              :value="item.id"
-            ></el-option>
+      <el-form :model="topFrom"
+               :inline="true"
+               ref="topinfo"
+               style="margin-left:11px;">
+        <el-form-item label="收费类型"
+                      prop="type"
+                      :rules="[{ required: true, message: '收费类型不能为空'}]">
+          <el-select v-model.trim="topFrom.type"
+                     filterable
+                     clearable>
+            <el-option v-for="(item,index) in typeList"
+                       :key="index"
+                       :label="item.name"
+                       :value="item.id"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item
-          label="所属分部"
-          prop="section"
-          :rules="[{ required: true, message: '所属分部不能为空'},]"
-        >
-          <el-select v-model.trim="topFrom.section" filterable @change="changeSection" clearable>
-            <el-option
-              v-for="(item,index) in sectionList"
-              :key="index"
-              :label="item.name"
-              :value="item.id"
-            ></el-option>
+        <el-form-item label="所属分部"
+                      prop="section"
+                      :rules="[{ required: true, message: '所属分部不能为空'},]">
+          <el-select v-model.trim="topFrom.section"
+                     filterable
+                     @change="changeSection"
+                     clearable>
+            <el-option v-for="(item,index) in sectionList"
+                       :key="index"
+                       :label="item.name"
+                       :value="item.id"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="合作单位" prop="school" :rules="[{ required: true, message: '合作单位不能为空'},]">
-          <el-select
-            v-model.trim="topFrom.school"
-            :disabled="!topFrom.section"
-            @change="chioseSchool"
-            filterable
-            clearable
-          >
-            <el-option
-              v-for="(item,index) in cooperationList"
-              :key="index"
-              :label="item.name"
-              :value="item.id"
-            ></el-option>
+        <el-form-item label="合作单位"
+                      prop="school"
+                      :rules="[{ required: true, message: '合作单位不能为空'},]">
+          <el-select v-model.trim="topFrom.school"
+                     :disabled="!topFrom.section"
+                     @change="chioseSchool"
+                     filterable
+                     clearable>
+            <el-option v-for="(item,index) in cooperationList"
+                       :key="index"
+                       :label="item.name"
+                       :value="item.id"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item
-          label="教学地点"
-          prop="address"
-          :rules="[{ required: true, message: '教学地点不能为空'},]"
-        >
-          <el-select v-model.trim="topFrom.address" filterable clearable :disabled="!topFrom.section">
-            <el-option
-              v-for="(item,index) in addList"
-              :key="index"
-              :label="item.name"
-              :value="item.id"
-            ></el-option>
+        <el-form-item label="教学地点"
+                      prop="address"
+                      :rules="[{ required: true, message: '教学地点不能为空'},]">
+          <el-select v-model.trim="topFrom.address"
+                     filterable
+                     clearable
+                     :disabled="!topFrom.section">
+            <el-option v-for="(item,index) in addList"
+                       :key="index"
+                       :label="item.name"
+                       :value="item.id"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="乐团名称" prop="name" :rules="[{ required: true, message: '乐团名称不能为空'},]">
-          <el-input placeholder="请输入乐团名称" v-model.trim="topFrom.name"></el-input>
+        <el-form-item label="乐团名称"
+                      prop="name"
+                      :rules="[{ required: true, message: '乐团名称不能为空'},]">
+          <el-input placeholder="请输入乐团名称"
+                    v-model.trim="topFrom.name"></el-input>
         </el-form-item>
-        <el-form-item label="运营主管" prop="boss" :rules="[{ required: true, message: '运营主管不能为空'},]">
-          <el-select v-model.trim="topFrom.boss" :disabled="!topFrom.section" filterable clearable>
-            <el-option
-              v-for="(item,index) in orgianList"
-              :key="index"
-              :label="item.realName"
-              :value="item.id"
-            ></el-option>
+        <el-form-item label="运营主管"
+                      prop="boss"
+                      :rules="[{ required: true, message: '运营主管不能为空'},]">
+          <el-select v-model.trim="topFrom.boss"
+                     :disabled="!topFrom.section"
+                     filterable
+                     clearable>
+            <el-option v-for="(item,index) in orgianList"
+                       :key="index"
+                       :label="item.realName"
+                       :value="item.id"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item
-          label="教务老师"
-          prop="teacher"
-          :rules="[{ required: true, message: '教务老师不能为空'},]"
-        >
-          <el-select v-model.trim="topFrom.teacher" :disabled="!topFrom.section" filterable clearable>
-            <el-option
-              v-for="(item,index) in orgianList"
-              :key="index"
-              :label="item.realName"
-              :value="item.id"
-            ></el-option>
+        <el-form-item label="教务老师"
+                      prop="teacher"
+                      :rules="[{ required: true, message: '教务老师不能为空'},]">
+          <el-select v-model.trim="topFrom.teacher"
+                     :disabled="!topFrom.section"
+                     filterable
+                     clearable>
+            <el-option v-for="(item,index) in orgianList"
+                       :key="index"
+                       :label="item.realName"
+                       :value="item.id"></el-option>
           </el-select>
         </el-form-item>
-           <el-form-item
-          label="维修技师"
-          prop="repairUserId"
-          :rules="[{ required: true, message: '维修技师不能为空'},]"
-        >
-          <el-select v-model.trim="topFrom.repairUserId" :disabled="!topFrom.section" filterable clearable>
-            <el-option
-              v-for="(item,index) in orgianList"
-              :key="index"
-              :label="item.realName"
-              :value="item.id"
-            ></el-option>
+        <el-form-item label="维修技师"
+                      prop="repairUserId"
+                      :rules="[{ required: true, message: '维修技师不能为空'},]">
+          <el-select v-model.trim="topFrom.repairUserId"
+                     :disabled="!topFrom.section"
+                     filterable
+                     clearable>
+            <el-option v-for="(item,index) in orgianList"
+                       :key="index"
+                       :label="item.realName"
+                       :value="item.id"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item
-          label="报名截止时间"
-          prop="time"
-          :rules="[{ required: true, message: '请输入报名截止时间'},]"
-        >
-          <el-date-picker
-            v-model.trim="topFrom.time"
-            style="width:100%!important"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择日期"
-          ></el-date-picker>
+        <el-form-item label="报名截止时间"
+                      prop="time"
+                      :rules="[{ required: true, message: '请输入报名截止时间'},]">
+          <el-date-picker v-model.trim="topFrom.time"
+                          style="width:100%!important"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择日期"></el-date-picker>
         </el-form-item>
-        <el-form-item
-          label="预计开团时间"
-          prop="startTime"
-          :rules="[{ required: true, message: '请输入预计开团时间'},]"
-        >
-          <el-date-picker
-            v-model.trim="topFrom.startTime"
-            style="width:100%!important"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择日期"
-          ></el-date-picker>
+        <el-form-item label="预计开团时间"
+                      prop="startTime"
+                      :rules="[{ required: true, message: '请输入预计开团时间'},]">
+          <el-date-picker v-model.trim="topFrom.startTime"
+                          style="width:100%!important"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择日期"></el-date-picker>
         </el-form-item>
-        <el-form-item
-          label="招生年级"
-          prop="startClass"
-          :rules="[{ required: true, message: '请选择招生年纪'},]"
-        >
-          <el-select
-            placeholder="起始年级"
-            clearable
-            multiple
-            collapse-tags
-            filterable
-            v-model.trim="topFrom.startClass"
-          >
-            <el-option value="1" label="一年级"></el-option>
-            <el-option value="2" label="二年级"></el-option>
-            <el-option value="3" label="三年级"></el-option>
-            <el-option value="4" label="四年级"></el-option>
-            <el-option value="5" label="五年级"></el-option>
-            <el-option value="6" label="六年级"></el-option>
-            <el-option value="7" label="初一"></el-option>
-            <el-option value="8" label="初二"></el-option>
-            <el-option value="9" label="初三"></el-option>
-            <el-option value="10" label="高一"></el-option>
-            <el-option value="11" label="高二"></el-option>
-            <el-option value="12" label="高三"></el-option>
+        <el-form-item label="招生年级"
+                      prop="startClass"
+                      :rules="[{ required: true, message: '请选择招生年纪'},]">
+          <el-select placeholder="起始年级"
+                     clearable
+                     multiple
+                     collapse-tags
+                     filterable
+                     v-model.trim="topFrom.startClass">
+            <el-option value="1"
+                       label="一年级"></el-option>
+            <el-option value="2"
+                       label="二年级"></el-option>
+            <el-option value="3"
+                       label="三年级"></el-option>
+            <el-option value="4"
+                       label="四年级"></el-option>
+            <el-option value="5"
+                       label="五年级"></el-option>
+            <el-option value="6"
+                       label="六年级"></el-option>
+            <el-option value="7"
+                       label="初一"></el-option>
+            <el-option value="8"
+                       label="初二"></el-option>
+            <el-option value="9"
+                       label="初三"></el-option>
+            <el-option value="10"
+                       label="高一"></el-option>
+            <el-option value="11"
+                       label="高二"></el-option>
+            <el-option value="12"
+                       label="高三"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item
-          label="课酬结算标准"
-          :rules="[{ required: true, message: '请选择课酬结算标准'},]"
-          prop="salary"
-        >
-          <el-select v-model.trim="topFrom.salary" clearable filterable>
-            <el-option label="默认课酬" value="TEACHER_DEFAULT"></el-option>
-            <el-option label="3.0课酬" value="GRADIENT_SALARY"></el-option>
+        <el-form-item label="课酬结算标准"
+                      :rules="[{ required: true, message: '请选择课酬结算标准'},]"
+                      prop="salary">
+          <el-select v-model.trim="topFrom.salary"
+                     clearable
+                     filterable>
+            <el-option label="默认课酬"
+                       value="TEACHER_DEFAULT"></el-option>
+            <el-option label="3.0课酬"
+                       value="GRADIENT_SALARY"></el-option>
             <!-- <el-option label="课堂课酬"
             value="CLASSROOM_SALARY"></el-option>-->
           </el-select>
         </el-form-item>
-        <el-form-item label="机构类型" prop="ownershipType">
+        <el-form-item label="机构类型"
+                      prop="ownershipType">
           <el-select v-model.trim="topFrom.ownershipType">
-            <el-option label="自有" value="OWN"></el-option>
-            <el-option label="三方" value="COOPERATION"></el-option>
+            <el-option label="自有"
+                       value="OWN"></el-option>
+            <el-option label="三方"
+                       value="COOPERATION"></el-option>
             <!-- <el-option label="租赁"
             value="LEASE"></el-option>-->
           </el-select>
         </el-form-item>
 
-        <el-form-item
-          label="乐队指导"
-          v-if="teamStatus=='resetTeam' || teamStatus=='teamList'"
-          prop="head"
-        >
-          <el-select v-model.trim="topFrom.head" filterable clearable>
-            <el-option
-              v-for="(item,index) in orgianList"
-              :key="index"
-              :label="item.realName"
-              :value="item.id"
-            ></el-option>
+        <el-form-item label="乐队指导"
+                      v-if="teamStatus=='resetTeam' || teamStatus=='teamList'"
+                      prop="head">
+          <el-select v-model.trim="topFrom.head"
+                     filterable
+                     clearable>
+            <el-option v-for="(item,index) in orgianList"
+                       :key="index"
+                       :label="item.realName"
+                       :value="item.id"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label prop="isClass">
+        <el-form-item label
+                      prop="isClass">
           <el-checkbox v-model.trim="topFrom.isClass">课堂课乐团</el-checkbox>
         </el-form-item>
       </el-form>
       <div class="checkList">
         <div class="head noMargin">课程组成形态:</div>
         <div class="checkRow">
-          <el-checkbox label="乐团声部训练" v-model.trim="checkList.soundInfo.ischeck"></el-checkbox>
+          <el-checkbox label="乐团声部训练"
+                       v-model.trim="checkList.soundInfo.ischeck"></el-checkbox>
           <div class="inputWrap">
             单价:
-            <input type="text" placeholder="请输入" v-model.trim="checkList.soundInfo.value" />
+            <input type="text"
+                   placeholder="请输入"
+                   v-model.trim="checkList.soundInfo.value" />
           </div>
         </div>
         <div class="checkRow">
-          <el-checkbox label="乐团合奏训练" v-model.trim="checkList.allInfo.ischeck"></el-checkbox>
+          <el-checkbox label="乐团合奏训练"
+                       v-model.trim="checkList.allInfo.ischeck"></el-checkbox>
           <div class="inputWrap">
             单价:
-            <input type="text" placeholder="请输入" v-model.trim="checkList.allInfo.value" />
+            <input type="text"
+                   placeholder="请输入"
+                   v-model.trim="checkList.allInfo.value" />
           </div>
         </div>
         <div class="checkRow">
-          <el-checkbox label="基础技能训练" v-model.trim="checkList.baseInfo.ischeck"></el-checkbox>
+          <el-checkbox label="基础技能训练"
+                       v-model.trim="checkList.baseInfo.ischeck"></el-checkbox>
           <div class="inputWrap">
             单价:
-            <input
-              type="number"
-              @mousewheel.native.prevent
-              placeholder="请输入"
-              v-model.trim="checkList.baseInfo.value"
-            />
+            <input type="number"
+                   @mousewheel.native.prevent
+                   placeholder="请输入"
+                   v-model.trim="checkList.baseInfo.value" />
           </div>
         </div>
         <div class="checkRow">
-          <el-checkbox label="假期集中训练" v-model.trim="checkList.holidayInfo.ischeck"></el-checkbox>
+          <el-checkbox label="假期集中训练"
+                       v-model.trim="checkList.holidayInfo.ischeck"></el-checkbox>
           <div class="inputWrap">
             单价:
-            <input
-              type="number"
-              @mousewheel.native.prevent
-              placeholder="请输入"
-              v-model.trim="checkList.holidayInfo.value"
-            />
+            <input type="number"
+                   @mousewheel.native.prevent
+                   placeholder="请输入"
+                   v-model.trim="checkList.holidayInfo.value" />
           </div>
         </div>
         <div class="checkRow">
-          <el-checkbox label="课程提示" class="classCheckBox" v-model.trim="checkList.submit.ischeck"></el-checkbox>
-          <div class="textWrap" v-if="checkList.submit.ischeck">
-            <el-input
-              type="textarea"
-              :rows="1"
-              style="width:500px"
-              v-model.trim="checkList.submit.value"
-            ></el-input>
+          <el-checkbox label="课程提示"
+                       class="classCheckBox"
+                       v-model.trim="checkList.submit.ischeck"></el-checkbox>
+          <div class="textWrap"
+               v-if="checkList.submit.ischeck">
+            <el-input type="textarea"
+                      :rows="1"
+                      style="width:500px"
+                      v-model.trim="checkList.submit.value"></el-input>
           </div>
         </div>
         <div class="head noMargin">付费方式:</div>
         <div class="checkRow">
-          <el-checkbox label="学校" class="classCheckBox" v-model.trim="payList.school.ischeck"></el-checkbox>
+          <el-checkbox label="学校"
+                       class="classCheckBox"
+                       v-model.trim="payList.school.ischeck"></el-checkbox>
           <div class="chioseList">
-            <div
-              class="chioseItem"
-              :class="payList.school.chiose == 'ONE_OFF'?'active':''"
-              @click="payList.school.chiose='ONE_OFF'"
-            >一次性</div>
-            <div
-              class="chioseItem"
-              :class="payList.school.chiose == 'MONTHLY'?'active':''"
-              @click="payList.school.chiose='MONTHLY'"
-            >一个月</div>
-            <div
-              class="chioseItem"
-              :class="payList.school.chiose == 'TERM'?'active':''"
-              @click="payList.school.chiose='TERM'"
-            >一学期</div>
-            <div
-              class="chioseItem"
-              :class="payList.school.chiose == 'YEAR'?'active':''"
-              @click="payList.school.chiose='YEAR'"
-            >一学年</div>
+            <div class="chioseItem"
+                 :class="payList.school.chiose == 'ONE_OFF'?'active':''"
+                 @click="payList.school.chiose='ONE_OFF'">一次性</div>
+            <div class="chioseItem"
+                 :class="payList.school.chiose == 'MONTHLY'?'active':''"
+                 @click="payList.school.chiose='MONTHLY'">一个月</div>
+            <div class="chioseItem"
+                 :class="payList.school.chiose == 'TERM'?'active':''"
+                 @click="payList.school.chiose='TERM'">一学期</div>
+            <div class="chioseItem"
+                 :class="payList.school.chiose == 'YEAR'?'active':''"
+                 @click="payList.school.chiose='YEAR'">一学年</div>
           </div>
           <div class="inputWrap">
             预计收费:
-            <input type="textarea" v-model.trim="payList.school.price" placeholder="请输入" />
+            <input type="textarea"
+                   v-model.trim="payList.school.price"
+                   placeholder="请输入" />
           </div>
           <div class="inputWrap">
             备注:
-            <input type="textarea" v-model.trim="payList.school.value" placeholder="请输入" />
+            <input type="textarea"
+                   v-model.trim="payList.school.value"
+                   placeholder="请输入" />
           </div>
         </div>
         <div class="checkRow">
-          <el-checkbox label="公司" class="classCheckBox" v-model.trim="payList.company.ischeck"></el-checkbox>
+          <el-checkbox label="公司"
+                       class="classCheckBox"
+                       v-model.trim="payList.company.ischeck"></el-checkbox>
           <div class="chioseList">
-            <div
-              class="chioseItem"
-              :class="payList.company.chiose == 'ONE_OFF'?'active':''"
-              @click="payList.company.chiose='ONE_OFF'"
-            >一次性</div>
-            <div
-              class="chioseItem"
-              :class="payList.company.chiose == 'MONTHLY'?'active':''"
-              @click="payList.company.chiose='MONTHLY'"
-            >一个月</div>
-            <div
-              class="chioseItem"
-              :class="payList.company.chiose == 'TERM'?'active':''"
-              @click="payList.company.chiose='TERM'"
-            >一学期</div>
-            <div
-              class="chioseItem"
-              :class="payList.company.chiose == 'YEAR'?'active':''"
-              @click="payList.company.chiose='YEAR'"
-            >一学年</div>
+            <div class="chioseItem"
+                 :class="payList.company.chiose == 'ONE_OFF'?'active':''"
+                 @click="payList.company.chiose='ONE_OFF'">一次性</div>
+            <div class="chioseItem"
+                 :class="payList.company.chiose == 'MONTHLY'?'active':''"
+                 @click="payList.company.chiose='MONTHLY'">一个月</div>
+            <div class="chioseItem"
+                 :class="payList.company.chiose == 'TERM'?'active':''"
+                 @click="payList.company.chiose='TERM'">一学期</div>
+            <div class="chioseItem"
+                 :class="payList.company.chiose == 'YEAR'?'active':''"
+                 @click="payList.company.chiose='YEAR'">一学年</div>
           </div>
           <div class="inputWrap">
             预计收费:
-            <input type="textarea" placeholder="请输入" v-model.trim="payList.company.price" />
+            <input type="textarea"
+                   placeholder="请输入"
+                   v-model.trim="payList.company.price" />
           </div>
           <div class="inputWrap">
             备注:
-            <input type="textarea" placeholder="请输入" v-model.trim="payList.company.value" />
+            <input type="textarea"
+                   placeholder="请输入"
+                   v-model.trim="payList.company.value" />
           </div>
         </div>
         <div class="checkRow">
-          <el-checkbox label="学员" class="classCheckBox" v-model.trim="payList.student.ischeck"></el-checkbox>
+          <el-checkbox label="学员"
+                       class="classCheckBox"
+                       v-model.trim="payList.student.ischeck"></el-checkbox>
           <div class="chioseList">
-            <div
-              class="chioseItem"
-              :class="payList.student.chiose == 'ONE_OFF'?'active':''"
-              @click="payList.student.chiose='ONE_OFF'"
-            >一次性</div>
-            <div
-              class="chioseItem"
-              :class="payList.student.chiose == 'loop'?'active':''"
-              @click="payList.student.chiose='loop'"
-            >周期循环</div>
+            <div class="chioseItem"
+                 :class="payList.student.chiose == 'ONE_OFF'?'active':''"
+                 @click="payList.student.chiose='ONE_OFF'">一次性</div>
+            <div class="chioseItem"
+                 :class="payList.student.chiose == 'loop'?'active':''"
+                 @click="payList.student.chiose='loop'">周期循环</div>
           </div>
         </div>
-        <p class="subTitle" v-if="payList.student.chiose == 'loop'">按月缴费时,将在所选月份的1号的前一周提醒用户缴费操作,单次的缴费金额为当前列表「预计收费」的设置金额</p>
-        <div class="chioseWrap" v-if="payList.student.chiose == 'loop'">
+        <p class="subTitle"
+           v-if="payList.student.chiose == 'loop'">按月缴费时,将在所选月份的1号的前一周提醒用户缴费操作,单次的缴费金额为当前列表「预计收费」的设置金额</p>
+        <div class="chioseWrap"
+             v-if="payList.student.chiose == 'loop'">
           <p>缴费月份:</p>
-          <el-checkbox-group v-model.trim="payList.chioseMonth" fill="#14928A" text-color="#474747">
+          <el-checkbox-group v-model.trim="payList.chioseMonth"
+                             fill="#14928A"
+                             text-color="#474747">
             <el-checkbox :label="1">一月</el-checkbox>
             <el-checkbox :label="2">二月</el-checkbox>
             <el-checkbox :label="3">三月</el-checkbox>
@@ -343,13 +355,20 @@
           </el-checkbox-group>
         </div>
       </div>
-         <div class="btnWrap">
-          <div class="nextBtn" v-if="teamStatus=='resetTeam'" v-permission="{child: 'musicGroup/update', parent: '/resetTeaming/teamBaseInfo'}" @click="resetSubmit">修改</div>
-      <!-- 审批或者草稿的下一步 -->
-          <div class="nextBtn" @click="gotoNext(1)" v-if="teamStatus=='newTeam' || teamStatus=='teamDraft'||teamStatus=='teamAudit' ">下一步</div>
-      <!-- 跨团调整的下一步 -->
-          <div class="nextBtn" v-if="teamStatus=='teamList'" @click="gotoNext(2)">下一步</div> 
-        </div>
+      <div class="btnWrap">
+        <div class="nextBtn"
+             v-if="teamStatus=='resetTeam'"
+             v-permission="{child: 'musicGroup/update', parent: '/resetTeaming/teamBaseInfo'}"
+             @click="resetSubmit">修改</div>
+        <!-- 审批或者草稿的下一步 -->
+        <div class="nextBtn"
+             @click="gotoNext(1)"
+             v-if="teamStatus=='newTeam' || teamStatus=='teamDraft'||teamStatus=='teamAudit' ">下一步</div>
+        <!-- 跨团调整的下一步 -->
+        <div class="nextBtn"
+             v-if="teamStatus=='teamList'"
+             @click="gotoNext(2)">下一步</div>
+      </div>
     </div>
   </div>
   </div>
@@ -379,7 +398,7 @@ import qs from "qs";
 export default {
   name: "teamBaseInfo",
   props: ["getTeamList"],
-  data() {
+  data () {
     return {
       organId: null,
       topFrom: {
@@ -397,7 +416,7 @@ export default {
         isClass: false, //是否为课堂课
         startTime: "",
         ownershipType: "OWN", // 合作机构类型
-        repairUserId:null, // 维修技师
+        repairUserId: null, // 维修技师
       },
       checkList: {
         soundInfo: {
@@ -461,25 +480,25 @@ export default {
       teamid: "",
       teamStatus: "",
       orgianList: [],
-       isInit:false
+      isInit: false
     };
-   
+
   },
-  created() {},
-  activated() {
-    if(!this.isInit){
-      this.init();
-    }
-    
+  created () { },
+  activated () {
+
+    this.init();
+
+
   },
-  mounted() {
-      if(!this.isInit){
+  mounted () {
+    if (!this.isInit) {
       this.init();
     }
     // 获取分部下的员工
   },
   methods: {
-    init() {
+    init () {
       this.isInit = true;
       // 分为3种  this.teamStatus
       //          1.resetTeam 乐团修改
@@ -516,7 +535,7 @@ export default {
             this.topFrom.isClass = res.data.musicGroup.isClassroomLessons;
             this.topFrom.startTime = res.data.musicGroup.expectStartGroupDate;
             this.topFrom.ownershipType = res.data.musicGroup.ownershipType;
-            this.topFrom.repairUserId = res.data.musicGroup.repairUserId?res.data.musicGroup.repairUserId:null;
+            this.topFrom.repairUserId = res.data.musicGroup.repairUserId ? res.data.musicGroup.repairUserId : null;
             // 课程组成形式
             this.checkList = JSON.parse(res.data.musicGroup.courseForm);
             // 付费方式和周期
@@ -573,7 +592,7 @@ export default {
               getSchool({ organId: res.data.musicGroup.organId }).then(res => {
                 if (res.code == 200) {
                   this.addList = res.data;
-                   this.isInit = false;
+                  this.isInit = false;
                 }
               });
             }
@@ -646,7 +665,7 @@ export default {
       // 缓存设置时的状态
       sessionStorage.setItem("resetCode", "1");
     },
-    changeSection(val) {
+    changeSection (val) {
       // 修改分部的时候 重置运营主管 重置教务老师 重置乐队指导 合作单位  教学点
       this.topFrom.teacher = "";
       this.topFrom.boss = "";
@@ -672,8 +691,8 @@ export default {
         }
       });
     },
-    chioseSchool(val) {},
-    gotoNext(num) {
+    chioseSchool (val) { },
+    gotoNext (num) {
       // 1.效验数据    判断是否数据正常=> 正常放入store存储
       //                       不正常=>  进行效验提示
       this.$refs["topinfo"].validate((valid, object) => {
@@ -682,20 +701,20 @@ export default {
         } else {
           // 验证通过
           this.$store.dispatch("topinfo", this.topFrom);
-            this.$store.dispatch("checkinfo", this.checkList);
-            this.$store.dispatch("getpayInfo", this.payList);
+          this.$store.dispatch("checkinfo", this.checkList);
+          this.$store.dispatch("getpayInfo", this.payList);
           if (this.teamStatus == "teamDraft") {
             // 获取数据提交
             this.resetSubmit();
-           
+
           } else {
-            
+
             this.$emit("chiosetab", num);
           }
         }
       });
     },
-    resetSubmit() {
+    resetSubmit () {
       this.$refs["topinfo"].validate((valid, object) => {
         if (!valid) {
           this.$message.error("请填写必要参数");
@@ -748,7 +767,7 @@ export default {
             status,
             expectStartGroupDate: this.topFrom.startTime,
             ownershipType: this.topFrom.ownershipType,
-            repairUserId :this.topFrom.repairUserId
+            repairUserId: this.topFrom.repairUserId
           };
           obj.musicGroupPaymentEntities = [];
           // 添加学校主体付费方式
@@ -832,7 +851,7 @@ export default {
       justify-content: flex-start;
       flex-wrap: nowrap;
       overflow: auto;
-     
+
       .el-checkbox {
         line-height: 72px;
       }

文件差异内容过多而无法显示
+ 1260 - 35
src/views/teamBuild/teamSeting/components/setClassV2.vue


+ 353 - 268
src/views/teamDetail/components/resetClass.vue

@@ -6,161 +6,186 @@
       班级调整
     </h2>-->
     <div class="m-core">
-      <el-form :inline="true" :model="topForm">
+      <el-form :inline="true"
+               :model="topForm">
         <el-form-item label="班级类型">
-          <el-select v-model.trim="topForm.classType" clearable filterable @change="changeMixClass">
-            <el-option
-              v-for="(item,index) in classTypeList"
-              :key="index"
-              :label="item.label"
-              :value="item.value"
-            ></el-option>
+          <el-select v-model.trim="topForm.classType"
+                     clearable
+                     filterable
+                     @change="changeMixClass">
+            <el-option v-for="(item,index) in classTypeList"
+                       :key="index"
+                       :label="item.label"
+                       :value="item.value"></el-option>
           </el-select>
         </el-form-item>
       </el-form>
-      <div class="tableWrap" style>
-        <el-table
-          :data="activeSingleList"
-          style
-          :header-cell-style="{background:'#EDEEF0',color:'#444'}"
-        >
-          <el-table-column align="center" prop="name" label="班级名称"></el-table-column>
-          <el-table-column align="center" prop="type" label="班级类型">
+      <div class="tableWrap"
+           style>
+        <el-table :data="activeSingleList"
+                  style
+                  :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+          <el-table-column align="center"
+                           prop="name"
+                           label="班级名称"></el-table-column>
+          <el-table-column align="center"
+                           prop="type"
+                           label="班级类型">
             <template slot-scope="scope">
               <div>{{ scope.row.type | classType }}</div>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="studentNum" label="班级人数"></el-table-column>
-          <el-table-column align="center" prop label="主教老师">
+          <el-table-column align="center"
+                           prop="studentNum"
+                           label="班级人数"></el-table-column>
+          <el-table-column align="center"
+                           prop
+                           label="主教老师">
             <template slot-scope="scope">
               <div v-if="scope.row.classGroupTeacherMapperList">
-                <p
-                  v-for="(item,index) in scope.row.classGroupTeacherMapperList"
-                  v-if="item.teacherRole == 'BISHOP'"
-                  :key="index"
-                >{{item.userName}}</p>
+                <p v-for="(item,index) in scope.row.classGroupTeacherMapperList"
+                   v-if="item.teacherRole == 'BISHOP'"
+                   :key="index">{{item.userName}}</p>
               </div>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="助教老师">
+          <el-table-column align="center"
+                           label="助教老师">
             <template slot-scope="scope">
               <div v-if="scope.row.classGroupTeacherMapperList">
-                <p
-                  v-for="(item,index) in scope.row.classGroupTeacherMapperList"
-                  v-if="item.teacherRole == 'TEACHING'"
-                  :key="index"
-                >{{item.userName}}</p>
+                <p v-for="(item,index) in scope.row.classGroupTeacherMapperList"
+                   v-if="item.teacherRole == 'TEACHING'"
+                   :key="index">{{item.userName}}</p>
               </div>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="已上课时">
+          <el-table-column align="center"
+                           label="已上课时">
             <template slot-scope="scope">
               <div>{{scope.row.currentClassTimes}}</div>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="总课数">
+          <el-table-column align="center"
+                           label="总课数">
             <template slot-scope="scope">
               <div>{{scope.row.totalClassTimes}}</div>
             </template>
           </el-table-column>
-          <el-table-column align="center" width="400px" label="操作">
+          <el-table-column align="center"
+                           width="400px"
+                           label="操作">
             <template slot-scope="scope">
               <div>
                 <!-- v-if="scope.row.type !='MIX'" -->
-                <el-button type="text" @click="resetClass(scope.row)">学员调整</el-button>
-                <el-button type="text" @click="classAdjustment(scope.row)">班级调整</el-button>
+                <el-button type="text"
+                           @click="resetClass(scope.row)">学员调整</el-button>
+                <el-button type="text"
+                           @click="classAdjustment(scope.row)">班级调整</el-button>
                 <!--<el-button type="text"
                 @click="recourse(scope.row)">重新排课</el-button>-->
-                <el-popover placement="top" width="160" :ref="scope.$index">
+                <el-popover placement="top"
+                            width="160"
+                            :ref="`popover-${scope.$index}`">
                   <p>确定删除?</p>
                   <div style="text-align: right; margin: 0">
-                    <el-button
-                      size="mini"
-                      type="text"
-                      @click="scope._self.$refs[scope.$index].doClose()"
-                    >取消</el-button>
-                    <el-button type="primary" size="mini" @click="removeClass(scope)">确定</el-button>
+                    <el-button size="mini"
+                               type="text"
+                               @click="scope._self.$refs[`popover-${scope.$index}`].doClose()">取消</el-button>
+                    <el-button type="primary"
+                               size="mini"
+                               @click="removeClass(scope)">确定</el-button>
                   </div>
                   <!-- v-if="scope.row.type !='MIX'" -->
-                  <el-button type="text" slot="reference">删除班级</el-button>
+                  <el-button type="text"
+                             slot="reference">删除班级</el-button>
                 </el-popover>
 
-                <el-popover placement="top" width="160" :ref="scope.$index">
+                <el-popover placement="top"
+                            width="160"
+                            :ref="scope.$index">
                   <p>是否清空课表?</p>
                   <div style="text-align: right; margin: 0">
-                    <el-button
-                      size="mini"
-                      type="text"
-                      @click="scope._self.$refs[scope.$index].doClose()"
-                    >取消</el-button>
-                    <el-button type="primary" size="mini" @click="clearCourse(scope)">确定</el-button>
+                    <el-button size="mini"
+                               type="text"
+                               @click="scope._self.$refs[scope.$index].doClose()">取消</el-button>
+                    <el-button type="primary"
+                               size="mini"
+                               @click="clearCourse(scope)">确定</el-button>
                   </div>
                   <!-- v-if="scope.row.type !='MIX'" -->
-                  <el-button type="text" slot="reference">清空课表</el-button>
+                  <el-button type="text"
+                             slot="reference">清空课表</el-button>
                 </el-popover>
               </div>
             </template>
           </el-table-column>
         </el-table>
         <div class="floor">
-          <div class="add" @click="temporary">新建临时班</div>
-          <div class="add" @click="addNewClass('NORMAL')">新建单技班</div>
-          <div class="add" @click="addNewClass('MIX')">新建合奏班</div>
-          <div class="add" @click="addNewClass('HIGH')">基础技能班</div>
+          <div class="add"
+               @click="temporary">新建临时班</div>
+          <div class="add"
+               @click="addNewClass('NORMAL')">新建单技班</div>
+          <div class="add"
+               @click="addNewClass('MIX')">新建合奏班</div>
+          <div class="add"
+               @click="addNewClass('HIGH')">基础技能班</div>
         </div>
       </div>
     </div>
     <!-- 学员选择 -->
-    <el-dialog
-      title="学员选择"
-      width="700px"
-      :visible.sync="studentVisible"
-      :modal-append-to-body="false"
-    >
+    <el-dialog title="学员选择"
+               width="700px"
+               :visible.sync="studentVisible"
+               :modal-append-to-body="false">
       <div class="studentMask">
         <div class="left">
           <div class="wrap">
-            <el-input placeholder="请输入班级名称" :disabled="!isNewClass" v-model.trim="className"></el-input>
+            <el-input placeholder="请输入班级名称"
+                      :disabled="!isNewClass"
+                      v-model.trim="className"></el-input>
           </div>
           <div class="chioseStudentList">
             <h4 style="padding-left:10px;">当前已选学员</h4>
-            <div class="studentItem" v-for="(item,index) in activeListStudent" :key="index">
+            <div class="studentItem"
+                 v-for="(item,index) in activeListStudent"
+                 :key="index">
               {{ item.name }}
-              <el-popover
-                v-if="!isNewClass"
-                placement="top"
-                v-model.trim="item.isVisible"
-                width="160"
-              >
+              <el-popover v-if="!isNewClass"
+                          placement="top"
+                          v-model.trim="item.isVisible"
+                          width="160">
                 <p>确定删除?</p>
                 <div style="text-align: right; margin: 0">
-                  <el-button size="mini" type="text" @click="item.isVisible = false">取消</el-button>
-                  <el-button type="primary" size="mini" @click="removeStudent(item)">确定</el-button>
+                  <el-button size="mini"
+                             type="text"
+                             @click="item.isVisible = false">取消</el-button>
+                  <el-button type="primary"
+                             size="mini"
+                             @click="removeStudent(item)">确定</el-button>
                 </div>
-                <el-button type="text" slot="reference">删除</el-button>
+                <el-button type="text"
+                           slot="reference">删除</el-button>
               </el-popover>
-              <el-button v-if="isNewClass" type="text" @click="temporaryRemoveStudent(item)">删除</el-button>
+              <el-button v-if="isNewClass"
+                         type="text"
+                         @click="temporaryRemoveStudent(item)">删除</el-button>
             </div>
           </div>
         </div>
         <div class="right">
           <!--  multiple
           collapse-tags-->
-          <el-select
-            v-if="isSearch"
-            v-model.trim="activeChioseSound"
-            style="width:180px"
-            @change="searchStudent"
-            clearable
-            filterable
-            placeholder="声部选择"
-          >
-            <el-option
-              v-for="(item,index) in soundList"
-              :key="index"
-              :label="item.name"
-              :value="item.id"
-            ></el-option>
+          <el-select v-if="isSearch"
+                     v-model.trim="activeChioseSound"
+                     style="width:180px"
+                     @change="searchStudent"
+                     clearable
+                     filterable
+                     placeholder="声部选择">
+            <el-option v-for="(item,index) in soundList"
+                       :key="index"
+                       :label="item.name"
+                       :value="item.id"></el-option>
           </el-select>
           <!-- <el-button v-if="isSearch"
                      type="danger"
@@ -169,62 +194,86 @@
 
           <!--   列表开始  -->
           <div class="tableList">
-            <el-table
-              tooltip-effect="dark"
-              v-if="!isNewClass"
-              style="width: 100%; margin-top:10px;"
-              :data="studentList"
-              ref="studentList"
-              @selection-change="SelectionStudent"
-            >
-              <el-table-column type="selection" align="center" width="55"></el-table-column>
-              <el-table-column prop="name" align="center" width="120" label="姓名"></el-table-column>
-              <el-table-column prop="gender" align="center" width="100" label="性别">
+            <el-table tooltip-effect="dark"
+                      v-if="!isNewClass"
+                      style="width: 100%; margin-top:10px;"
+                      :data="studentList"
+                      ref="studentList"
+                      @selection-change="SelectionStudent">
+              <el-table-column type="selection"
+                               align="center"
+                               width="55"></el-table-column>
+              <el-table-column prop="name"
+                               align="center"
+                               width="120"
+                               label="姓名"></el-table-column>
+              <el-table-column prop="gender"
+                               align="center"
+                               width="100"
+                               label="性别">
                 <template slot-scope="scope">
                   <div>{{ scope.row.gender | sex }}</div>
                 </template>
               </el-table-column>
-              <el-table-column prop="subjectName" width="100" align="center" label="学员声部"></el-table-column>
+              <el-table-column prop="subjectName"
+                               width="100"
+                               align="center"
+                               label="学员声部"></el-table-column>
             </el-table>
             <!-- 临时调整table -->
-            <el-table
-              tooltip-effect="dark"
-              v-if="isNewClass"
-              style="width: 100%; margin-top:10px;"
-              :data="studentList"
-              ref="temporaryStudentList"
-              @selection-change="NewselectionStudent"
-            >
-              <el-table-column type="selection" align="center" width="55"></el-table-column>
-              <el-table-column prop="name" align="center" width="120" label="姓名"></el-table-column>
-              <el-table-column prop="gender" align="center" width="100" label="性别">
+            <el-table tooltip-effect="dark"
+                      v-if="isNewClass"
+                      style="width: 100%; margin-top:10px;"
+                      :data="studentList"
+                      ref="temporaryStudentList"
+                      @selection-change="NewselectionStudent">
+              <el-table-column type="selection"
+                               align="center"
+                               width="55"></el-table-column>
+              <el-table-column prop="name"
+                               align="center"
+                               width="120"
+                               label="姓名"></el-table-column>
+              <el-table-column prop="gender"
+                               align="center"
+                               width="100"
+                               label="性别">
                 <template slot-scope="scope">
                   <div>{{ scope.row.gender | sex }}</div>
                 </template>
               </el-table-column>
-              <el-table-column prop="subjectName" width="100" align="center" label="学员声部"></el-table-column>
+              <el-table-column prop="subjectName"
+                               width="100"
+                               align="center"
+                               label="学员声部"></el-table-column>
             </el-table>
           </div>
         </div>
       </div>
-      <div slot="footer" class="dialog-footer">
+      <div slot="footer"
+           class="dialog-footer">
         <el-button @click="studentVisible = false">取 消</el-button>
         <!-- 班级学员修改 -->
-        <el-button type="primary" v-if="!isNewClass" @click="addSomeStudent">确 定</el-button>
+        <el-button type="primary"
+                   v-if="!isNewClass"
+                   @click="addSomeStudent">确 定</el-button>
         <!-- 临时调整或者新建班级 -->
-        <el-button type="primary" v-if="isNewClass" @click="setInfoMsg">确 定</el-button>
+        <el-button type="primary"
+                   v-if="isNewClass"
+                   @click="setInfoMsg">确 定</el-button>
       </div>
     </el-dialog>
     <!-- 老师以及课程设置 -->
-    <el-dialog title="班级设置" width="700px" :visible.sync="infoVisible" :modal-append-to-body="false">
-      <el-form
-        :inline="true"
-        :model="teacherForm"
-        ref="teacherForm"
-        :rules="teacherRules"
-        label-position="right"
-        label-width="100px;"
-      >
+    <el-dialog title="班级设置"
+               width="700px"
+               :visible.sync="infoVisible"
+               :modal-append-to-body="false">
+      <el-form :inline="true"
+               :model="teacherForm"
+               ref="teacherForm"
+               :rules="teacherRules"
+               label-position="right"
+               label-width="100px;">
         <!-- <el-form-item label="合奏班"
                       v-if='!isTemporary&&activeType=="NORMAL"'
                       prop="mixClassGroupId">
@@ -235,167 +284,202 @@
                        :value="item.id"></el-option>
           </el-select>
         </el-form-item>-->
-        <el-form-item label="调整方式" v-if="!isNewClass" prop="isAdd">
-          <el-radio v-model.trim="teacherForm.isAdd" label="new">班级加课</el-radio>
-          <el-radio v-model.trim="teacherForm.isAdd" label="renew">重新排课</el-radio>
-          <el-radio v-model.trim="teacherForm.isAdd" label="onlyUpdateTeacher">修改老师</el-radio>
+        <el-form-item label="调整方式"
+                      v-if="!isNewClass"
+                      prop="isAdd">
+          <el-radio v-model.trim="teacherForm.isAdd"
+                    label="new">班级加课</el-radio>
+          <el-radio v-model.trim="teacherForm.isAdd"
+                    label="renew">重新排课</el-radio>
+          <el-radio v-model.trim="teacherForm.isAdd"
+                    label="onlyUpdateTeacher">修改老师</el-radio>
         </el-form-item>
         <br />
-        <el-form-item label="主教老师" prop="coreTeacher">
-          <el-select v-model.trim="teacherForm.coreTeacher" clearable filterable>
-            <el-option
-              v-for="(item,index) in teacherList"
-              :key="index"
-              :label="item.realName"
-              :value="item.id"
-            ></el-option>
+        <el-form-item label="主教老师"
+                      prop="coreTeacher">
+          <el-select v-model.trim="teacherForm.coreTeacher"
+                     clearable
+                     filterable>
+            <el-option v-for="(item,index) in teacherList"
+                       :key="index"
+                       :label="item.realName"
+                       :value="item.id"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="助教老师" prop="assistant">
-          <el-select
-            v-model.trim="teacherForm.assistant"
-            filterable
-            clearable
-            @change="setAssistant"
-            multiple
-          >
-            <el-option
-              v-for="(item,index) in cooperationList"
-              :key="index"
-              :label="item.realName"
-              :value="item.id"
-            ></el-option>
+        <el-form-item label="助教老师"
+                      prop="assistant">
+          <el-select v-model.trim="teacherForm.assistant"
+                     filterable
+                     clearable
+                     @change="setAssistant"
+                     multiple>
+            <el-option v-for="(item,index) in cooperationList"
+                       :key="index"
+                       :label="item.realName"
+                       :value="item.id"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="课程类型" prop="courseType" v-if="teacherForm.isAdd !='onlyUpdateTeacher'">
-          <el-select v-model.trim="teacherForm.courseType" clearable filterable>
-            <el-option
-              v-for="(item,index) in courseTypeList"
-              :key="index"
-              :value="item.value"
-              :label="item.label"
-            ></el-option>
+        <el-form-item label="课程类型"
+                      prop="courseType"
+                      v-if="teacherForm.isAdd !='onlyUpdateTeacher'">
+          <el-select v-model.trim="teacherForm.courseType"
+                     clearable
+                     filterable>
+            <el-option v-for="(item,index) in courseTypeList"
+                       :key="index"
+                       :value="item.value"
+                       :label="item.label"></el-option>
           </el-select>
         </el-form-item>
         <br />
-        <el-form-item label="排课次数" prop="courseNum" v-if="teacherForm.isAdd !='onlyUpdateTeacher'">
-          <el-input type="number" @mousewheel.native.prevent v-model.trim="teacherForm.courseNum"></el-input>
+        <el-form-item label="排课次数"
+                      prop="courseNum"
+                      v-if="teacherForm.isAdd !='onlyUpdateTeacher'">
+          <el-input type="number"
+                    @mousewheel.native.prevent
+                    v-model.trim="teacherForm.courseNum"></el-input>
         </el-form-item>
-        <el-form-item
-          label="排课起始时间"
-          prop="courseTime"
-          v-if="teacherForm.isAdd !='onlyUpdateTeacher'"
-        >
-          <el-date-picker
-            v-model.trim="teacherForm.courseTime"
-            :picker-options="pickerOptions"
-            style="width:200px!important;"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择日期"
-          ></el-date-picker>
-          <el-checkbox style="margin-left:10px;" v-model.trim="teacherForm.checked">是否跳过节假日</el-checkbox>
+        <el-form-item label="排课起始时间"
+                      prop="courseTime"
+                      v-if="teacherForm.isAdd !='onlyUpdateTeacher'">
+          <el-date-picker v-model.trim="teacherForm.courseTime"
+                          :picker-options="pickerOptions"
+                          style="width:200px!important;"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择日期"></el-date-picker>
+          <el-checkbox style="margin-left:10px;"
+                       v-model.trim="teacherForm.checked">是否跳过节假日</el-checkbox>
         </el-form-item>
       </el-form>
-      <div class="WeekWrap" v-if="teacherForm.isAdd !='onlyUpdateTeacher'">
+      <div class="WeekWrap"
+           v-if="teacherForm.isAdd !='onlyUpdateTeacher'">
         <h3 style="margin-bottom:20px;">
           循环次数
-          <el-button type="text" style="margin-left:10px;" @click="addWeek">添加</el-button>
+          <el-button type="text"
+                     style="margin-left:10px;"
+                     @click="addWeek">添加</el-button>
         </h3>
-        <div class="countWrap" style="margin-bottom:10px;">
-          <div
-            class="countItem"
-            style="margin-bottom:20px;"
-            v-for="(item,index) in weekList"
-            :key="index"
-          >
+        <div class="countWrap"
+             style="margin-bottom:10px;">
+          <div class="countItem"
+               style="margin-bottom:20px;"
+               v-for="(item,index) in weekList"
+               :key="index">
             <span>循环周期:</span>
-            <el-select v-model.trim="item.dayOfWeek" clearable filterable>
-              <el-option
-                v-for="(item,index) in weekDateList"
-                :key="index"
-                :label="item.label"
-                :value="item.value"
-              ></el-option>
+            <el-select v-model.trim="item.dayOfWeek"
+                       clearable
+                       filterable>
+              <el-option v-for="(item,index) in weekDateList"
+                         :key="index"
+                         :label="item.label"
+                         :value="item.value"></el-option>
             </el-select>
             <span>开始时间</span>
-            <el-time-select
-              placeholder
-              v-model.trim="item.startClassTime"
-              :picker-options="{
+            <el-time-select placeholder
+                            v-model.trim="item.startClassTime"
+                            :picker-options="{
                                start: '04:30',
                                step: '00:05',
                                end: '23:55'
-            }"
-            ></el-time-select>
+            }"></el-time-select>
             <span>结束时间</span>
-            <el-time-select
-              placeholder
-              v-model.trim="item.endClassTime"
-              :picker-options="{
+            <el-time-select placeholder
+                            v-model.trim="item.endClassTime"
+                            :picker-options="{
                               start: '04:30',
                               step: '00:05',
                               end: '23:55',
                               minTime:item.startClassTime
-            }"
-            ></el-time-select>
-            <el-button type="danger" @click="removeWeek(item)" icon="el-icon-delete" circle></el-button>
+            }"></el-time-select>
+            <el-button type="danger"
+                       @click="removeWeek(item)"
+                       icon="el-icon-delete"
+                       circle></el-button>
           </div>
         </div>
       </div>
-      <div slot="footer" class="dialog-footer">
+      <div slot="footer"
+           class="dialog-footer">
         <!-- 1为临时班级 -->
-        <el-button type="primary" v-if="isTemporary&&isNewClass" @click="submitTemporary(1)">确 定</el-button>
+        <el-button type="primary"
+                   v-if="isTemporary&&isNewClass"
+                   @click="submitTemporary(1)">确 定</el-button>
         <!-- 2为新增班级 -->
-        <el-button type="primary" v-if="!isTemporary&&isNewClass" @click="submitTemporary(2)">确 定</el-button>
+        <el-button type="primary"
+                   v-if="!isTemporary&&isNewClass"
+                   @click="submitTemporary(2)">确 定</el-button>
         <!-- 修改班级信息 -->
-        <el-button type="primary" v-if="!isNewClass" @click="submitTemporary(3)">确 定</el-button>
+        <el-button type="primary"
+                   v-if="!isNewClass"
+                   @click="submitTemporary(3)">确 定</el-button>
       </div>
     </el-dialog>
     <!-- 新增合奏班 -->
-    <el-dialog title="新增合奏班" width="700px" :visible.sync="MixVisible" :modal-append-to-body="false">
+    <el-dialog title="新增合奏班"
+               width="700px"
+               :visible.sync="MixVisible"
+               :modal-append-to-body="false">
       <div class="studentMask">
         <div class="left">
           <div class="wrap">
             <!-- :disabled="!isNewClass" -->
-            <el-input placeholder="请输入合奏班名称" v-model.trim="className"></el-input>
+            <el-input placeholder="请输入合奏班名称"
+                      v-model.trim="className"></el-input>
           </div>
           <div class="chioseStudentList">
             <h4 style="padding-left:10px;">当前已选学生</h4>
-            <div class="studentItem" v-for="(item,index) in activeListStudent" :key="index">
+            <div class="studentItem"
+                 v-for="(item,index) in activeListStudent"
+                 :key="index">
               {{ item.name }}
-              <el-button type="text" @click="removeSiginforMix(item)">删除班级</el-button>
+              <el-button type="text"
+                         @click="removeSiginforMix(item)">删除班级</el-button>
             </div>
           </div>
         </div>
         <div class="right">
           <!--   列表开始  -->
           <div class="tableList">
-            <el-table
-              tooltip-effect="dark"
-              style="width: 100%; margin-top:10px;"
-              :data="singleList"
-              ref="mixList"
-              @selection-change="SelectionMix"
-            >
-              <el-table-column type="selection" align="center" width="55"></el-table-column>
-              <el-table-column prop="name" align="center" width="120" label="姓名"></el-table-column>
-              <el-table-column prop="gender" align="center" width="100" label="性别">
+            <el-table tooltip-effect="dark"
+                      style="width: 100%; margin-top:10px;"
+                      :data="singleList"
+                      ref="mixList"
+                      @selection-change="SelectionMix">
+              <el-table-column type="selection"
+                               align="center"
+                               width="55"></el-table-column>
+              <el-table-column prop="name"
+                               align="center"
+                               width="120"
+                               label="姓名"></el-table-column>
+              <el-table-column prop="gender"
+                               align="center"
+                               width="100"
+                               label="性别">
                 <template slot-scope="scope">
                   <div>{{ scope.row.gender | sex }}</div>
                 </template>
               </el-table-column>
-              <el-table-column prop="subjectName" width="120" align="center" label="学员声部"></el-table-column>
+              <el-table-column prop="subjectName"
+                               width="120"
+                               align="center"
+                               label="学员声部"></el-table-column>
             </el-table>
           </div>
         </div>
       </div>
-      <div slot="footer" class="dialog-footer">
+      <div slot="footer"
+           class="dialog-footer">
         <el-button @click="studentVisible = false">取 消</el-button>
         <!-- 班级学员修改 -->
-        <el-button type="primary" v-if="!isNewClass" @click="addSomeStudent">确 定</el-button>
+        <el-button type="primary"
+                   v-if="!isNewClass"
+                   @click="addSomeStudent">确 定</el-button>
         <!-- 临时调整或者新建班级 -->
-        <el-button type="primary" v-if="isNewClass" @click="setInfoMsg">确 定</el-button>
+        <el-button type="primary"
+                   v-if="isNewClass"
+                   @click="setInfoMsg">确 定</el-button>
       </div>
     </el-dialog>
     <!-- 班级调整 -->
@@ -566,10 +650,10 @@ import axios from "axios";
 import qs from "qs";
 export default {
   name: "tresetClass",
-  data() {
+  data () {
     return {
       pickerOptions: {
-        disabledDate(time) {
+        disabledDate (time) {
           return time.getTime() + 86400000 <= new Date().getTime();
         }
       },
@@ -661,15 +745,15 @@ export default {
       organId: ""
     };
   },
-  created() {
+  created () {
     this.init();
   },
-  activated() {
+  activated () {
     this.init();
   },
-  mounted() {},
+  mounted () { },
   methods: {
-    init() {
+    init () {
       this.teamid = this.$route.query.id;
       // 根据乐团id获取乐团所属分部
       getTeamBaseInfo({ musicGroupId: this.teamid }).then(res => {
@@ -734,7 +818,7 @@ export default {
       // 获取分部所有老师
       // 助教是从员工表里选
     },
-    recourse(row) {
+    recourse (row) {
       (this.weekList = [
         {
           week: "",
@@ -745,22 +829,22 @@ export default {
       ]),
         (this.resetCourseVisible = true);
     },
-    addMix() {
+    addMix () {
       this.MixVisible = true;
     },
-    setAssistant(val) {
+    setAssistant (val) {
       for (let i in val) {
         if (val[i] == this.teacherForm.coreTeacher) {
           val.splice(i, 1);
         }
       }
     },
-    changeMixClass(val) {
+    changeMixClass (val) {
       // 根据合奏班id获取合奏班下的所有单技班
       this.getList(val);
       this.activeMixClass = val;
     },
-    getList(val) {
+    getList (val) {
       getAllSignClassandTeacher({ musicGroupId: this.teamid, type: val }).then(
         res => {
           if (res.code == 200) {
@@ -771,7 +855,7 @@ export default {
       );
     },
     // 临时调整
-    temporary() {
+    temporary () {
       this.activeClass = "";
       this.activeListStudent = [];
       this.studentList = [];
@@ -783,7 +867,7 @@ export default {
       this.setType("SNAP");
       this.getNoClassStudent("SNAP");
     },
-    setType(type) {
+    setType (type) {
       switch (type) {
         case "NORMAL": {
           this.courseTypeList = [
@@ -827,7 +911,7 @@ export default {
       }
     },
     // 新增班级
-    addNewClass(type) {
+    addNewClass (type) {
       /**
        *      { value: 'NORMAL', label: '单技班' },
         { value: 'MIX', label: '合奏班' },
@@ -846,7 +930,7 @@ export default {
       this.isTemporary = false;
       this.getNoClassStudent(type);
     },
-    searchStudent() {
+    searchStudent () {
       // 搜索学生
       // 根据声部id  乐团id搜索学生
       teamSoundStudent({
@@ -859,11 +943,11 @@ export default {
       });
     },
     // 选择学生的方法修改
-    SelectionStudent(val) {
+    SelectionStudent (val) {
       this.chioseStudent = val;
     },
     // 新增选中的学生
-    NewselectionStudent(val) {
+    NewselectionStudent (val) {
       this.chioseStudent = val;
       // 这里新增的添加到选中的学生列表  根据学生id去重
       if (this.chioseStudent.length > 0) {
@@ -884,7 +968,7 @@ export default {
       );
       // 将其填入选中的学生
     },
-    clearCourse(scope) {
+    clearCourse (scope) {
       clearClassCourse({ classGroupId: scope.row.id })
         .then(res => {
           if (res.code == 200) {
@@ -903,25 +987,26 @@ export default {
       // 清空课表
     },
     // 删除班级
-    removeClass(scope) {
+    removeClass (scope) {
       removeSingleClass({ classGroupId: scope.row.id })
         .then(res => {
           if (res.code == 200) {
+            scope._self.$refs[`popover-${scope.$index}`].doClose()
             this.$message.success("删除成功");
-            scope._self.$refs[scope.$index].doClose();
+
             // 重新请求列表
             this.getList(this.activeMixClass);
           } else {
             this.$message.error(res.msg);
-            scope._self.$refs[scope.$index].doClose();
+            scope._self.$refs[`popover-${scope.$index}`].doClose()
           }
         })
         .catch(res => {
-          scope._self.$refs[scope.$index].doClose();
+          scope._self.$refs[`popover-${scope.$index}`].doClose()
         });
     },
     // 修改班级
-    resetClass(row) {
+    resetClass (row) {
       this.isNewClass = false;
       this.className = row.name;
       this.studentVisible = true;
@@ -940,7 +1025,7 @@ export default {
       this.getNoClassStudent(row.type);
     },
     // 班级调整
-    classAdjustment(row) {
+    classAdjustment (row) {
       this.activeType = row.type;
       this.activeClass = row.id;
       // this.activeListStudent = row.subjectIdList.split(',')
@@ -961,7 +1046,7 @@ export default {
       }
       this.infoVisible = true;
     },
-    getNoClassStudent(type) {
+    getNoClassStudent (type) {
       // 获取乐团内所有未分班的学生
       // if (type && type == 'SNAP') {
       //   teamSoundStudent({ musicGroupId: this.teamid }).then(res => {
@@ -1007,7 +1092,7 @@ export default {
       );
     },
     // 删除学生 调整
-    removeStudent(item) {
+    removeStudent (item) {
       // removeStudents({ classGroupId:}).then(res => {
       removeStudents({
         classGroupId: this.activeClass,
@@ -1037,7 +1122,7 @@ export default {
       });
     },
     // 批量添加学生
-    addSomeStudent() {
+    addSomeStudent () {
       // 获取勾选的学生
       let arr = this.chioseStudent.map(item => {
         return item.userId;
@@ -1057,17 +1142,17 @@ export default {
         }
       });
     },
-    SelectionMix(val) {
+    SelectionMix (val) {
       this.activeSingleLists = val;
     },
-    removeSiginforMix(item) {
+    removeSiginforMix (item) {
       for (let k in this.activeSingleLists) {
         if (this.activeSingleLists[k].id == item.id) {
           this.$refs["mixList"].toggleRowSelection(item, false);
         }
       }
     },
-    temporaryRemoveStudent(item) {
+    temporaryRemoveStudent (item) {
       // 列表中删除
       for (let i in this.activeListStudent) {
         if (this.activeListStudent[i].userId == item.userId) {
@@ -1084,7 +1169,7 @@ export default {
       // this.$refs['temporaryStudentList'].toggleRowSelection(row, selected);
     },
     // 对象数组去重
-    objArrayRemoval(arr, attr) {
+    objArrayRemoval (arr, attr) {
       let obj = {};
       let result = [];
       for (let x in arr) {
@@ -1095,7 +1180,7 @@ export default {
       }
       return result;
     },
-    setInfoMsg() {
+    setInfoMsg () {
       // 判断班级名称是否输入
       if (!this.className) {
         this.$message.error("请输入班级名称");
@@ -1109,7 +1194,7 @@ export default {
       }
       this.infoVisible = true;
     },
-    addWeek() {
+    addWeek () {
       // 添加循环周期
       this.weekList.push({
         dayOfWeek: "",
@@ -1119,7 +1204,7 @@ export default {
       });
     },
     // 删除循环周
-    removeWeek(item) {
+    removeWeek (item) {
       for (let i in this.weekList) {
         if (this.weekList[i].id == item.id) {
           this.weekList.splice(i, 1);
@@ -1127,7 +1212,7 @@ export default {
       }
     },
     // 提交临时班的信息
-    submitTemporary(type) {
+    submitTemporary (type) {
       // 参数是一样  type为1 新增临时班
       // type为2  新增单技班
       // type为3 修改班级信息
@@ -1190,14 +1275,14 @@ export default {
             this.$message.error("新增班级至少排一节课");
             return;
           }
-          if( this.teacherForm.isAdd == "onlyUpdateTeacher"){
-              startDate = null
-            courseType= null
-            students= null
-            holiday= null
-            courseTimes= null
-           courseList = null,
-            mineType=null
+          if (this.teacherForm.isAdd == "onlyUpdateTeacher") {
+            startDate = null
+            courseType = null
+            students = null
+            holiday = null
+            courseTimes = null
+            courseList = null,
+              mineType = null
           }
           //       mixClassGroupId,
           let mineType = this.activeType;
@@ -1255,7 +1340,7 @@ export default {
     }
   },
   watch: {
-    infoVisible(val) {
+    infoVisible (val) {
       if (!val) {
         this.$refs["teacherForm"].resetFields();
         this.weekList = [];

+ 125 - 100
src/views/workBenchManager/requestProcessing.vue

@@ -5,123 +5,148 @@
       <div class="squrt"></div>申述处理
     </h2>
     <div class="m-core">
-      <el-form :inline="true" :model="searchForm">
+      <el-form :inline="true"
+               :model="searchForm">
         <!-- <el-form-item>
           <el-input v-model.trim="searchForm.search" @keyup.enter.native="search" placeholder></el-input>
         </el-form-item>-->
         <el-form-item prop="organId">
-          <el-select
-            class="multiple"
-            v-model.trim="searchForm.organId"
-            filterable
-            clearable
-            placeholder="请选择分部"
-          >
-            <el-option
-              v-for="(item,index) in organList"
-              :key="index"
-              :label="item.name"
-              :value="item.id"
-            ></el-option>
+          <el-select class="multiple"
+                     v-model.trim="searchForm.organId"
+                     filterable
+                     clearable
+                     placeholder="请选择分部">
+            <el-option v-for="(item,index) in organList"
+                       :key="index"
+                       :label="item.name"
+                       :value="item.id"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-select placeholder="老师姓名" v-model="searchForm.teacherId" clearable filterable>
-            <el-option
-              v-for="(item,index) in teacherList"
-              :label="item.realName"
-              :value="item.id"
-              :key="index"
-            ></el-option>
+          <el-select placeholder="老师姓名"
+                     v-model="searchForm.teacherId"
+                     clearable
+                     filterable>
+            <el-option v-for="(item,index) in teacherList"
+                       :label="item.realName"
+                       :value="item.id"
+                       :key="index"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-select placeholder="状态" v-model="searchForm.statusEnum" clearable>
-            <el-option label="待处理" value="PENDING"></el-option>
-            <el-option label="已完成" value="DONE"></el-option>
-            <el-option label="已同意" value="AGREED"></el-option>
-            <el-option label="已拒绝" value="DENIED"></el-option>
-            <el-option label="已撤回" value="WITHDRAWN"></el-option>
+          <el-select placeholder="状态"
+                     v-model="searchForm.statusEnum"
+                     clearable>
+            <el-option label="待处理"
+                       value="PENDING"></el-option>
+            <el-option label="已完成"
+                       value="DONE"></el-option>
+            <el-option label="已同意"
+                       value="AGREED"></el-option>
+            <el-option label="已拒绝"
+                       value="DENIED"></el-option>
+            <el-option label="已撤回"
+                       value="WITHDRAWN"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-date-picker
-            :clearable="true"
-            v-model="searchForm.salarySettlementMonth"
-            type="month"
-            value-format="yyyy-MM"
-            placeholder="选择年月"
-          ></el-date-picker>
+          <el-date-picker :clearable="true"
+                          v-model="searchForm.salarySettlementMonth"
+                          type="month"
+                          value-format="yyyy-MM"
+                          placeholder="选择年月"></el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button type="danger" @click="search">搜索</el-button>
-          <el-button @click="onReSet" type="primary">重置</el-button>
+          <el-button type="danger"
+                     @click="search">搜索</el-button>
+          <el-button @click="onReSet"
+                     type="primary">重置</el-button>
           <!-- export/isSettlementCourseSalarys -->
-          <el-button
-            @click="onExport"
-            type="primary"
-            v-permission="'export/teacherSalaryComplaints'"
-            style=" background: #14928a; border:1px solid #14928a;"
-          >导出</el-button>
+          <el-button @click="onExport"
+                     type="primary"
+                     v-permission="'export/teacherSalaryComplaints'"
+                     style=" background: #14928a; border:1px solid #14928a;">导出</el-button>
         </el-form-item>
       </el-form>
       <div class="tableWrap">
-        <el-table
-          style="width: 100%"
-          :header-cell-style="{background:'#EDEEF0',color:'#444'}"
-          :data="tableList"
-        >
-          <el-table-column align="center" prop="organName" label="分部"></el-table-column>
-          <el-table-column align="center" prop="teacherId" label="老师编号"></el-table-column>
-          <el-table-column align="center" prop="realName" label="老师姓名"></el-table-column>
-          <el-table-column align="center" prop="salarySettlementMonth" width="150" label="课酬归属时间"></el-table-column>
-          <el-table-column align="center" prop="updateTime" width="150" label="申述提交">
+        <el-table style="width: 100%"
+                  :header-cell-style="{background:'#EDEEF0',color:'#444'}"
+                  :data="tableList">
+          <el-table-column align="center"
+                           prop="organName"
+                           label="分部"></el-table-column>
+          <el-table-column align="center"
+                           prop="teacherId"
+                           label="老师编号"></el-table-column>
+          <el-table-column align="center"
+                           prop="realName"
+                           label="老师姓名"></el-table-column>
+          <el-table-column align="center"
+                           prop="salarySettlementMonth"
+                           width="150"
+                           label="课酬归属时间"></el-table-column>
+          <el-table-column align="center"
+                           prop="updateTime"
+                           width="150"
+                           label="申述提交">
             <template slot-scope="scope">{{scope.row.updateTime | dateForMinFormat}}</template>
           </el-table-column>
-          <el-table-column align="center" prop="statusEnum" label="状态">
+          <el-table-column align="center"
+                           prop="statusEnum"
+                           label="状态">
             <template slot-scope="scope">{{scope.row.statusEnum | statusEnum}}</template>
           </el-table-column>
-          <el-table-column align="center" prop="operatorRealName" label="申述处理者"></el-table-column>
+          <el-table-column align="center"
+                           prop="operatorRealName"
+                           label="申述处理者"></el-table-column>
           <!-- <el-table-column align="center" prop="reason" width="400" label="备注"></el-table-column> -->
-          <el-table-column align="center" prop="courseScheduleId" width="150" label="操作">
+          <el-table-column align="center"
+                           prop="courseScheduleId"
+                           width="150"
+                           label="操作">
             <template slot-scope="scope">
               <div>
-                <el-button type="text" @click="lookDetail(scope.row)" v-permission="'teacherSalaryComplaints/complaintsDispose'">操作</el-button>
+                <el-button type="text"
+                           @click="lookDetail(scope.row)"
+                           v-permission="'teacherSalaryComplaints/complaintsDispose'">操作</el-button>
               </div>
             </template>
           </el-table-column>
         </el-table>
-        <pagination
-          :total="rules.total"
-          :page.sync="rules.page"
-          :limit.sync="rules.limit"
-          :page-sizes="rules.page_size"
-          @pagination="getList"
-        />
+        <pagination :total="rules.total"
+                    :page.sync="rules.page"
+                    :limit.sync="rules.limit"
+                    :page-sizes="rules.page_size"
+                    @pagination="getList" />
       </div>
     </div>
-    <el-dialog title="课酬调整" :visible.sync="dialogVisible" width="400px">
+    <el-dialog title="申述处理"
+               :visible.sync="dialogVisible"
+               width="400px">
       <div>
-        <el-form ref="visibleForm" :model="visibleForm" class="visibleForm" >
-          <el-form-item
-            label="申述内容"
-            :rules="[{ required: true, message: '请填写申述内容',trigger: 'blur'}]"
-            prop="reason"
-          >
-            <el-input type="textarea" :rows="5" v-model.trim="visibleForm.reason"></el-input>
+        <el-form ref="visibleForm"
+                 :model="visibleForm"
+                 class="visibleForm">
+          <el-form-item label="申述内容"
+                        :rules="[{ required: true, message: '请填写申述内容',trigger: 'blur'}]"
+                        prop="reason">
+            <el-input type="textarea"
+                      :rows="5"
+                      v-model.trim="visibleForm.reason"></el-input>
           </el-form-item>
-          <el-form-item
-            label="处理意见"
-            :rules="[{ required: true, message: '请填写处理意见',trigger: 'blur'}]"
-            prop="handingSuggestion"
-          >
-            <el-input type="textarea" :rows="5" v-model.trim="visibleForm.handingSuggestion"></el-input>
+          <el-form-item label="处理意见"
+                        :rules="[{ required: true, message: '请填写处理意见',trigger: 'blur'}]"
+                        prop="handingSuggestion">
+            <el-input type="textarea"
+                      :rows="5"
+                      v-model.trim="visibleForm.handingSuggestion"></el-input>
           </el-form-item>
         </el-form>
       </div>
       <div slot="footer">
         <el-button @click="subreset('DENIED')">拒绝</el-button>
-        <el-button type="primary" @click="subreset('AGREED')">同意</el-button>
+        <el-button type="primary"
+                   @click="subreset('AGREED')">同意</el-button>
       </div>
     </el-dialog>
   </div>
@@ -141,7 +166,7 @@ import {
 } from "@/api/journal";
 export default {
   components: { pagination },
-  data() {
+  data () {
     return {
       searchForm: {
         search: null,
@@ -167,14 +192,14 @@ export default {
         teacherId: null,
         salarySettlementMonth: null,
         statusEnum: null,
-        id:null
+        id: null
       }
     };
   },
   //生命周期 - 创建完成(可以访问当前this实例)
-  created() {},
+  created () { },
   //生命周期 - 挂载完成(可以访问DOM元素)
-  mounted() {
+  mounted () {
     getTeacher().then(res => {
       if (res.code == 200) {
         this.teacherList = res.data;
@@ -189,10 +214,10 @@ export default {
     this.init();
   },
   methods: {
-    init() {
+    init () {
       this.getList();
     },
-    getList() {
+    getList () {
       this.searchForm.page = this.rules.page;
       this.searchForm.rows = this.rules.limit;
       teacherSalaryComplaints(this.searchForm).then(res => {
@@ -202,11 +227,11 @@ export default {
         }
       });
     },
-    search() {
+    search () {
       this.rules.page = 1;
       this.getList();
     },
-    onReSet() {
+    onReSet () {
       this.searchForm = {
         search: null,
         salarySettlementMonth: null,
@@ -216,7 +241,7 @@ export default {
       };
       this.search();
     },
-      onExport() {
+    onExport () {
       let url = "/api-web/export/teacherSalaryComplaints";
       let obj = this.searchForm;
       const options = {
@@ -278,9 +303,9 @@ export default {
               load.endLoading();
             });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
-    lookDetail(row) {
+    lookDetail (row) {
       teacherSalaryComplaintsDetail({ id: row.id }).then(res => {
         if (res.code == 200) {
           this.visibleForm = {
@@ -289,24 +314,24 @@ export default {
             teacherId: res.data.teacherId,
             salarySettlementMonth: res.data.salarySettlementMonth,
             statusEnum: null,
-            id:res.data.id
+            id: res.data.id
           };
-          
+
           this.dialogVisible = true;
         }
       });
     },
-    subreset(str) {
-       this.$refs["visibleForm"].validate(flag => {
+    subreset (str) {
+      this.$refs["visibleForm"].validate(flag => {
         if (flag) {
           let obj = {
             reason: this.visibleForm.reason,
             handingSuggestion: this.visibleForm.handingSuggestion,
             currentReduceSalary: this.visibleForm.reduceSalary,
             salarySettlementMonth: this.visibleForm.salarySettlementMonth,
-            teacherId:this.visibleForm.teacherId,
+            teacherId: this.visibleForm.teacherId,
             statusEnum: str,
-             id:this.visibleForm.id
+            id: this.visibleForm.id
           };
           complaintsDispose(obj).then(res => {
             if (res.code == 200) {
@@ -320,7 +345,7 @@ export default {
     }
   },
   filters: {
-    statusEnum(val) {
+    statusEnum (val) {
       let template = {
         PENDING: "待处理",
         DONE: "已完成",
@@ -332,7 +357,7 @@ export default {
     }
   },
   watch: {
-    dialogVisible(val) {
+    dialogVisible (val) {
       if (!val) {
         this.visibleForm = {
           reason: null,
@@ -340,11 +365,11 @@ export default {
           teacherId: null,
           salarySettlementMonth: null,
           statusEnum: null,
-           id:null
+          id: null
         };
-         this.$refs["visibleForm"].resetFields();
+        this.$refs["visibleForm"].resetFields();
       }
-      
+
     }
   }
 };

部分文件因为文件数量过多而无法显示