1110 17:09

11

dist/static/css/chunk-24a1caba.d0810af7.css

@@ -0,0 +1 @@
+.setBtn[data-v-0dad9994]{width:120px;height:40px;line-height:40px;text-align:center;border-radius:4px;color:#fff;background-color:#444;cursor:pointer;margin:20px 0}.imc[data-v-5572fd9c]{-webkit-box-sizing:border-box;box-sizing:border-box;padding:30px 42px;background-color:#fff;min-height:80vh}.imc .addBtn[data-v-5572fd9c]{line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;width:120px;height:40px;background-color:#4eada7}

dist/static/css/chunk-5ff585ee.c04923ce.css

@@ -1 +0,0 @@
-.setBtn[data-v-3d94d6e3]{width:120px;height:40px;line-height:40px;text-align:center;border-radius:4px;color:#fff;background-color:#444;cursor:pointer;margin:20px 0}.imc[data-v-af3f5606]{-webkit-box-sizing:border-box;box-sizing:border-box;padding:30px 42px;background-color:#fff;min-height:80vh}.imc .addBtn[data-v-af3f5606]{line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;width:120px;height:40px;background-color:#4eada7}

dist/static/css/chunk-7271c514.2967ab8e.css → dist/static/css/chunk-755bc695.cdda01e3.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.select[data-v-dc4c80ee]{font-size:14px}.btnList[data-v-dc4c80ee]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-dc4c80ee]{margin-right:15px}
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.select[data-v-593991d4]{font-size:14px}.btnList[data-v-593991d4]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-593991d4]{margin-right:15px}

src/api/studentManager.js

@@ -156,4 +156,13 @@ export function removeStudents (data) {
     method: 'POST',
     data: qs.stringify(data)
   })
+}
+
+// 根据学生id查看学生班级
+export function getStudentClass (data) {
+  return request({
+    url: api + `/studentManage/queryStudentClassGroup`,
+    method: 'get',
+    params: data
+  })
 }

src/layout/components/Navbar.vue

@@ -17,7 +17,7 @@
                    trigger="click">
 
         <div class="avatar-wrapper">
-          <img src="@/assets/images/base/placehorder-icon.png"
+          <img :src="$store.getters.avatar"
                class="user-avatar" />
           <!-- <i class="el-icon-caret-bottom" /> -->
           <span>{{ username }}</span>

src/utils/searchArray.js

