1108 20:54

dist/static/css/chunk-7ed8e03b.ce5e6294.css → dist/static/css/chunk-15db0c02.aaa69496.css

@@ -1 +1 @@
-.m-core[data-v-08933e78]{margin-top:30px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-ms-flex-pack:distribute;justify-content:space-around}.m-core .el-input[data-v-08933e78]{width:180px}.m-core h4[data-v-08933e78]{font-size:16px;background-color:#ccc;color:#fff;text-align:center;width:100%;height:40px;line-height:40px;margin-bottom:20px}.m-core .center[data-v-08933e78],.m-core .right[data-v-08933e78],.m-core .vipLeft[data-v-08933e78]{width:400px}.planList[data-v-08933e78]{padding:0 25px}.planList .planTop[data-v-08933e78]{height:40px;line-height:40px;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:justify;-ms-flex-pack:justify;justify-content:space-between;border-bottom:1px solid #ccc;margin-top:20px}.planList .planTop>p[data-v-08933e78]{font-size:14px}.planList .planCore .row[data-v-08933e78]{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:justify;-ms-flex-pack:justify;justify-content:space-between;-ms-flex-wrap:nowrap;flex-wrap:nowrap;height:40px;line-height:40px;font-size:14px;text-align:center}.planList .planCore .row div[data-v-08933e78]{width:87px}.okBtn[data-v-08933e78]{width:120px;height:40px;line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;background-color:#f97215;float:right}
+.m-core[data-v-3e0798c2]{margin-top:30px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-ms-flex-pack:distribute;justify-content:space-around}.m-core .el-input[data-v-3e0798c2]{width:180px}.m-core h4[data-v-3e0798c2]{font-size:16px;background-color:#ccc;color:#fff;text-align:center;width:100%;height:40px;line-height:40px;margin-bottom:20px}.m-core .center[data-v-3e0798c2],.m-core .right[data-v-3e0798c2],.m-core .vipLeft[data-v-3e0798c2]{width:400px}.planList[data-v-3e0798c2]{padding:0 25px}.planList .planTop[data-v-3e0798c2]{height:40px;line-height:40px;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:justify;-ms-flex-pack:justify;justify-content:space-between;border-bottom:1px solid #ccc;margin-top:20px}.planList .planTop>p[data-v-3e0798c2]{font-size:14px}.planList .planCore .row[data-v-3e0798c2]{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:justify;-ms-flex-pack:justify;justify-content:space-between;-ms-flex-wrap:nowrap;flex-wrap:nowrap;height:40px;line-height:40px;font-size:14px;text-align:center}.planList .planCore .row div[data-v-3e0798c2]{width:87px}.okBtn[data-v-3e0798c2]{width:120px;height:40px;line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;background-color:#f97215;float:right}

dist/static/css/chunk-d1cc038a.51b416c2.css → dist/static/css/chunk-942799a8.c0d7215d.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-6a5dcbab]{font-size:14px}.btnList[data-v-6a5dcbab]{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-6a5dcbab]{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-d88dfd0e]{font-size:14px}.btnList[data-v-d88dfd0e]{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-d88dfd0e]{margin-right:15px}

src/utils/request.js

@@ -45,7 +45,7 @@ function tryHideFullScreenLoading () {
 const service = axios.create({
   baseURL: '', // url = base url + request url
   // withCredentials: true, // send cookies when cross-domain requests
-  timeout: 7000 // request timeout
+  timeout: 10000 // request timeout
 })
 // { fullscreen: true, text: '努力加载中', spinner: 'el-icon-loading' }
 // request interceptor

src/views/buildVip/index.vue

@@ -100,7 +100,7 @@
                             placeholder="请选择时间" />
           </el-form-item>
           <el-form-item v-if="leftForm.courseStart"
-                        label="课程开始时间">
+                        label="最早排课时间">
             <el-date-picker v-model="leftForm.courseStart"
                             disabled
                             type="date"
@@ -108,7 +108,7 @@
                             placeholder="请选择时间" />
           </el-form-item>
           <el-form-item v-if="leftForm.courseEnd"
-                        label="课程结束时间">
+                        label="最晚排课时间">
             <el-date-picker v-model="leftForm.courseEnd"
                             disabled
                             type="date"

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

@@ -141,7 +141,7 @@
           </el-form-item>
           <el-form-item label="班级人数">
             <el-input :disabled="true"
-                      :value="activeStudents.length"></el-input>
+                      v-model="activeStudents.length"></el-input>
           </el-form-item>
         </el-form>
       </div>
@@ -298,6 +298,7 @@ export default {
       })
     },
     handleCheckAllChange (val, index) {
+      console.log(val); // item.rows
       // 全选
       // 1.val:选项框里的所有选项
       // 2.哪一个
@@ -306,9 +307,9 @@ export default {
         this.maskList.checkList[index] = []
         for (let i in val) {
           // 存储的数组
-
-          this.maskList.checkList[index].push(val[i].id);
-          this.activeStudents.push(val[i].id)
+          this.maskList.checkList[index].push(val[i].userId);
+          // console.log(this.activeStudents)
+          this.activeStudents.push(val[i].userId)
 
           // 并且把所有的学生 添加到勾选的学生列表
 
@@ -330,6 +331,7 @@ export default {
       // 单选学生触发事件
       // 此处需要同步全选按钮状态
       // maskList.studentsGroup[index]
+
       if (list.length == this.maskList.checkList[index].length) {
         //全选选中
         this.maskList.studentsGroup[index] = true;
@@ -343,6 +345,7 @@ export default {
           arr.push(this.maskList.checkList[i][j])
         }
       }
+      console.log(this.maskList)
 
       this.activeStudents = arr;
     },

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

@@ -143,7 +143,6 @@ export default {
             for (let i in item.classGroupTeacherMapperList) {
               if (item.classGroupTeacherMapperList[i].teacherRole == 'BISHOP') {
                 item.coreTeacher = item.classGroupTeacherMapperList[i].userId
-                console.log(item.coreTeacher);
               } else if (item.classGroupTeacherMapperList[i].teacherRole == 'TEACHING') {
                 item.assistant.push(item.classGroupTeacherMapperList[i].userId)
               }
@@ -162,7 +161,7 @@ export default {
     },
     gotoNext () {
       // 点击下一步
-      console.log(this.singinList)
+      // console.log(this.singinList)
       let isTeacher = true;
       let isTeachers = []
       // 验证单技班主教老师是否指认
@@ -190,6 +189,7 @@ export default {
       setTeamTeacher(this.classGroupTeacherMapperList).then(res => {
         if (res.code == 200) {
           this.classGroupTeacherMapperList = [];
+          this.$emit('gotoNav', 2);
         }
       })
     },

src/views/teamBuild/teamSeting/index.vue

@@ -39,6 +39,7 @@
                arrow">
         </span>
         <span class='stepspan  stepspan2'
+              v-if='chargeTypeId==3'
               @click="activeIndex=3">
           <div class="step2 sptep"
                :class="activeIndex >= 3?'activestep':''">
@@ -70,13 +71,14 @@
                      @gotoNav='gotoNav' />
       </div>
       <div v-if='activeIndex==1'>
-        <teacherSeting :teamid='id' />
+        <teacherSeting :teamid='id'
+                       @gotoNav='gotoNav' />
       </div>
       <div v-if='activeIndex==2'>
         <!-- <coursePlan :teamid='id' /> -->
         <lookCourse />
       </div>
-      <div v-if='activeIndex==3'>
+      <div v-if='activeIndex==3 && chargeTypeId!=3'>
         <improvement :teamid='id' />
       </div>
       <div v-if='activeIndex==4'>
@@ -92,6 +94,7 @@ import coursePlan from '@/views/teamBuild/teamSeting/components/coursePlan'
 import salarySet from '@/views/teamBuild/teamSeting/components/salarySet'
 import improvement from '@/views/teamBuild/teamSeting/components/improvementClass'
 import lookCourse from '@/views/teamBuild/teamSeting/components/lookCourse'
+import { getTeamBaseInfo } from '@/api/buildTeam'
 export default {
   components: {
     classSeting,
@@ -108,18 +111,24 @@ export default {
         nol: require('@/assets/images/base/step-arrow-active.png'),
         active: require('@/assets/images/base/step-arrow.png')
       },
-      id: ''
+      id: '',
+      chargeTypeId: ''
     }
   },
   created () {
-    // 191015151405001
-    // 191015094822001
     this.id = this.$route.query.id;
+    getTeamBaseInfo({ musicGroupId: this.id }).then(res => {
+      if (res.code == 200) {
+        this.chargeTypeId = res.data.musicGroup.chargeTypeId;
+      }
+    })
   },
   mounted () {
+    // 根据乐团id 获取乐团信息
   },
   methods: {
     gotoNav (val) {
+      console.log(val)
       this.activeIndex = val;
     }
   },

src/views/teamDetail/components/courseList.vue

@@ -163,6 +163,7 @@
                       prop="date">
           <el-date-picker v-model="maskForm.date"
                           type="date"
+                          value-format="yyyy-MM-dd"
                           placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
@@ -270,6 +271,8 @@ export default {
         classScheduleStatus: this.searchForm.classStatus || null,
         classScheduleType: this.searchForm.courseStatus || null,
         musicGroupId: this.teamid,
+        startTime: this.searchForm.timer[0] || null,
+        endTime: this.searchForm.timer[1] || null
 
       }
       getCourseList(obj).then(res => {

src/views/teamDetail/components/salaryList.vue

@@ -16,6 +16,10 @@
                         :picker-options="pickerOptions">
         </el-date-picker>
       </el-form-item>
+      <el-form-item>
+        <el-button @click="getList"
+                   type="danger">搜索</el-button>
+      </el-form-item>
     </el-form>
     <!-- 查询列表 -->
     <!-- 列表 -->
@@ -184,7 +188,17 @@ export default {
   },
   methods: {
     getList () {
-      getCourseList({ musicGroupId: this.teamid }).then(res => {
+      // searchForm.date
+      if (!this.searchForm.date) {
+        this.searchForm.date = []
+      }
+
+      let obj = {
+        musicGroupId: this.teamid,
+        startTime: this.searchForm.date[0] || null,
+        endTime: this.searchForm.date[1] || null,
+      }
+      getCourseList(obj).then(res => {
         if (res.code == 200) {
           this.tableList = res.data.rows;
           this.rules.total = res.data.total;

src/views/teamDetail/components/studentList.vue

@@ -41,7 +41,7 @@
       <el-form-item label="所选专业">
         <el-select v-model="searchForm.major"
                    clearable
-                   placeholder="报名专业">
+                   placeholder="所选专业">
           <el-option v-for='(item,index) in soundList'
                      :key='index'
                      :value="item.id"
@@ -108,7 +108,7 @@
           </template>
         </el-table-column>
         <el-table-column align='center'
-                         label="报名专业"
+                         label="专业"
                          prop="subjectName">
         </el-table-column>
         <!-- <el-table-column align='center'

src/views/teamDetail/components/teacherList.vue

@@ -120,10 +120,10 @@ export default {
       mixCourseList: [],
       rules: {
         // 分页规则
-        limit: 2, // 限制显示条数
+        limit: 10, // 限制显示条数
         page: 1, // 当前页
         total: 0, // 总条数
-        page_size: [2, 4, 6, 8] // 选择限制显示条数
+        page_size: [10, 20, 30, 40] // 选择限制显示条数
       },
     }
   },

src/views/teamDetail/teamList.vue

@@ -216,13 +216,6 @@ export default {
   },
   methods: {
     getList () {
-      /**
-       * 
-       *  teamName: '',
-        status: [],
-        payType: '',
-       * 
-       */
       getTeamList({
         rows: this.rules.limit,
         page: this.rules.page,
@@ -230,7 +223,6 @@ export default {
         chargeTypeId: this.topForm.payType || null,
         musicGroupName: this.topForm.teamName || null,
         musicGroupStatus: this.topForm.status || null,
-
       }).then(res => {
         if (res.code == 200) {
           this.tableData = res.data.rows

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

@@ -37,7 +37,8 @@
         </el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-button @click="getList">搜索</el-button>
+        <el-button @click="getList"
+                   type="danger">搜索</el-button>
       </el-form-item>
     </el-form>
     <div class="tableWrap">
@@ -125,7 +126,10 @@ export default {
   },
   methods: {
     getList () {
-      getVipGroupSalarys({ vipGroupId: this.id, organId: this.$store.getters.organ, pahe: this.rules.page, rows: this.rules.limit, startTime: this.searchForm.time[0] || null, endTime: this.searchForm.time[1] || null }).then(res => {
+      if (!this.searchForm.time) {
+        this.searchForm.time = [];
+      }
+      getVipGroupSalarys({ vipGroupId: this.id, organId: this.$store.getters.organ, page: this.rules.page, rows: this.rules.limit, startTime: this.searchForm.time[0] || null, endTime: this.searchForm.time[1] || null }).then(res => {
         if (res.code == 200) {
           this.tableList = res.data.pageInfo.rows;
           this.totalFeeDeduction = res.data.baseInfo.totalFeeDeduction;

vue.config.js

@@ -17,10 +17,10 @@ const name = defaultSettings.title || 'vue Admin Template' // page title
 // http://47.99.212.176:8000
 // 
 // let target = 'http://192.168.3.27:8000' // 箭河
-let target = 'http://192.168.3.28:8000' //邹璇
+// let target = 'http://192.168.3.28:8000' //邹璇
 // let target = 'http://192.168.3.8:8000' //勇哥
 // let target = 'http://47.99.212.176:8000' // 测试服
-// let target = 'http://192.168.3.48:8000' // 乔
+let target = 'http://192.168.3.48:8000' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
   /**