Merge branch 'main-select' into test

src/components/filter-search/index.vue

@@ -1,7 +1,6 @@
 <template>
   <div class="container">
     <el-tag
-      v-show="!((item.key == 'WAIT_CREATE_PAYMENT_CALENDER' || $route.path == '/business/teamDetail') && !show && $route.query.form != 'reminders')"
       class="filter-search"
       v-for="item in activeItems"
       :key="item.key"

src/views/main/constant.js

@@ -118,7 +118,9 @@ export const errorType = {
     isError: true,
     url: '/teamList',
     permission: '/teamList',
-    resultKey: 'search',
+    query: {
+      searchType: 'WAIT_CREATE_PAYMENT_CALENDER'
+    }
   },
   COURSE_TRUANT_STUDENT_NUM: {
     name: '学员考勤异常旷课',

src/views/main/reminders/index.vue

@@ -72,7 +72,7 @@ export default {
         path: '/teamList',
         query: {
           filter_type: item.errorType,
-          search: (item.result || []).join(','),
+          searchType: 'WAIT_CREATE_PAYMENT_CALENDER',
           organId: this.search.organId || undefined,
           form: 'reminders'
         }

src/views/teamDetail/teamList.vue

@@ -2,7 +2,7 @@
   <div class="m-container">
     <h2>
       <div class="squrt"></div>
-      乐团管理 <filter-search @reload="reloadSearch" :moreKeys="['organId']" />
+      乐团管理 <filter-search @reload="reloadSearch" :moreKeys="['organId']" :keys="['searchType']" />
     </h2>
     <div class="m-core">
       <div class="btnList" style="margin-bottom: 20px">
@@ -466,6 +466,7 @@ export default {
         musicGroupName: this.topForm.teamName || null,
         musicGroupStatus: this.topForm.status || null,
         musicGroupId: this.$route.query.search,
+        searchType: this.$route.query.searchType,
       }).then((res) => {
         if (res.code == 200) {
           this.tableData = res.data.rows;