@@ -2,82 +2,82 @@
 
 // 课程类型
 const courseType = [
-    { label: '单技课', value: 'SINGLE' },
-    { label: '合奏课', value: 'MIX' },
-    { label: '小班课', value: 'HIGH' },
-    { label: 'VIP课', value: 'VIP' },
-    { label: '试听课', value: 'DEMO' },
-    { label: '综合课', value: 'COMPREHENSIVE' },
-    { label: '练习课', value: 'PRACTICE' },
-    { label: '启蒙课', value: 'ENLIGHTENMENT' },
-    { label: '集训课', value: 'TRAINING' },
-    { label: '课堂课', value: 'CLASSROOM' }
+  { label: '单技课', value: 'SINGLE' },
+  { label: '合奏课', value: 'MIX' },
+  { label: '小班课', value: 'HIGH' },
+  { label: 'VIP课', value: 'VIP' },
+  { label: '试听课', value: 'DEMO' },
+  { label: '综合课', value: 'COMPREHENSIVE' },
+  { label: '练习课', value: 'PRACTICE' },
+  { label: '启蒙课', value: 'ENLIGHTENMENT' },
+  { label: '集训课', value: 'TRAINING' },
+  { label: '课堂课', value: 'CLASSROOM' }
 ]
 
 // 考勤状态
 const attendance = [
-    { label: '正常签到', value: 1 },
-    { label: '异常签到', value: 0 },
+  { label: '正常签到', value: 1 },
+  { label: '异常签到', value: 0 },
 ]
 
 // 工作类型
 const jobNature = [
-    { label: '兼职', value: 'PART_TIME' },
-    { label: '全职', value: 'FULL_TIME' },
-    { label: '临时工', value: 'TEMPORARY' }
+  { label: '兼职', value: 'PART_TIME' },
+  { label: '全职', value: 'FULL_TIME' },
+  { label: '临时工', value: 'TEMPORARY' }
 ]
 
 // 老师状态
 const teacherStatus = [
-    { label: '正常', value: '0' },
-    { label: '冻结', value: '1' },
-    { label: '锁定', value: '9' }
+  { label: '正常', value: '0' },
+  { label: '冻结', value: '1' },
+  { label: '锁定', value: '9' }
 ]
 
 // 考勤状态
 const attendanceStatus = [
-    { value: "NORMAL", label: "正常" },
-    { value: "TRUANT", label: "旷课" },
-    { value: "LEAVE", label: "请假" },
-    { value: "QUIT_SCHOOL", label: "退学" },
-    { value: "DROP_OUT", label: "休学" }
+  { value: "NORMAL", label: "正常" },
+  { value: "TRUANT", label: "旷课" },
+  { value: "LEAVE", label: "请假" },
+  { value: "QUIT_SCHOOL", label: "退学" },
+  { value: "DROP_OUT", label: "休学" }
 ]
 
 // 交易状态
 const orderStatus = [
-    { value: "APPLY", label: "报名" },
-    { value: "RENEW", label: "续费" },
-    { value: "OTHER", label: "其他" },
-    { value: "SMALL_CLASS_TO_BUY", label: "VIP购买" }
+  { value: "APPLY", label: "报名" },
+  { value: "RENEW", label: "续费" },
+  { value: "OTHER", label: "其他" },
+  { value: "SMALL_CLASS_TO_BUY", label: "VIP购买" }
 ]
 
 // 交易状态
 const dealStatus = [
-    { value: "ING", label: "交易中" },
-    { value: "SUCCESS", label: "成功交易" },
-    { value: "FAilED", label: "交易失败" },
-    { value: "CLOSE", label: "交易关闭" }
+  { value: "ING", label: "交易中" },
+  { value: "SUCCESS", label: "成功交易" },
+  { value: "FAilED", label: "交易失败" },
+  { value: "CLOSE", label: "交易关闭" }
 ]
 
 const musicGroupStatus = [
-    { value: 'APPLY', text: '报名中' },
-    { value: 'PAY', text: '缴费中' }, 
-    { value: 'PREPARE', text: '筹备中' },
-    { value: 'PROGRESS', text: '进行中' }, 
-    { value: 'CANCELED', text: '取消' }, 
-    { value: 'AUDIT', text: '审核中' },
-    { value: 'PAUSE', text: '暂停' }, 
-    { value: 'DRAFT', text: '编辑中' }, 
-    { value: 'AUDIT_FAILED', text: '审核失败' }
-  ]
+  { value: 'APPLY', text: '报名中' },
+  { value: 'PAY', text: '缴费中' },
+  { value: 'PREPARE', text: '筹备中' },
+  { value: 'PROGRESS', text: '进行中' },
+  { value: 'CANCELED', text: '已停止' },
+  { value: 'AUDIT', text: '审核中' },
+  { value: 'PAUSE', text: '已结束' },
+  { value: 'DRAFT', text: '编辑中' },
+  { value: 'AUDIT_FAILED', text: '审核失败' }
+]
 
 export {
-    courseType,
-    attendance,
-    jobNature,
-    teacherStatus,
-    attendanceStatus,
-    orderStatus,
-    dealStatus,
-    musicGroupStatus
+  courseType,
+  attendance,
+  jobNature,
+  teacherStatus,
+  attendanceStatus,
+  orderStatus,
+  dealStatus,
+  musicGroupStatus
 }

src/views/categroyManager/vipActiveList.vue

