1112 21:30

111

dist/static/css/chunk-670d72f8.64d2428a.css → dist/static/css/chunk-08dbbc59.45a46165.css

@@ -1 +1 @@
-.setBtn[data-v-ed788c88]{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-9994dfb6]{-webkit-box-sizing:border-box;box-sizing:border-box;padding:30px 42px;background-color:#fff;min-height:80vh}.imc .addBtn[data-v-9994dfb6]{line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;width:120px;height:40px;background-color:#4eada7}
+.setBtn[data-v-ed788c88]{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-60dbf060]{-webkit-box-sizing:border-box;box-sizing:border-box;padding:30px 42px;background-color:#fff;min-height:80vh}.imc .addBtn[data-v-60dbf060]{line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;width:120px;height:40px;background-color:#4eada7}

src/api/buildTeam.js

@@ -320,7 +320,7 @@ export function getTeamDetail (data) {
   })
 }
 
-// 新增提高班
+// 新增基础技能班
 export function addHighClass (data) {
   return request({
     url: api + `/classGroup/addHighClass`,
@@ -500,7 +500,7 @@ export function getTeamDetailList (data) {
   })
 }
 
-// 提高班详情   data: qs.stringify(data),
+// 基础技能班详情   data: qs.stringify(data),
 export function highClassGroups (data) {
   return request({
     url: api + `/classGroup/highClassGroups`,
@@ -509,7 +509,7 @@ export function highClassGroups (data) {
   })
 }
 
-// 提高班调整
+// 基础技能班调整
 export function resetHighClass (data) {
   return request({
     url: api + `/classGroupStudent/adjustClassGroup`,

src/permission.js

@@ -28,6 +28,10 @@ router.beforeEach(async (to, from, next) => {
       const hasGetUserInfo = store.getters.name
       // 有名字 说明有用户信息 跳走
       if (hasGetUserInfo) {
+        // const accessRoutes = await store.dispatch('permission/generateRoutes')
+
+        // 动态添加可访问的路由
+        // router.addRoutes(accessRoutes)
         next()
       } else {
         try {
@@ -35,6 +39,7 @@ router.beforeEach(async (to, from, next) => {
           await store.dispatch('user/getInfo')
           // 请求接口 生成可访问路由
           const accessRoutes = await store.dispatch('permission/generateRoutes')
+
           // 动态添加可访问的路由
           router.addRoutes(accessRoutes)
           // 确保addroutes完整的hack方法

src/store/modules/user.js

@@ -82,6 +82,7 @@ const actions = {
         commit('SET_TOKEN', '')
         removeToken()
         resetRouter()
+        commit('SET_NAME', '')
         resolve()
       }).catch(error => {
         reject(error)

src/utils/vueFilter.js

@@ -73,9 +73,10 @@ Vue.filter('instrumentType', (value) => {
 // 课程类型
 Vue.filter('coursesType', (value) => {
   let template = {
+    NORMAL: '单技课',
     SINGLE: '单技课',
     MIX: "合奏课",
-    HIGH: "基础技能班",
+    HIGH: "基础技能课",
     VIP: "VIP课",
     DEMO: "试听课",
     COMPREHENSIVE: '综合课',

src/views/businessManager/orderManager/income.vue

@@ -47,7 +47,7 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getList"
+          <el-button @click="search"
                      type="danger">搜索</el-button>
           <el-button @click="onReSet"
                      type="primary">重置</el-button>
@@ -154,6 +154,10 @@ export default {
     this.getList()
   },
   methods: {
+    search () {
+      this.pageInfo.page = 1;
+      this.getList();
+    },
     getList () {
       let params = this.searchForm
       params.rows = this.pageInfo.limit
@@ -163,6 +167,7 @@ export default {
         if (res.code == 200) {
           this.tableList = result.rows
           this.pageInfo.total = result.total
+
         }
       })
     },

src/views/categroyManager/vipActiveList.vue

@@ -22,7 +22,7 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getList"
+          <el-button @click="search"
                      type="danger">搜索</el-button>
         </el-form-item>
       </el-form>
@@ -423,6 +423,10 @@ export default {
     }
   },
   methods: {
+    search () {
+      this.rules.page = 1;
+      this.getList();
+    },
     getList () {
       vipGroupActivity({
         organId: 1,

src/views/categroyManager/vipChargeSeting.vue

@@ -19,7 +19,7 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getList"
+          <el-button @click="search"
                      type="danger">搜索</el-button>
         </el-form-item>
       </el-form>
@@ -87,6 +87,9 @@ export default {
 
   },
   methods: {
+    search () {
+      this.getList();
+    },
     getList () {
       vipGroupCategory({ organId: this.searchForm.organId }).then(res => {
         if (res.code == 200) {

src/views/studentManager/components/studentOrder.vue

@@ -22,32 +22,41 @@
              v-model="searchForm">
       <el-form-item>
         <el-date-picker style="width: 400px;"
-          v-model="orderDate"
-          type="daterange"
-          value-format="yyyy-MM-dd"
-          @change="searchCourseDate"
-          range-separator="至"
-          start-placeholder="订单开始日期"
-          end-placeholder="订单结束日期">
+                        v-model="orderDate"
+                        type="daterange"
+                        value-format="yyyy-MM-dd"
+                        @change="searchCourseDate"
+                        range-separator="至"
+                        start-placeholder="订单开始日期"
+                        end-placeholder="订单结束日期">
         </el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-select v-model="searchForm.paymentType" placeholder="交易类型">
-          <el-option v-for="(item, index) in orderStatus" :key="index" 
-            :label="item.label" :value="item.value"></el-option>
+        <el-select v-model="searchForm.paymentType"
+                   placeholder="交易类型">
+          <el-option v-for="(item, index) in orderStatus"
+                     :key="index"
+                     :label="item.label"
+                     :value="item.value"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-input type="text" v-model="searchForm.remark" placeholder="订单说明"></el-input>
+        <el-input type="text"
+                  v-model="searchForm.remark"
+                  placeholder="订单说明"></el-input>
       </el-form-item>
       <el-form-item>
-        <el-button @click="getList" type="danger">搜索</el-button>
-        <el-button @click="onReSet" type="primary">重置</el-button>
+        <el-button @click="search"
+                   type="danger">搜索</el-button>
+        <el-button @click="onReSet"
+                   type="primary">重置</el-button>
       </el-form-item>
     </el-form>
     <div class="tableWrap">
-      <el-table :data="tableList" :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-        <el-table-column label="订单日期" prop="createTime"
+      <el-table :data="tableList"
+                :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+        <el-table-column label="订单日期"
+                         prop="createTime"
                          width="180px">
         </el-table-column>
         <el-table-column label="交易类型"
@@ -56,16 +65,19 @@
             {{ scope.row.type | orderType }}
           </template>
         </el-table-column>
-        <el-table-column  width="180px" label="实际金额" prop="actualAmount">
+        <el-table-column width="180px"
+                         label="实际金额"
+                         prop="actualAmount">
         </el-table-column>
-        <el-table-column label="订单说明" prop="memo" >
+        <el-table-column label="订单说明"
+                         prop="memo">
         </el-table-column>
       </el-table>
       <pagination :total="pageInfo.total"
-                :page.sync="pageInfo.page"
-                :limit.sync="pageInfo.limit"
-                :page-sizes="pageInfo.page_size"
-                @pagination="getList" />
+                  :page.sync="pageInfo.page"
+                  :limit.sync="pageInfo.limit"
+                  :page-sizes="pageInfo.page_size"
+                  @pagination="getList" />
     </div>
   </div>
 </template>
@@ -99,14 +111,14 @@ export default {
       dataInfo: {}
     }
   },
-  mounted() {
+  mounted () {
     this.getList()
     this.__init()
   },
   methods: {
-    __init() {
+    __init () {
       getUserCashAccountBaseInfo({ userId: this.$route.query.userId }).then(res => {
-        if(res.code == 200) {
+        if (res.code == 200) {
           this.dataInfo = {
             balance: res.data.balance,
             wxBalance: 0,
@@ -116,22 +128,26 @@ export default {
         }
       })
     },
+    search () {
+      this.pageInfo.page = 1;
+      this.getList();
+    },
     getList () {
       let params = this.searchForm
       params.rows = this.pageInfo.limit
       params.page = this.pageInfo.page
-      if(params.remark == '' || !params.remark) {
+      if (params.remark == '' || !params.remark) {
         params.remark = null
       }
       studentPaymentOrderList(params).then(res => {
-        if(res.code == 200) {
+        if (res.code == 200) {
           this.tableList = res.data.rows
           this.pageInfo.total = res.data.total
         }
       })
     },
-    searchCourseDate(value) {
-      if(value) {
+    searchCourseDate (value) {
+      if (value) {
         this.searchForm.orderStartDate = value[0]
         this.searchForm.orderEndDate = value[1]
       } else {
@@ -139,7 +155,7 @@ export default {
         this.searchForm.orderEndDate = null
       }
     },
-    onReSet() { // 重置搜索
+    onReSet () { // 重置搜索
       this.orderDate = null
       this.searchForm = {
         studentId: this.$route.query.userId,

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

@@ -8,7 +8,7 @@
         <div class="addBtn"
              @click="addClass">添加班级</div>
       </el-form-item>
-      <el-form-item label="提高班参考数量">
+      <el-form-item label="基础技能班参考数量">
         <el-input disabled
                   v-model="topForm.improventClassesNum"></el-input>
       </el-form-item>

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

@@ -406,6 +406,12 @@ export default {
               this.activeStudents = [];
               this.$refs['className'].resetFields();
               this.getSingleClass();
+              getTeamRecruit({ musicGroupId: this.teamid }).then(res => {
+                // 获取乐团声部集合
+                if (res.code == 200) {
+                  this.leftList = res.data;
+                }
+              })
 
             }
           })
@@ -421,6 +427,12 @@ export default {
         if (res.code == 200) {
           this.$message.success('删除成功');
           this.getSingleClass();
+          getTeamRecruit({ musicGroupId: this.teamid }).then(res => {
+            // 获取乐团声部集合
+            if (res.code == 200) {
+              this.leftList = res.data;
+            }
+          })
         }
       })
     },

src/views/teamDetail/components/classList.vue

@@ -26,7 +26,7 @@
                          label="课程类型">
           <template slot-scope="scope">
             <div>
-              {{ scope.row.classGroupType | classType}}
+              {{ scope.row.classGroupType | coursesType}}
             </div>
           </template>
         </el-table-column>

src/views/teamDetail/components/courseList.vue

@@ -170,9 +170,9 @@
           <el-time-select placeholder="起始时间"
                           v-model="maskForm.startTime"
                           :picker-options="{
-                            start: '08:30',
+                            start: '06:30',
                             step: '00:15',
-                            end: '18:30'
+                            end: '23:30'
                             }">
           </el-time-select>
         </el-form-item>
@@ -181,9 +181,9 @@
           <el-time-select placeholder="结束时间"
                           v-model="maskForm.endTime"
                           :picker-options="{
-                            start: '08:30',
+                            start: '06:30',
                             step: '00:15',
-                            end: '18:30',
+                            end: '23:30',
                             minTime: maskForm.startTime
                           }">
           </el-time-select>
@@ -290,7 +290,8 @@ export default {
         id: ''
        * 
        */
-      this.maskForm.teacher = row.masterTeacherId;
+      console.log(row);
+      this.maskForm.teacher = parseInt(row.masterTeacherId);
       this.maskForm.assistant = row.teachingTeachers.map(item => {
         return item.userId
       }) || []

src/views/teamDetail/components/studentList.vue

@@ -52,12 +52,12 @@
         <el-select v-model="searchForm.isPay"
                    clearable
                    placeholder="是否缴费">
-          <el-option label="完成缴费"
-                     value="PAID_COMPLETED"></el-option>
-          <el-option label="未缴费"
-                     value="NON_PAYMENT"></el-option>
-          <el-option label="缴费中"
-                     value="PROCESSING"></el-option>
+          <el-option label="未开启缴费"
+                     value="0"></el-option>
+          <el-option label="开启缴费"
+                     value="1"></el-option>
+          <el-option label="已缴费"
+                     value="2"></el-option>
         </el-select>
       </el-form-item>
       <!-- <el-form-item>
@@ -138,7 +138,7 @@
                          label="是否缴费">
           <template slot-scope="scope">
             <div>
-              {{ scope.row.paymentStatus | studentPay}}
+              {{ scope.row.paymentStatus | studentPays}}
             </div>
           </template>
         </el-table-column>
@@ -385,6 +385,13 @@ export default {
   },
   created () {
   },
+  filters: {
+    studentPays (val) {
+      val = parseInt(val);
+      let arr = ['未开启缴费', '开启缴费', '已缴费']
+      return arr[val]
+    }
+  },
   mounted () {
 
     // 获取汇总数据