Merge branch '01/21VipReset'

src/components/QrCode/index.vue

@@ -4,6 +4,7 @@
         <el-dialog :title="title"
                :visible.sync="status"
                @close="onDialogClose"
+               append-to-body
                width="300px">
             <div class="left-code">
                 <vue-qr :text="codeUrl" style="width: 100%" :margin="0"></vue-qr>

src/views/arrearage-students/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="m-container">
     <h2>
-      <div class="squrt"></div>欠费学员列表 <filter-search @reload="FetchList" :keys="['visitFlag']"/>
+      <div class="squrt"></div>欠费学员列表 <filter-search @reload="FetchList" :keys="['visitFlag']" :moreKeys="['organId']"/>
     </h2>
     <div class="m-core">
       <save-form
@@ -15,14 +15,16 @@
           <el-input
             v-model.trim="searchForm.search"
             clearable
-            placeholder="学员(乐团)编号"
+            placeholder="学员编号、姓名"
           ></el-input>
         </el-form-item>
         <el-form-item>
           <el-select
-            v-model.trim="searchForm.organId"
+            v-model.trim="searchForm.organIds"
             clearable
             filterable
+            multiple
+            collapse-tags
             placeholder="请选择所属分部"
           >
             <el-option
@@ -35,13 +37,28 @@
         </el-form-item>
         <el-form-item>
           <el-select
-            v-model.trim="searchForm.schoolId"
+            v-model.trim="searchForm.musicGroupId"
             clearable
             filterable
-            placeholder="请选择教学点"
+            placeholder="请选择乐团"
           >
             <el-option
-              v-for="(item, index) in selects.schools"
+              v-for="(item, index) in musicList"
+              :key="index"
+              :value="item.id"
+              :label="item.name"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-select
+            v-model.trim="searchForm.cooperationOrganId"
+            clearable
+            filterable
+            placeholder="请选择合作单位"
+          >
+            <el-option
+              v-for="(item, index) in cooperations"
               :key="index"
               :value="item.id"
               :label="item.name"
@@ -134,8 +151,9 @@
           prop="ctrls"
           label="操作"
           fixed="right"
+          v-if="permission('musicGroupPaymentCalenderDetail/queryPage?page=ArrearageStudents')"
         >
-          <el-button type="text" @click="view">查看</el-button>
+          <el-button slot-scope="scope" type="text" @click="view(scope.row)">查看</el-button>
         </el-table-column>
       </el-table>
       <pagination
@@ -147,29 +165,46 @@
         @pagination="FetchList"
       />
     </div>
+    <el-dialog width="1000px" title="缴费记录" :visible.sync="visible">
+      <list-dialog
+        v-if="visible && detail"
+        @close="visible = false"
+        :musicGroupId="detail.musicGroupId"
+        :userId="detail.userId"
+      />
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import pagination from "@/components/Pagination/index";
+import list from './modals/list'
 import { permission } from '@/utils/directivePage'
