Merge branch 'online' into resetSound

dist/static/css/chunk-d1e61f0e.864d2ebe.css → dist/static/css/chunk-14a1bcee.e0900f1a.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-0fc38b97]{font-size:14px}.btnList[data-v-0fc38b97]{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-0fc38b97]{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-22fdc99a]{font-size:14px}.btnList[data-v-22fdc99a]{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-22fdc99a]{margin-right:15px}

dist/static/css/chunk-1b824bd6.54438884.css → dist/static/css/chunk-e4409656.8393fd15.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}.bannerImg[data-v-17ff06d4],.bannerImg[data-v-70b9e0c8],.bannerImg[data-v-330ba331],.bannerImg[data-v-09398817]{height:60px}
+.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}.bannerImg[data-v-1339b45c],.bannerImg[data-v-a3aa8ac0],.bannerImg[data-v-ac080a66],.bannerImg[data-v-ae44f08a]{height:60px}

src/layout/components/TagsView.vue

@@ -155,9 +155,9 @@ export default {
         margin-left: 15px;
       }
       &.active {
-        background-color: #66b1ff;
+        background-color: #13817a;
         color: #fff;
-        border-color: #66b1ff;
+        border-color: #13817a;
         &::before {
           content: "";
           background: #fff;

src/utils/searchArray.js

@@ -72,6 +72,18 @@ const musicGroupStatus = [
   { value: 'AUDIT_FAILED', text: '审核失败' },
   { value: 'CANCELED', text: '取消' },
 ]
+
+const vipGroupStatus = [
+  { value: '0', text: '未开始' },
+  { value: '1', text: '报名中' },
+  { value: '5', text: '报名结束' },
+  { value: '2', text: '进行中' },
+  { value: '4', text: '已结束' },
+  { value: '3', text: '取消' },
+  { value: '6', text: '暂停' },
+]
+
+
 export {
   courseType,
   attendance,
@@ -80,5 +92,6 @@ export {
   attendanceStatus,
   orderStatus,
   dealStatus,
-  musicGroupStatus
+  musicGroupStatus,
+  vipGroupStatus
 }

src/views/main/index.vue

@@ -13,7 +13,9 @@
           <div class="infos">
             <div class="info">
               <p class="sub">全部</p>
-              <p class='msg' v-if="dataInfo.musicDatas"> {{ dataInfo.musicDatas.total }} </p>
+              <p class='msg' v-if="dataInfo.musicDatas"> 
+                {{ dataInfo.musicDatas.progress_num_ + dataInfo.musicDatas.prepare_num_ + dataInfo.musicDatas.pause_num_ }} 
+              </p>
               <p class="msg" v-else>--</p>
             </div>
             <div class="info">
@@ -38,12 +40,12 @@
           <div class="infos">
             <div class="info">
               <p class="sub">收入笔数</p>
-              <p class='msg' v-if="dataInfo.incomeExpendMap">{{ dataInfo.incomeExpendMap.income_num_ }}</p>
+              <p class='msg' v-if="dataInfo.incomeMap">{{ dataInfo.incomeMap.total }}</p>
               <p class="msg" v-else>--</p>
             </div>
             <div class="info">
               <p class="sub">收入金额</p>
-              <p class='msg' v-if="dataInfo.incomeExpendMap">{{ dataInfo.incomeExpendMap.income_total_ }}</p>
+              <p class='msg' v-if="dataInfo.incomeMap">{{ dataInfo.incomeMap.total_num_ }}</p>
               <p class="msg" v-else>--</p>
             </div>
           </div>
@@ -69,8 +71,7 @@
           </div>
         </div>
 
-        <div class="item"
-             >
+        <div class="item">
           <h4>
             <p>分部老师数</p>
             <img src=""
@@ -79,24 +80,23 @@
           <div class="infos">
             <div class="info">
               <p class="sub">总计</p>
-              <p class='msg' v-if="dataInfo.teacherDatas">{{ dataInfo.teacherDatas.total }}</p>
+              <p class='msg' v-if="dataInfo.teacherDatas">{{ dataInfo.teacherDatas.total >= 0 ? dataInfo.teacherDatas.total : '--' }}</p>
               <p class="msg" v-else>--</p>
             </div>
             <div class="info">
               <p class="sub">全职人数</p>
-              <p class='msg' v-if="dataInfo.teacherDatas">{{ dataInfo.teacherDatas.full_time_num_ }}</p>
+              <p class='msg' v-if="dataInfo.teacherDatas">{{ dataInfo.teacherDatas.full_time_num_ >= 0 ? dataInfo.teacherDatas.full_time_num_ : '--' }}</p>
               <p class="msg" v-else>--</p>
             </div>
             <div class="info">
               <p class="sub">兼职人数</p>
-              <p class='msg' v-if="dataInfo.teacherDatas">{{ dataInfo.teacherDatas.part_time_num_ }}</p>
+              <p class='msg' v-if="dataInfo.teacherDatas">{{ dataInfo.teacherDatas.part_time_num_ >= 0 ? dataInfo.teacherDatas.part_time_num_ : '--' }}</p>
               <p class="msg" v-else>--</p>
             </div>
           </div>
         </div>
 
-        <div class="item"
-             >
+        <div class="item">
           <h4>
             <p>VIP课数</p>
             <img src=""
@@ -105,7 +105,9 @@
           <div class="infos">
             <div class="info">
               <p class="sub">总计</p>
-              <p class='msg' v-if="dataInfo.vipDatas">{{ dataInfo.vipDatas.total }}</p>
+              <p class='msg' v-if="dataInfo.vipDatas">
+                {{ dataInfo.vipDatas.applying_num_ + dataInfo.vipDatas.finished_num_ }}
+              </p>
               <p class="msg" v-else>--</p>
             </div>
             <div class="info">

src/views/teacherManager/teacherDetail/components/courseInfo.vue

@@ -1,5 +1,22 @@
 <template>
   <div class='courseInfo'>
+    <el-form :model="searchList"
+             :inline='true'>
+      <el-form-item label="课程状态">
+        <el-select v-model="searchList.status"
+                   clearable>
+          <el-option v-for="(item,index) in musicGroupStatus"
+                     :key="item.value"
+                     :label="item.text"
+                     :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="danger"
+                   @click='search'>搜索</el-button>
+      </el-form-item>
+    </el-form>
     <div class="tableWrap">
       <el-table :data='tableList'
                 :header-cell-style="{background:'#EDEEF0',color:'#444'}">
@@ -44,6 +61,7 @@
 </template>
 <script>
 import { getTeacherMusicClass } from '@/api/teacherManager'
+import { musicGroupStatus } from '@/utils/searchArray'
 import pagination from '@/components/Pagination/index'
 import store from '@/store'
 export default {
@@ -56,6 +74,10 @@ export default {
       tableList: [],
       teacherId: this.$route.query.teacherId,
       organId: null,
+      searchList: {
+        status: ''
+      },
+      musicGroupStatus,
       pageInfo: {
         // 分页规则
         limit: 10, // 限制显示条数
@@ -65,15 +87,25 @@ export default {
       }
     }
   },
+  activated () {
+    this.getList()
+    this.musicGroupStatus = musicGroupStatus
+  },
   mounted () {
     this.getList()
+    this.musicGroupStatus = musicGroupStatus
   },
   methods: {
+    search () {
+      this.pageInfo.page = 1;
+      this.getList();
+    },
     getList () {
       getTeacherMusicClass({
         rows: this.pageInfo.limit,
         page: this.pageInfo.page,
-        search: this.teacherId
+        search: this.teacherId,
+        status: this.searchList.status || null
       }).then(res => {
         if (res.code == 200) {
           this.tableList = res.data.rows

src/views/teacherManager/teacherDetail/components/courseInfo1.vue

@@ -1,5 +1,26 @@
 <template>
   <div class='courseInfo'>
+    <el-form :inline="true"
+             :model="searchList">
+      <el-form-item>
+        <el-input placeholder="vip编号或vip名称"
+                  @keyup.enter.native='search'
+                  v-model="searchList.search"></el-input>
+      </el-form-item>
+      <el-form-item label="课程状态">
+        <el-select v-model="searchList.status"
+                   clearable>
+          <el-option v-for="(item,index) in vipGroupStatus"
+                     :key="index"
+                     :value='item.value'
+                     :label='item.text'></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="danger"
+                   @click="search">搜索</el-button>
+      </el-form-item>
+    </el-form>
     <div class="tableWrap tableMargin">
       <el-table :data='teamList'
                 :header-cell-style="{background:'#EDEEF0',color:'#444'}">
@@ -64,6 +85,7 @@
 // import { getTeacherVipClass } from '@/api/teacherManager'
 import { getVipList } from '@/api/vipSeting'
 import pagination from '@/components/Pagination/index'
+import { vipGroupStatus } from '@/utils/searchArray'
 import store from '@/store'
 export default {
   name: 'courseInfo1',
@@ -72,8 +94,13 @@ export default {
   },
   data () {
     return {
+      searchList: {
+        status: '',
+        search: ''
+      },
       teamList: [],
       organId: null,
+      vipGroupStatus: null,
       teacherId: this.$route.query.teacherId,
       pageInfo: {
         // 分页规则
@@ -84,7 +111,12 @@ export default {
       }
     }
   },
+  activated () {
+    this.vipGroupStatus = vipGroupStatus;
+    this.getList()
+  },
   mounted () {
+    this.vipGroupStatus = vipGroupStatus;
     this.getList()
   },
   methods: {
@@ -92,13 +124,19 @@ export default {
       getVipList({
         rows: this.pageInfo.limit,
         page: this.pageInfo.page,
-        teacherId: this.teacherId
+        teacherId: this.teacherId,
+        status: this.searchList.status || null,
+        search: this.searchList.search || null
       }).then(res => {
         if (res.code == 200) {
           this.teamList = res.data.rows
           this.pageInfo.total = res.data.total
         }
       })
+    },
+    search () {
+      this.pageInfo.page = 1;
+      this.getList();
     }
   },
   filters: {

src/views/teacherManager/teacherDetail/components/courseInfo2.vue

@@ -51,6 +51,9 @@ export default {
   mounted () {
     this.getList()
   },
+  activated () {
+    this.getList()
+  },
   methods: {
     getList () {
       findTeacherDemoGroups({

src/views/teacherManager/teacherDetail/components/leaveRecord.vue

@@ -94,6 +94,9 @@ export default {
   mounted () {
     this.getList()
   },
+  activated () {
+    this.getList()
+  },
   methods: {
     search () {
       this.pageInfo.page = 1

src/views/teacherManager/teacherDetail/components/settlement.vue

@@ -223,6 +223,14 @@ export default {
       }
     }
   },
+  activated () {
+    this.getList()
+    sumTeacherNoPay({ teacherId: this.teacherId }).then(res => {
+      if (res.code == 200) {
+        this.teacherNoPay = res.data
+      }
+    })
+  },
   mounted () {
     this.getList()
     sumTeacherNoPay({ teacherId: this.teacherId }).then(res => {

src/views/teacherManager/teacherDetail/components/teacherInfo.vue

@@ -173,6 +173,10 @@ export default {
       topForm: {}
     }
   },
+  activated () {
+    // this.teacherGet()
+    // console.log(this.$route.query.teacherId);
+  },
   mounted () {
     this.teacherGet()
   },

src/views/teacherManager/teacherDetail/components/teacherRecord.vue

@@ -133,6 +133,9 @@ export default {
   mounted () {
     this.getList()
   },
+  activated () {
+    this.getList()
+  },
   methods: {
     search () {
       this.pageInfo.page = 1;

src/views/teacherManager/teacherDetail/index.vue

@@ -80,6 +80,16 @@ export default {
       Frules: null
     }
   },
+  activated () {
+    this.teacherName = this.$route.query.teacherName
+    if (this.$route.query.search) {
+      this.Fsearch = this.$route.query.search;
+    }
+    if (this.$route.query.rules) {
+      this.Frules = this.$route.query.rules
+    }
+  },
+
   created () {
     if (this.$route.query.search) {
       this.Fsearch = this.$route.query.search;

src/views/teacherManager/teacherList.vue

@@ -49,7 +49,7 @@
                      clearable
                      placeholder="请选择分部">
             <el-option v-for="item in branchList"
-                       :key="item.value"
+                       :key="item.id"
                        :label="item.label"
                        :value="item.value"></el-option>
           </el-select>
@@ -100,7 +100,6 @@
                            label="所属分部">
           </el-table-column>
           <el-table-column align='center'
-                           prop="subjectId"
                            label="老师状态">
             <template slot-scope="scope">
               {{ scope.row.lockFlag | teacherStatus }}
@@ -205,14 +204,9 @@ export default {
   },
   activated () {
     this.__init();
+    this.getList();
   },
   mounted () {
-    if (this.$route.query.search) {
-      this.$route.query.search instanceof Object ? this.searchForm = this.$route.query.search : this.searchForm = JSON.parse(this.$route.query.search);
-    }
-    if (this.$route.query.rules) {
-      this.$route.query.rules instanceof Object ? this.pageInfo = this.$route.query.rules : this.pageInfo = JSON.parse(this.$route.query.rules);
-    }
     this.__init()
     this.getList()
   },
@@ -222,6 +216,12 @@ export default {
       this.getList();
     },
     __init () {
+      if (this.$route.query.search) {
+        this.$route.query.search instanceof Object ? this.searchForm = this.$route.query.search : this.searchForm = JSON.parse(this.$route.query.search);
+      }
+      if (this.$route.query.rules) {
+        this.$route.query.rules instanceof Object ? this.pageInfo = this.$route.query.rules : this.pageInfo = JSON.parse(this.$route.query.rules);
+      }
       getEmployeeOrgan().then(res => {
         if (res.code == 200) {
           res.data.forEach(item => {
@@ -257,6 +257,7 @@ export default {
           this.subjectList = tempArray
         }
       })
+      // this.getList();
     },
     onTeacher (type, row) {
       let search = JSON.stringify(this.searchForm)
@@ -285,6 +286,7 @@ export default {
       params.page = this.pageInfo.page
       teacherQueryPage(params).then(res => {
         if (res.code == 200) {
+          // console.log(res)
           this.tableList = res.data.rows
           this.pageInfo.total = res.data.total
         }

src/views/teamBuild/components/teamSoundMoney.vue

@@ -420,6 +420,7 @@ export default {
   },
   created () {
     // 判断是否带缓存参数
+    this.init()
 
   },
   activated () {

src/views/teamDetail/teamCourseList.vue

@@ -6,16 +6,17 @@
     <div class="m-core">
       <!-- 搜索类型 -->
       <el-form :inline="true"
-              class="searchForm"
-              v-model="searchForm">
+               class="searchForm"
+               v-model="searchForm">
         <el-form-item>
-          <el-input v-model="searchForm.search" placeholder="乐团名或VIP课名" />
+          <el-input v-model="searchForm.search"
+                    placeholder="乐团名或VIP课名" />
         </el-form-item>
         <el-form-item>
           <el-select v-model="searchForm.teacherIdList"
-                    clearable
-                    filterable
-                    placeholder="请选择老师">
+                     clearable
+                     filterable
+                     placeholder="请选择老师">
             <el-option v-for="(item, index) in teacherList"
                        :key="index"
                        :value="item.id"
@@ -36,23 +37,26 @@
         </el-form-item>
         <el-form-item>
           <el-select v-model="searchForm.courseType"
-                    clearable
-                    filterable
-                    placeholder="课程类型">
-            <el-option v-for="(item, index) in courseType" :key="index" :value="item.value" :label="item.label"></el-option>
+                     clearable
+                     filterable
+                     placeholder="课程类型">
+            <el-option v-for="(item, index) in courseType"
+                       :key="index"
+                       :value="item.value"
+                       :label="item.label"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
           <el-select v-model="searchForm.courseStatus"
-                    clearable
-                    filterable
-                    placeholder="课程状态">
+                     clearable
+                     filterable
+                     placeholder="课程状态">
             <el-option label="未开始"
-                      value="NOT_START"></el-option>
+                       value="NOT_START"></el-option>
             <el-option label="进行中"
-                      value="UNDERWAY"></el-option>
+                       value="UNDERWAY"></el-option>
             <el-option label="已结束"
-                      value="OVER"></el-option>
+                       value="OVER"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
@@ -67,7 +71,7 @@
         </el-form-item>
         <el-form-item>
           <div class='searchBtn'
-              @click="search">搜索</div>
+               @click="search">搜索</div>
         </el-form-item>
       </el-form>
       <div class="btnWraps">
@@ -76,27 +80,27 @@
       <div class="tableWrap">
         <el-table :data='tableList'
                   :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-          <!-- <el-table-column align='center'
-                          prop="organName"
-                         label="所属分部">
-          </el-table-column> -->
           <el-table-column align='center'
-                          width="200px"
-                         label="时间">
+                           prop="id"
+                           label="课程编号">
+          </el-table-column>
+          <el-table-column align='center'
+                           width="200px"
+                           label="时间">
             <template slot-scope="scope">
               {{ scope.row.startClassTime ? scope.row.startClassTime.substr(0, 16) : '' }}-{{ scope.row.endClassTime ? scope.row.endClassTime.substr(11,5) : ''}}
             </template>
           </el-table-column>
           <el-table-column align='center'
-                          prop="classGroupName"
-                          label="班级名称">
+                           prop="classGroupName"
+                           label="班级名称">
           </el-table-column>
           <el-table-column align='center'
-                          prop="name"
-                          label="课程名称">
+                           prop="name"
+                           label="课程名称">
           </el-table-column>
           <el-table-column align='center'
-                          label="课程类型">
+                           label="课程类型">
             <template slot-scope="scope">
               <div>
                 {{ scope.row.type | coursesType}}
@@ -104,7 +108,7 @@
             </template>
           </el-table-column>
           <el-table-column align='center'
-                          label="教学模式">
+                           label="教学模式">
             <template slot-scope="scope">
               <div>
                 {{ scope.row.teachMode | teachMode}}
@@ -112,12 +116,12 @@
             </template>
           </el-table-column>
           <el-table-column align='center'
-                          prop="schoolName"
-                          label="教学点">
+                           prop="schoolName"
+                           label="教学点">
           </el-table-column>
           <el-table-column align='center'
-                          prop="courseScheduleStatus"
-                          label="课程状态">
+                           prop="courseScheduleStatus"
+                           label="课程状态">
             <template slot-scope="scope">
               <div>
                 {{ scope.row.status | coursesStatus }}
@@ -125,7 +129,7 @@
             </template>
           </el-table-column>
           <el-table-column align='center'
-                          label="是否签到">
+                           label="是否签到">
             <template slot-scope="scope">
               <div>
                 {{ scope.row.isSignIn | attendanceType}}
@@ -133,7 +137,7 @@
             </template>
           </el-table-column>
           <el-table-column align='center'
-                          label="是否签退">
+                           label="是否签退">
             <template slot-scope="scope">
               <div>
                 {{ scope.row.isSignOut | attendanceOutType}}
@@ -141,17 +145,17 @@
             </template>
           </el-table-column>
           <el-table-column align='center'
-                          prop="isCallNames"
-                          label="是否点名">
+                           prop="isCallNames"
+                           label="是否点名">
             <template slot-scope="scope">
               {{ scope.row.isCallNames ? '是' : '否' }}
             </template>
           </el-table-column>
           <el-table-column align='center'
-                          prop="teacherName"
-                          label="指导老师">
+                           prop="teacherName"
+                           label="指导老师">
           </el-table-column>
-          
+
           <!-- <el-table-column align='center'
                           prop="subTeacherName"
                           label="助教老师">
@@ -164,7 +168,7 @@
                     @pagination="getList" />
       </div>
     </div>
-    
+
   </div>
 </template>
 <script>
@@ -181,8 +185,8 @@ export default {
       courseType: courseType,
       searchForm: {
         organIdList: null,
-        courseStatus: null, 
-        courseType: null, 
+        courseStatus: null,
+        courseType: null,
         timer: [nowTime, nowTime], // 时间
         class: null,
         search: null, // 乐团名称 编号 vip课名称
@@ -206,27 +210,11 @@ export default {
   components: {
     pagination
   },
+  activated () {
+    this.init();
+  },
   mounted () {
-    this.getList();
-    // 获取所有老师
-    getTeacher().then(res => {
-      if (res.code == 200) {
-        this.teacherList = res.data;
-      }
-    })
-
-    // 获取班级列表
-    // getMusicGroupAllClass().then(res => {
-    //   if (res.code == 200) {
-    //     this.classList = res.data;
-    //   }
-    // })
-
-    getEmployeeOrgan().then(res => {
-      if (res.code == 200) {
-        this.organList = res.data;
-      }
-    })
+    this.init();
   },
   methods: {
     /**
@@ -235,6 +223,28 @@ export default {
         timer:[] // 时间
      * 
      */
+    init () {
+      this.getList();
+      // 获取所有老师
+      getTeacher().then(res => {
+        if (res.code == 200) {
+          this.teacherList = res.data;
+        }
+      })
+
+      // 获取班级列表
+      // getMusicGroupAllClass().then(res => {
+      //   if (res.code == 200) {
+      //     this.classList = res.data;
+      //   }
+      // })
+
+      getEmployeeOrgan().then(res => {
+        if (res.code == 200) {
+          this.organList = res.data;
+        }
+      })
+    },
     search () {
       this.rules.page = 1;
       this.getList();