@@ -359,7 +359,7 @@ export default {
       if (obj && obj.onlineSalarySettlement && obj.onlineSalarySettlement.salarySettlementType) {
         switch (obj.onlineSalarySettlement.salarySettlementType) {
           case 'RATIO_DISCOUNT': {
-            return `线上:${obj.onlineSalarySettlement.settlementValue}成`
+            return `线上:${obj.onlineSalarySettlement.settlementValue}%`
             break
           }
           case 'TEACHER_DEFAULT': {
@@ -378,7 +378,7 @@ export default {
       if (obj && obj.offlineSalarySettlement && obj.offlineSalarySettlement.salarySettlementType) {
         switch (obj.offlineSalarySettlement.salarySettlementType) {
           case 'RATIO_DISCOUNT': {
-            return '线下:' + obj.offlineSalarySettlement.settlementValue + '成'
+            return '线下:' + obj.offlineSalarySettlement.settlementValue + '%'
             break
           }
           case 'TEACHER_DEFAULT': {

src/views/teamBuild/signupList.vue

@@ -22,8 +22,14 @@
                @click="onCreateQRCode">生成二维码</div>
         </div>
       </div>
-      <p class='msg'> <img src="@/assets/images/base/clock.png"
-             alt=""> {{ status=='APPLY'?'报名中':'缴费中' }}</p>
+      <!--  stepImgs: {
+        APPLY: require('@/assets/images/base/clock.png'),
+        PAY: require('@/assets/images/base/pay.png')
+      }, -->
+      <p class='msg'
+         :class="status=='PAY'? 'pay' : '' "> <img :src="status=='APPLY'?stepImgs.APPLY:stepImgs.PAY"
+             alt="">
+        {{ status=='APPLY'?'报名中':'缴费中' }}</p>
     </div>
     <div class="searchList">
       <el-form :inline="true"
@@ -361,6 +367,10 @@ export default {
         subject: '', // 专业
         isAllowAdjust: '' // 是否允许调剂
       },
+      stepImgs: {
+        APPLY: require('@/assets/images/base/clock.png'),
+        PAY: require('@/assets/images/base/pay.png')
+      },
       status: '',
       id: '',
       rules: {
@@ -555,7 +565,7 @@ export default {
         this.$message.error('当前缴费人数为0，无法开团')
         return
       }
-      this.$confirm(`当前缴费人数为${this.paymentNum}人，是否确认开团?`, '提示', {
+      this.$confirm(`是否确认开团?`, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
@@ -690,6 +700,9 @@ export default {
     display: flex;
     flex-direction: row;
     justify-content: space-between;
+    .msg.pay {
+      color: #f85043;
+    }
     .msg {
       text-align: right;
       color: #f97215;

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

@@ -364,6 +364,7 @@ export default {
           }
         }).catch(res => {
           // this.tableList = [];
+          this.classCardList = [];
         })
       }).catch(() => {
 
@@ -597,7 +598,7 @@ export default {
           let date1 = new Date(date.getTime());
           let num; // 下次上课上几天后
           // 星期4 - 当前是星期几 => 
-          weekArr[i].weekNum - date.getDay() > 0 ? num = weekArr[i].weekNum - date.getDay() : num = weekArr[i].weekNum - date.getDay() + 7
+          weekArr[i].weekNum - date.getDay() >= 0 ? num = weekArr[i].weekNum - date.getDay() : num = weekArr[i].weekNum - date.getDay() + 7
 
           let dataStr = this.getThinkDate(date, num);
           let monthDay = this.getThinkDate(date1, num, 2)

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

@@ -75,7 +75,7 @@
          style="margin-top:40px;">
       <div class="nextBtn"
            @click='gotoNext'>下一步</div>
-      <div class="okBtn">返回</div>
+      <!-- <div class="okBtn">返回</div> -->
     </div>
     <el-dialog title="添加提高班"
                :visible.sync="raiseVisible"

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

@@ -6,7 +6,8 @@
              @click="gotoPlan">新增/修改</div>
       </el-form-item>
       <el-form-item label="选择合奏班">
-        <el-select v-model="chioseMix">
+        <el-select v-model="chioseMix"
+                   @change="chioseList">
           <el-option v-for='(item,index) in maxClassList'
                      :key="index"
                      :value="item.id"
@@ -37,6 +38,10 @@
           </div>
         </template>
       </el-table-column>
+      <el-table-column prop="classGroupName"
+                       align="center"
+                       label="班级名称">
+      </el-table-column>
       <el-table-column prop="name"
                        align="center"
                        label="课程名称">
@@ -70,7 +75,6 @@ export default {
       tableList: []
     }
   }, mounted () {
-
     sessionStorage.setItem('setStep', 2)
     sessionStorage.setItem('resetCode', 4)
     this.teamid = this.$route.query.id;
@@ -95,6 +99,13 @@ export default {
       let type = sessionStorage.getItem('chargeTypeId');
       type == 3 ? this.$emit('gotoNav', 3) : this.$emit('gotoNav', 4)
 
+    },
+    chioseList (val) {
+      getClassCOurse({ classGroupId: val }).then(res => {
+        if (res.code == 200) {
+          this.tableList = res.data;
+        }
+      })
     }
   },
 }

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

@@ -143,6 +143,7 @@ export default {
     }
   },
   mounted () {
+    sessionStorage.setItem('setStep', 4)
     getTeamDetail({ musicGroupId: this.teamid }).then(res => {
       if (res.code == 200) {
         this.searchForm.salary = res.data.settlementType;

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

@@ -266,6 +266,7 @@ export default {
   },
   mounted () {
     sessionStorage.setItem('setStep', 0)
+    console.log(sessionStorage.getItem('setStep'))
     getTeamRecruit({ musicGroupId: this.teamid }).then(res => {
       // 获取乐团声部集合
       if (res.code == 200) {

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

@@ -165,18 +165,34 @@ export default {
       // console.log(this.singinList)
       let isTeacher = true;
       let isTeachers = []
+      let singinListTeacher = []
+      let allListTeacher = []
+
+
       // 验证单技班主教老师是否指认
       for (let i in this.singinList) {
+        singinListTeacher.push(this.singinList[i].coreTeacher);
+        singinListTeacher = singinListTeacher.concat(this.singinList[i].assistant)
         if (this.singinList[i].coreTeacher == '') {
           isTeachers.push(false)
         }
       }
+      if (singinListTeacher.length != [...new Set(singinListTeacher)].length) {
+        this.$message.error('存在老师设置冲突，请调整')
+        return
+      }
+
       for (let j in this.allList) {
+        allListTeacher.push(this.allList[j].coreTeacher);
+        allListTeacher = allListTeacher.concat(this.allList[j].assistant)
         if (this.allList[j].coreTeacher == '') {
           isTeachers.push(false)
         }
       }
-
+      if (allListTeacher.length != [...new Set(allListTeacher)].length) {
+        this.$message.error('存在老师设置冲突，请调整')
+        return
+      }
       isTeachers.filter(item => {
         isTeacher = isTeacher && item
       })

src/views/teamBuild/teamSeting/index.vue

@@ -3,7 +3,7 @@
     <div class="topWrap">
       <h2>
         <div class="squrt"></div>
-        武汉小学乐团
+        {{ name }}
       </h2>
       <div class="stepbox">
         <span class='stepspan'
@@ -66,7 +66,7 @@
 
     <!-- 下面显示的内容 -->
     <div class="stepcontent">
-      <div v-show='activeIndex==0'>
+      <div v-if='activeIndex==0'>
         <classSeting :teamid='id'
                      @gotoNav='gotoNav' />
       </div>
@@ -113,16 +113,19 @@ export default {
         active: require('@/assets/images/base/step-arrow.png')
       },
       id: '',
-      chargeTypeId: ''
+      chargeTypeId: '',
+      name: ''
     }
   },
   created () {
     this.id = this.$route.query.id;
 
-    this.activeIndex = sessionStorage.getItem('setStep') || 0
+    this.activeIndex = sessionStorage.getItem('setStep') || 0;
+    console.log(sessionStorage.getItem('setStep'))
     getTeamBaseInfo({ musicGroupId: this.id }).then(res => {
       if (res.code == 200) {
         this.chargeTypeId = res.data.musicGroup.chargeTypeId;
+        this.name = res.data.musicGroup.name;
         sessionStorage.setItem('chargeTypeId', this.chargeTypeId);
       }
     })

src/views/teamDetail/components/classList.vue

@@ -13,8 +13,8 @@
       </el-form-item>
     </el-form> -->
     <!-- 列表 -->
-    <div class="newBand"
-         @click="resetClass">班级调整</div>
+    <!-- <div class="newBand"
+         @click="resetClass">班级调整</div> -->
     <div class="tableWrap">
       <el-table :data='tableList'
                 :header-cell-style="{background:'#EDEEF0',color:'#444'}">

src/views/teamDetail/components/studentList.vue

@@ -167,7 +167,7 @@
                 </div>
               </el-popover>
               <el-button type="text"
-                         size="small">查看班级</el-button>
+                         @click="lookClass(scope.row)">查看班级</el-button>
             </div>
           </template>
         </el-table-column>
@@ -287,11 +287,25 @@
                    @click="addStudent">确 定</el-button>
       </div>
     </el-dialog>
+    <el-dialog title="学员所在班级"
+               width="640px"
+               :visible.sync="studentClassVisible">
+      <el-form :model="classMask">
+        <el-form-item label="学生姓名">
+          {{ classMask.studentName }}
+        </el-form-item>
+        <el-form-item label="所在班级"
+                      v-for="(item,index) in classList"
+                      :key="index">
+          {{ item.name }}
+        </el-form-item>
+      </el-form>
+    </el-dialog>
   </div>
 </template>
 <script>
 import { getTeamStudentList, getTeamStudentInfo, getSingleClass, findSound, StudentQuit } from '@/api/buildTeam'
-import { addStudent } from '@/api/studentManager'
+import { addStudent, getStudentClass } from '@/api/studentManager'
 import pagination from '@/components/Pagination/index'
 export default {
   props: {
@@ -302,6 +316,7 @@ export default {
   },
   data () {
     return {
+      studentClassVisible: false, // 学员所在班级弹窗
       addStudentVisible: false, //新增学员弹窗
       topFrom: { // 顶部的禁选框集合
         expect: '2', // 预期招生
@@ -316,6 +331,9 @@ export default {
         isPay: '', // 是否缴费
 
       },
+      classMask: {
+        studentName: ''
+      },
       searchLsit: [],
       tableList: [], //
       rules: {
@@ -346,7 +364,7 @@ export default {
         id: ''
       },
       remark: '', // 退团原因
-
+      classList: [],
       maskRules: {
         studentName: [{ required: true, message: '请输入学生姓名' },],
         sex: [{ required: true, message: '请选择学生姓名' },],
@@ -451,6 +469,18 @@ export default {
           })
         }
       })
+    },
+    lookClass (row) {
+      this.classMask.studentName = row.realName;
+      getStudentClass({
+        musicGroupId: this.teamid,
+        teacherId: row.userId
+      }).then(res => {
+        if (res.code == 200) {
+          this.classList = res.data;
+          this.studentClassVisible = true;
+        }
+      })
     }
   }
 }

src/views/teamDetail/index.vue

@@ -7,12 +7,13 @@
       <div class="term active">第二学期</div> -->
     </h2>
     <div class="m-core">
-      <div class='newBand abs'
-           @click='resetTeam'>乐团修改</div>
-      <p class='msg'>
-        <img src="@/assets/images/base/clock.png"
-             alt=""> 报名中
-      </p>
+      <!-- <div class='newBand abs'
+           @click='resetTeam'>乐团修改</div> -->
+
+      <p class='msg'
+         :class="status=='PROGRESS'? 'ing' : '' "> <img :src="status=='PROGRESS'?stepImgs.PROGRESS:stepImgs.PAUSE"
+             alt="">
+        {{ status=='PROGRESS'?'进行中':'已结束' }}</p>
       <!-- navMenu -->
       <el-tabs v-model="activeIndex"
                type="card"
@@ -71,12 +72,18 @@ export default {
       activeIndex: '1',
       teamid: '',
       name: '',
+      stepImgs: {
+        PROGRESS: require('@/assets/images/base/ing.png'),
+        PAUSE: require('@/assets/images/base/end.png')
+      },
+      status: ''
     }
   },
   created () {
     // this.teamid = '191014135135001';
     // 191015094822001
     let teamInfo = this.$route.query;
+    this.status = this.$route.query.status;
     this.teamid = teamInfo.id;
     this.name = teamInfo.name
   },
@@ -110,9 +117,12 @@ export default {
 <style lang="scss" scoped>
 .m-container {
   .m-core {
+    .msg.ing {
+      color: #14928a;
+    }
     .msg {
       text-align: right;
-      color: #f97215;
+      color: #777;
       font-size: 32px;
       font-weight: bold;
       position: absolute;

src/views/teamDetail/teamList.vue

@@ -133,10 +133,10 @@
                            @click="gotodetailList(scope.row)">发放清单</el-button>
 
                 <el-button type="text"
-                           v-if="scope.row.status == 'PROGRESS'"
+                           v-if="scope.row.status == 'PROGRESS' ||  scope.row.status == 'PAUSE'"
                            @click="lookTeamDetail(scope.row)">查看</el-button>
                 <el-button type="text"
-                           v-if="scope.row.status != 'PROGRESS' && scope.row.status != 'CANCELED'"
+                           v-if="scope.row.status != 'PROGRESS' && scope.row.status != 'CANCELED'  && scope.row.status != 'PAUSE'"
                            @click="lookTeamDetail(scope.row)">编辑</el-button>
                 <el-button v-if="scope.row.status == 'PREPARE'"
                            @click="startTeam(scope.row)"
@@ -379,6 +379,7 @@ export default {
         }
         case 'PAUSE': {
           // 暂停
+          this.$router.push({ path: `/business/teamDetails`, query: { status: row.status, id: row.id, name: row.name } })
           break;
         }
       }

src/views/vipClass/vipDetail/components/teacherRecord.vue

@@ -130,10 +130,10 @@
       <span slot="footer"
             class="dialog-footer">
         <el-button type="primary"
-                   @click="dialogVisible = false">确 定</el-button>
+                   @click="studentVisible = false">确 定</el-button>
       </span>
     </el-dialog>
-    <el-dialog title="课时调整"
+    <el-dialog title="课程调整"
                :visible.sync="courseVisible"
                width="420px">
       <el-form :model="maskForm"

src/views/vipClass/vipList.vue

@@ -12,6 +12,7 @@
         <!-- 状态 指导老师 活动方案-->
         <el-form-item>
           <el-select v-model="searchForm.teacherId"
+                     clearable
                      placeholder="指导老师">
             <el-option v-for="(item,index) in teacherList"
                        :key='index'
@@ -21,6 +22,7 @@
         </el-form-item>
         <el-form-item>
           <el-select v-model="searchForm.activityId"
+                     clearable
                      placeholder="活动方案">
             <el-option v-for="(item,index) in activeList"
                        :key='index'