Merge branch '03/12permission' of http://git.dayaedu.com/molingzhide/dy-admin-manager into 03/12permission

src/constant/index.js

@@ -264,3 +264,10 @@ export const downListType = {
   1:'订单列表',
   2:'财务管理'
 }
+
+export const withdrawalStatus = {
+  APPROVED: '同意',
+  DENIED: '拒绝',
+  PROCESSING: '处理中',
+  CANCELED: '取消'
+}

src/main.js

@@ -90,6 +90,7 @@ document.addEventListener('mousewheel', function () {
   }
 })
 document.addEventListener('keydown', function (event) {
+  // console.log(document.activeElement,event.keyCode)
   if(event.keyCode == 13){
     setTimeout(res=>{
       document.activeElement.blur()
@@ -97,7 +98,6 @@ document.addEventListener('keydown', function (event) {
 
   }
 })
-
 /**
  * If you don't want to use mock-server
  * you want to use MockJs for mock api

src/utils/vueFilter.js

@@ -741,3 +741,8 @@ Vue.filter('ProbationPeriod', value => {
 Vue.filter('downListType', value => {
   return constant.downListType[value]
 })
+
+// 退团状态
+Vue.filter('withdrawalStatus', value => {
+  return constant.withdrawalStatus[value]
+})

src/views/arrearage-students/index.vue

@@ -74,6 +74,7 @@
         <el-form-item>
           <el-button native-type="submit" type="danger">搜索</el-button>
           <el-button native-type="reset" type="primary">重置</el-button>
+          <el-button @click="onExport" type="primary" v-permission="'export/arrearageStudents'">导出</el-button>
         </el-form-item>
       </save-form>
       <el-table
@@ -182,6 +183,8 @@ import list from './modals/list'
 import { permission } from '@/utils/directivePage'
 import { getCooperation } from '@/api/buildTeam'
 import { queryArrearageStudents, getNoPaymentStudentMusicGroups } from './api'
+import { Export } from '@/utils/downLoadFile'
+import qs from 'qs'
 const initSearch = {
   search: '',
   eduTeacherId: null,
@@ -262,6 +265,15 @@ export default {
       this.detail = row
       this.visible = true
     },
+    onExport() {
+      const { organIds, ...rest} = this.searchForm
+      Export(this, {
+        url: '/api-web/export/arrearageStudents',
+        fileName: '欠费学员.xlsx',
+        method: 'post',
+        params: qs.stringify({ organIds: organIds.join(','), ...rest })
+      }, '您确定导出欠费学员列表?')
+    }
   }
 }
 </script>

src/views/serverDetail/index.vue

@@ -102,6 +102,7 @@
         <el-form-item>
           <el-button native-type="submit" type="primary">搜索</el-button>
           <el-button native-type="reset" type="danger">重置</el-button>
+          <el-button @click="onExport" type="primary" v-permission="'export/teacherServeInfo'">导出</el-button>
         </el-form-item>
       </save-form>
       <div class="btnWraps" style="margin-bottom: 20px">
@@ -241,6 +242,8 @@ import { getTeacherServeInfo, teacherServeRemindPush } from "./api";
 import { getTimes } from "@/utils";
 import { getNowDateAndSunday, getNowDateAndMonday } from "@/utils/date";
 import { jobNature } from "@/utils/searchArray";
+import { Export } from '@/utils/downLoadFile'
+import qs from 'qs'
 export default {
   components: { pagination, serverMask },
   data() {
@@ -393,6 +396,15 @@ export default {
             return time.getTime() >= Date.now();
         },
       };
+    },
+    onExport() {
+      const {orderDate, ...rest} = this.searchForm;
+      Export(this, {
+        url: '/api-web/export/teacherServeInfo',
+        fileName: '退团申请.xlsx',
+        method: 'post',
+        params: qs.stringify({ ...rest, ...getTimes(this.orderDate, ["monday", "sunday"]) })
+      }, '您确定导出退团申请列表?')
     }
   },
 };

src/views/teamDetail/teamClassList.vue

@@ -370,7 +370,7 @@ export default {
         {
             method: 'post',
           url: "/api-web/export/classGroup",
-           params:qs.stringify({...params, organIdList: this.searchForm.organIdList.join(",")})
+           params:qs.stringify({...params, organIdList: this.searchForm.organIdList.join(","), lessThenThreeHighOnline: this.$route.query.lessThenThreeHighOnline,})
         },
         "是否确认导出报表？"
       );

src/views/withdrawal-application/index.vue

@@ -19,8 +19,19 @@
           ></el-input>
         </el-form-item>
         <el-form-item>
+          <el-select v-model="searchForm.status" clearable placeholder="请选择状态">
+            <el-option
+              v-for="(item, key) in withdrawalStatus"
+              :key="key"
+              :label="item"
+              :value="key"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
           <el-button native-type="submit" type="danger">搜索</el-button>
           <el-button native-type="reset" type="primary">重置</el-button>
+          <el-button @click="onExport" type="primary" v-permission="'export/musicGroupQuit'">导出</el-button>
         </el-form-item>
       </save-form>
       <el-table
@@ -46,6 +57,11 @@
         >
           <copy-text slot-scope="scope">{{scope.row.musicGroup.name}}</copy-text>
         </el-table-column>
+        <el-table-column label="状态">
+          <template slot-scope="scope">
+            {{ scope.row.status | withdrawalStatus }}
+          </template>
+        </el-table-column>
         <el-table-column
           prop="createTime"
           label="申请时间"
@@ -125,14 +141,19 @@ import { permission } from '@/utils/directivePage'
 import quitModal from './modals/quit'
 import quitOnlyModal from './modals/quitOnly'
 import visit from './modals/visit'
+import { Export } from '@/utils/downLoadFile'
+import qs from 'qs'
 import { musicGroupQuitQeryPage } from './api'
+import { withdrawalStatus } from '@/constant'
 const initSearch = {
-  search: ''
+  search: '',
+  status: null
 }
 export default {
   components: { pagination, quitModal, quitOnlyModal, visit },
   data() {
     return {
+      withdrawalStatus,
       quitVisible: false,
       quitOnlyVisible: false,
       visitVisible: false,
@@ -186,6 +207,15 @@ export default {
         this.rules.total = res.data.total;
         this.list = res.data.rows
       } catch (error) {}
+    },
+    onExport() {
+      const { ...rest} = this.searchForm
+      Export(this, {
+        url: '/api-web/export/musicGroupQuit',
+        fileName: '退团申请.xlsx',
+        method: 'post',
+        params: qs.stringify({ visitFlag: this.$route.query.visitFlag, ...rest })
+      }, '您确定导出退团申请列表?')
     }
   }
 }