-import { queryArrearageStudents } from './api'
+import { getCooperation } from '@/api/buildTeam'
+import { queryArrearageStudents, getNoPaymentStudentMusicGroups } from './api'
 const initSearch = {
   search: '',
   eduTeacherId: null,
-  organId: null,
+  organIds: [],
   branchs: null,
+  musicGroupId: null,
+  cooperationOrganId: null,
 }
 export default {
   components: {
     pagination,
+    'list-dialog': list
   },
   data() {
     return {
       list: [],
+      visible: false,
+      detail: null,
+      musicList: [],
       searchForm: {
-        search: null,
+        ...initSearch
       },
+      cooperations: [],
       rules: {
         // 分页规则
         limit: 10, // 限制显示条数
@@ -180,25 +215,39 @@ export default {
     }
   },
   mounted() {
+    const { query } = this.$route
+    if (query.organId) {
+      this.searchForm.organIds = [Number(query.organId)]
+    }
+    getCooperation({ rows: 1000 }).then((res) => {
+      this.cooperations = res.data.rows
+    })
     this.$store.dispatch('setBranchs')
     this.$store.dispatch('setSchools')
     this.FetchList()
+    this.FetchMusicList()
   },
   methods: {
     permission,
     async FetchList() {
       try {
+        const { organIds, ...rest} = this.searchForm
         const res = await queryArrearageStudents({
           page: this.rules.page,
           rows: this.rules.limit,
-          ...this.searchForm,
+          organIds: organIds.join(','),
+          ...rest,
         })
 
         this.rules.total = res.data.total;
         this.list = res.data.rows
-      } catch (error) {
-        console.log(error)
-      }
+      } catch (error) {}
+    },
+    async FetchMusicList() {
+      try {
+        const res = await getNoPaymentStudentMusicGroups()
+        this.musicList = res.data
+      } catch (error) {}
     },
     submit() {
       this.rules.page = 1
@@ -208,7 +257,10 @@ export default {
       this.searchForm = {...initSearch}
       this.submit();
     },
-    view() {},
+    view(row) {
+      this.detail = row
+      this.visible = true
+    },
   }
 }
 </script>

src/views/arrearage-students/modals/list.vue

@@ -0,0 +1,190 @@
+<template>
+  <div>
+    <el-button
+      type="primary"
+      :disabled="disabled"
+      @click="openPay"
+      v-permission="'musicGroupPaymentCalenderDetail/openPayment?page=ArrearageStudents'"
+    >开启缴费</el-button>
+    <el-button
+      type="primary"
+      :disabled="disabled"
+      @click="removeUser"
+      v-permission="'musicGroupPaymentCalenderDetail/batchDel?page=ArrearageStudents'"
+    >删除学员</el-button>
+    <el-table
+      :data="list"
+      style="width: 100%;margin-top: 20px;"
+      max-height="400px"
+      :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection"
+        :selectable="checkSelect"
+        width="55"
+      />
+      <el-table-column
+        prop="id"
+        label="缴费编号"
+      >
+        <copy-text slot-scope="scope">
+          {{ scope.row.id }}
+        </copy-text>
+      </el-table-column>
+      <el-table-column
+        prop="startPaymentDateMgpc"
+        label="缴费开始日期"
+      >
+        <div slot-scope="scope">
+          {{ scope.row.startPaymentDateMgpc | formatTimer }}
+        </div>
+      </el-table-column>
+      <el-table-column
+        prop="deadlinePaymentDateMgpc"
+        label="缴费截止日期"
+      >
+        <div slot-scope="scope">
+          {{ scope.row.deadlinePaymentDateMgpc | formatTimer }}
+        </div>
+      </el-table-column>
+      <el-table-column
+        prop="expectAmount"
+        label="预计缴费金额"
+      >
+        <div slot-scope="scope">
+          {{ scope.row.expectAmount | moneyFormat }}
+        </div>
+      </el-table-column>
+      <el-table-column
+        prop="open"
+        label="是否开启缴费"
+      >
+        <div slot-scope="scope">
+          {{ scope.row.open ? '是' : '否' }}
+        </div>
+      </el-table-column>
+      <el-table-column
+        prop="paymentStatus"
+        label="缴费状态"
+      >
+        <div slot-scope="scope">
+          {{ scope.row.paymentStatus | paymentStatusDetall }}
+        </div>
+      </el-table-column>
+      <el-table-column
+        prop="payTime"
+        label="支付时间"
+      >
+        <div slot-scope="scope">
+          {{ scope.row.payTime | dateForMinFormat }}
+        </div>
+      </el-table-column>
+      <el-table-column
+        prop="ctrls"
+        label="操作"
+      >
+        <template slot-scope="scope">
+          <el-button v-if="scope.row.paymentStatus == 'NON_PAYMENT'" type="text" @click="openCode(scope.row)">查看二维码</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination
+      sync
+      :total.sync="rules.total"
+      :page.sync="rules.page"
+      :limit.sync="rules.limit"
+      :page-sizes="rules.page_size"
+      @pagination="FetchList"
+    />
+    <qr-code v-model="codeStatus" :codeUrl="codeUrl" />
+
+    <div slot="footer" class="dialog-footer" style="text-align: right;">
+      <el-button @click="$emit('close')">关闭</el-button>
+    </div>
+  </div>
+</template>
+<script>
+import { vaildStudentUrl } from '@/utils/validate'
+import qrCode from '@/components/QrCode/index';
+import pagination from "@/components/Pagination/index";
+import {
+  getmusicGroupPaymentCalenderDetail,
+  openMusicGroupPaymentCalenderDetailPayment,
+  delMusicGroupPaymentCalenderStudent
+} from '@/api/buildTeam'
+export default {
+  props: ['userId', 'musicGroupId'],
+  components: { pagination, qrCode },
+  data() {
+    return {
+      list: [],
+      activeChiose: [],
+      codeStatus: false,
+      codeUrl: '',
+      rules: {
+        // 分页规则
+        limit: 10, // 限制显示条数
+        page: 1, // 当前页
+        total: 0, // 总条数
+        page_size: [10, 20, 40, 50], // 选择限制显示条数
+      },
+    }
+  },
+  computed: {
+    disabled() {
+      return !this.activeChiose.length
+    }
+  },
+  mounted() {
+    this.FetchList()
+  },
+  methods: {
+    handleSelectionChange (val) {
+      this.activeChiose = val
+    },
+    checkSelect (val) {
+      return val.paymentStatus == 'NON_PAYMENT'
+    },
+    openCode(row) {
+      this.codeStatus = true
+      this.codeUrl = vaildStudentUrl() + '/#/musicGroupRenew?calenderId=' + row.id + '&id=' + this.musicGroupId
+    },
+    async removeUser() {
+      try {
+        await this.$confirm('是否确认删除学员?', '提示', {
+          type: 'warning'
+        })
+        await delMusicGroupPaymentCalenderStudent({
+          musicGroupPaymentCalenderDetailIds: this.activeChiose.map(item => item.id).join(',')
+        })
+        this.$message.success('删除成功')
+        this.FetchList()
+      } catch (error) {}
+    },
+    async openPay() {
+      try {
+        await this.$confirm('是否确认开启缴费?', '提示', {
+          type: 'warning'
+        })
+        await openMusicGroupPaymentCalenderDetailPayment({
+          ids: this.activeChiose.map(item => item.id).join(',')
+        })
+        this.$message.success('开启成功')
+        this.FetchList()
+      } catch (error) {}
+    },
+    async FetchList() {
+      try {
+        const res = await getmusicGroupPaymentCalenderDetail({
+          musicGroupId: this.musicGroupId,
+          userId: this.userId,
+          page: this.rules.page,
+          rows: this.rules.limit,
+        })
+        this.rules.total = res.data.total;
+        this.list = res.data.rows
+      } catch (error) {}
+    }
+  }
+}
+</script>

src/views/main/constant.js

@@ -42,7 +42,8 @@ export const errorType = {
     always: true,
     query: {
       tabrouter: 'teamSchedule',
-      conclusionStatus: '1'
+      conclusionStatus: '1',
+      ...dates,
     },
   },
   HIGH_CLASS_STUDENT_LESS_THAN_THREE: {
@@ -57,8 +58,8 @@ export const errorType = {
   STUDENT_NOT_PAYMENT: {
     name: '学员未缴费',
     isError: true,
-    url: '/business/teamDetail',
-    resultKey: 'search',
+    url: '/business/ArrearageStudents',
+    always: true,
   },
   STUDENT_APPLY_FOR_QUIT_MUSIC_GROUP: {
     name: '学员退团申请',
@@ -98,24 +99,22 @@ export const errorType = {
     }
   },
   TEACHER_EXCEPTION_ATTENDANCE: {
-    name: '老师考勤异常',
+    name: '课程考勤异常',
     isError: true,
     always: true,
-    url: '/operateManager/recodeList',
+    url: '/business/teamCourseList',
     query: {
-      attendanceStatus: 'ERR_ATTENDANCE',
-      visitFlag: 0,
+      searchType: 'ERR_ATTENDANCE',
       ...dates,
     },
   },
   TEACHER_NOT_A_CLASS: {
-    name: '老师未签到签退',
+    name: '课程异常',
     isError: true,
     always: true,
-    url: '/operateManager/recodeList',
+    url: '/business/teamCourseList',
     query: {
-      attendanceStatus: 'NO_ATTENDANCE',
-      visitFlag: 0,
+      searchType: 'NO_ATTENDANCE',
       ...dates,
     },
   },
@@ -154,8 +153,8 @@ export const errorType = {
     url: '/business/musicInspection',
     always: true,
     query: {
-      tabrouter: 'teamSchedule',
-      conclusionStatus: '1'
+      searchType: 'INSPECTION_ITEM_PLAN',
+      ...dates
     },
   },
   STUDENT_VISIT: {
@@ -166,6 +165,7 @@ export const errorType = {
     query: {
       tabrouter: 'teamSchedule',
       searchType: 'STUDENT_VISIT',
+      ...dates
     },
   },
 }

src/views/main/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="m-container">
     <h2>
-      <div class="squrt"></div>控制台 <filter-search v-if="$route.query.tabrouter === 'teamSchedule'" :keys="['searchType']" @reload="reloadItem"/>
+      <div class="squrt"></div>控制台 <filter-search v-if="$route.query.tabrouter === 'teamSchedule'" :keys="['searchType']" :moreKeys="['organId']" @reload="reloadItem"/>
     </h2>
     <div class="m-core">
       <tab-router @change="changeKey">

src/views/main/teamSchedule/index.vue

@@ -31,7 +31,7 @@
         <el-date-picker
           v-model="searchForm.month"
           value-format="yyyy-MM"
-          type="month"
+          type="monthrange"
           placeholder="请选择月"
         >
         </el-date-picker>
@@ -156,6 +156,7 @@ import { getInspectionItem, resetInspectionItem } from "../api";
 import { permission } from "@/utils/directivePage";
 import pagination from "@/components/Pagination/index";
 import dayjs from "dayjs";
+import { getTimes } from "@/utils";
 export default {
   components: { pagination },
   data() {
@@ -163,7 +164,7 @@ export default {
       searchForm: {
         userId: "",
         organId: "",
-        month: "",
+        month: [],
         searchType:''
       },
       handleForm: {
@@ -186,6 +187,9 @@ export default {
     if (query.organId) {
       this.searchForm.organId = query.organId
     }
+    if( query.start&&query.end){
+      this.searchForm.month = [query.start,query.end]
+    }
     this.$store.dispatch("setBranchs");
     this.getList();
   },
@@ -202,13 +206,17 @@ export default {
       this.getList();
     },
     async getList() {
+             let { month, ...rest } = this.searchForm;
+      let params = {
+        ...rest,
+        page: this.rules.page,
+        rows: this.rules.limit,
+        ...getTimes(month, ["startTime", "endTime"],"YYYY-MM"),
+        searchType: this.$route.query.searchType,
+      };
       try {
-        const res = await getInspectionItem({
-          ...this.searchForm,
-          page: this.rules.page,
-          rows: this.rules.limit,
-          searchType: this.$route.query.searchType,
-        });
+        const res = await getInspectionItem(params
+      );
         this.tableList = res.data.rows;
         this.rules.total = res.data.total;
       } catch (e) {

src/views/musicInspection/index.vue

@@ -2,7 +2,7 @@
 <template>
     <div class="m-container">
         <h2>
-            <div class="squrt"></div>乐团巡查
+            <div class="squrt"></div>乐团巡查 <filter-search :keys="['searchType']" :moreKeys="['organId', 'start', 'end']" @reload="reloadItem"/>
         </h2>
         <div class="m-core">
             <save-form :inline="true" ref="searchForm" @submit="search" @reset="onReSet" :model="searchForm">
@@ -256,6 +256,9 @@ export default {
         if (query.conclusionStatus) {
           this.searchForm.conclusionStatus = Number(query.conclusionStatus)
         }
+        if (query.start && query.end) {
+          this.searchForm.createTimer = [query.start, query.end]
+        }
         this.getList()
         // 分部
         await this.$store.dispatch('setBranchs')
@@ -283,6 +286,7 @@ export default {
                     ...rest,
                     page: this.pageInfo.page,
                     rows: this.pageInfo.limit,
+                    searchType: this.$route.query.searchType,
                     ...getTimes(createTimer, ["startTime", "endTime"]),
                 }
                 const res = await inspectionItemPlan(params)

src/views/recodeManager/recodeList.vue

@@ -3,7 +3,7 @@
   <div class="m-container">
     <h2>
       <div class="squrt"></div>
-      老师考勤列表 <filter-search @reload="reloadSearch" :keys="['attendanceStatus', 'visitFlag']" :moreKeys="['start', 'end']"/>
+      老师考勤列表 <filter-search @reload="reloadSearch" :keys="['attendanceStatus', 'visitFlag']" :moreKeys="['start', 'end', 'organId']"/>
     </h2>
     <div class="m-core">
       <save-form

src/views/resetTeaming/components/resetPayList.vue

@@ -138,6 +138,7 @@
 
               <el-button type="text"
                        v-permission="'musicGroupPaymentCalender/delByBatchNo'"
+                       v-if="(scope.row.auditStatus == 'REJECT' || scope.row.auditStatus == 'AUDITING' || scope.row.auditStatus == 'NO') && teamStatus && scope.row.paymentType != 'ADD_STUDENT' && scope.row.paymentType != 'SPAN_GROUP_CLASS_ADJUST'"
                        @click="removeBatchNo(scope.row)">删除</el-button>
 
               <!-- <el-button type="text"

src/views/resetTeaming/components/resetPayListSchool.vue

@@ -138,6 +138,7 @@
 
               <el-button type="text"
                        v-permission="'musicGroupPaymentCalender/delByBatchNo'"
+                       v-if="(scope.row.auditStatus == 'REJECT' || scope.row.auditStatus == 'AUDITING' || scope.row.auditStatus == 'NO') && teamStatus && scope.row.paymentType != 'ADD_STUDENT' && scope.row.paymentType != 'SPAN_GROUP_CLASS_ADJUST'"
                        @click="removeBatchNo(scope.row)">删除</el-button>
 
               <!-- <el-button type="text"

src/views/teamDetail/componentCourse/studentRollCall.vue

@@ -67,23 +67,52 @@
             </div>
           </template>
         </el-table-column>
+        <el-table-column align="center" label="是否回访">
+          <template slot-scope="scope">
+            <div>{{ scope.row.visitFlag | yesOrNo }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column align='center'
+                         prop="ctrls"
+                         v-if="permission('visit/add?page=teamCourseList')"
+                         label="操作">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              @click="addVisit(scope.row)"
+            >新增回访</el-button>
+          </template>
+        </el-table-column>
       </el-table>
       <pagination :total="rules.total"
                   :page.sync="rules.page"
                   :limit.sync="rules.limit"
                   @pagination="getList" />
     </div>
+    <el-dialog title="新增回访" width="500px" :visible.sync="visitVisible" append-to-body>
+      <visit
+        v-if="visitVisible && detail"
+        :detail="detail"
+        :username="detail.username"
+        @close="visitVisible = false"
+        @submited="getList"
+      />
+    </el-dialog>
   </div>
 </template>
 <script>
 import { findStudentAttendance, sumStudentAttendance } from '@/api/buildTeam'
 import pagination from '@/components/Pagination/index'
+import { permission } from '@/utils/directivePage'
+import visit from '@/views/withdrawal-application/modals/visit'
 export default {
   props: ['courseScheduleId'],
-  components: { pagination },
+  components: { pagination, visit },
   data () {
     return {
       tableList: [],
+      visitVisible: false,
+      detail: null,
       rules: {
         // 分页规则
         limit: 10, // 限制显示条数
@@ -103,12 +132,17 @@ export default {
     this.init()
   },
   methods: {
+    permission,
     init () {
       console.log(this.courseScheduleId)
       this.getList()
 
       //  发请求获取学生签到信息
     },
+    addVisit(row) {
+      this.visitVisible = true
+      this.detail = row
+    },
     getList () {
       findStudentAttendance({
         search: this.courseScheduleId, rows: this.rules.limit,

src/views/teamDetail/componentCourse/teacherList.vue

@@ -101,6 +101,13 @@
         </template>
       </el-table-column>
       <el-table-column align='center'
+                       prop="disposeContent"
+                       label="处理意见">
+        <template slot-scope="scope">
+          <overflow-text width="100%" :text="scope.row.teacherAttendance && scope.row.teacherAttendance.disposeContent"></overflow-text>
+        </template>
+      </el-table-column>
+      <el-table-column align='center'
                        width="200px"
                        fixed="right"
                        label="操作">
@@ -118,6 +125,12 @@
                        size="small"
                        v-permission="'courseSchedule/queryTeacherSalary'"
                        @click="setCourseInfo(scope.row)">课酬调整</el-button>
+              <el-button
+                type="text"
+                v-permission="'teacherAttendance/update?page=teamCourseList'"
+                @click="hand(scope.row)"
+                v-if="scope.row.signInStatus!=1||scope.row.signOutStatus!=1"
+              >处理意见</el-button>
           </div>
         </template>
       </el-table-column>
@@ -128,6 +141,14 @@
       <gpsLoction v-if="gpsVisible"
                   :activeRow='activeRow' />
     </el-dialog>
+    <el-dialog title="处理意见" width="400px" :visible.sync="handVisible" append-to-body>
+      <hand
+        v-if="handVisible && detail"
+        :detail="detail"
+        @close="handVisible = false"
+        @submited="getList"
+      />
+    </el-dialog>
     <!-- <el-dialog title="课酬调整"
                width="800px"
                append-to-body
@@ -197,8 +218,9 @@ import { updateTeacherAttendance, getCourseList, getTeacherSalary } from "@/api/
 import { updateTeacherCoursesSalary } from '@/api/teacherManager'
 import { getCourseTeachers } from "@/api/teacherManager";
 import gpsLoction from "../componentCourse/gpsLocation";
+import hand from '@/views/recodeManager/modals/hand'
 export default {
-  components: { gpsLoction },
+  components: { gpsLoction, hand },
   props: ['courseScheduleId', 'teachMode'],
   data () {
     return {
@@ -209,6 +231,8 @@ export default {
       dialogTableVisible: false,
       innerVisible: false,
       activeTeacher: null,
+      handVisible: null,
+      detail: null,
       teacherMask: {
         salary: '',
         subsidy: '',
@@ -242,6 +266,10 @@ export default {
       this.activeRow = row;
       this.gpsVisible = true
     },
+    hand(row) {
+      this.handVisible = true
+      this.detail = row
+    },
     mackAttendance (row) {
 
       this.$confirm('确定补考勤', '提示', {

src/views/teamDetail/teamClassList.vue

@@ -3,7 +3,7 @@
   <div class="m-container">
     <h2>
       <div class="squrt"></div>
-      班级列表 <filter-search :keys="['lessThenThreeHighOnline']" @reload="getList"/>
+      班级列表 <filter-search :keys="['lessThenThreeHighOnline']" @reload="getList" :moreKeys="['organId']"/>
     </h2>
     <div class="m-core">
       <save-form

src/views/teamDetail/teamCourseList.vue

@@ -2,7 +2,7 @@
   <div class="m-container">
     <h2>
       <div class="squrt"></div>
-      课表列表
+      课表列表 <filter-search @reload="reloadSearch" :keys="['searchType']" :moreKeys="['start', 'end', 'organId']"/>
     </h2>
     <div class="m-core">
       <!-- 搜索类型 -->
@@ -633,7 +633,7 @@ const initSearch = {
   organIdList: null,
   courseStatus: null,
   courseType: null,
-  timer: [nowTime, nowTime], // 时间
+  timer: [], // 时间
   class: null,
   teachType: null,
   mergeCourseType: null,
@@ -698,6 +698,15 @@ export default {
     },
   },
   mounted() {
+    const { query } = this.$route
+    if (query.start || query.end) {
+      this.searchForm.timer = [query.start, query.end]
+    } else {
+      this.searchForm.timer = [nowTime, nowTime]
+    }
+    if (query.organId) {
+      this.searchForm.organIdList = Number(query.organId)
+    }
     this.$store.dispatch("setBranchs");
     this.$store.dispatch("setTeachers");
     this.$store.dispatch("setSchools");
@@ -710,6 +719,10 @@ export default {
     permission(str, parent) {
       return permission(str, parent);
     },
+    reloadSearch() {
+      this.searchForm.timer = [nowTime, nowTime]
+      this.getList()
+    },
     async removeCourse() {
       if(this.deleteList.length < 1){
         this.$message.error('请自少选择一个班级')
@@ -779,6 +792,7 @@ export default {
         ...rest,
         page: this.rules.page,
         rows: this.rules.limit,
+        searchType: this.$route.query.searchType,
         ...getTimes(creatTimer, ["createStartDate", "createEndDate"]),
         ...getTimes(timer, ["startTime", "endTime"]),
       };

src/views/teamDetail/teamList.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="m-container">
     <h2>
-      <div class="squrt"></div>乐团列表 <filter-search @reload="getList"/>
+      <div class="squrt"></div>乐团列表 <filter-search @reload="getList" :moreKeys="['organId']"/>
     </h2>
     <div class="m-core">
       <div class="btnList" style="margin-bottom: 20px">

src/views/withdrawal-application/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="m-container">
     <h2>
-      <div class="squrt"></div>退团申请列表 <filter-search @reload="FetchList" :keys="['visitFlag']"/>
+      <div class="squrt"></div>退团申请列表 <filter-search @reload="FetchList" :keys="['visitFlag']" :moreKeys="['organId']"/>
     </h2>
     <div class="m-core">
       <save-form