瀏覽代碼

Merge branch '01/21VipReset' into online

wolyshaw 4 年之前
父節點
當前提交
cd6762c046
共有 2 個文件被更改,包括 4 次插入3 次删除
  1. 2 2
      src/views/main/constant.js
  2. 2 1
      src/views/musicInspection/index.vue

+ 2 - 2
src/views/main/constant.js

@@ -153,8 +153,8 @@ export const errorType = {
     url: '/business/musicInspection',
     always: true,
     query: {
-      tabrouter: 'teamSchedule',
-      conclusionStatus: '1'
+      searchType: 'INSPECTION_ITEM_PLAN',
+      ...dates
     },
   },
   STUDENT_VISIT: {

+ 2 - 1
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">
@@ -282,6 +282,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)