panhui 1 gadu atpakaļ
vecāks
revīzija
25a1297abf

+ 12 - 0
src/main/vue/src/mixins/pageableTable.js

@@ -138,6 +138,18 @@ export default {
             });
             console.log(rowWidth);
             console.log(headWidth);
+        },
+        getFiliter() {
+            this.$router
+                .replace({
+                    query: {
+                        ...this.$router.query,
+                        page: 1
+                    }
+                })
+                .catch(_ => {});
+            this.page = 1;
+            this.getData();
         }
     },
     watch: {

+ 13 - 7
src/main/vue/src/views/supply/GeneralPatentList.vue

@@ -22,8 +22,14 @@
             <excel-upload uri="/patent/upload" />
         </page-title>
         <div class="filters-container">
-            <setting-select name="所属领域" :flag="1" v-model="industry" @input="getData"></setting-select>
-            <el-select v-model="lawStatus" placeholder="请选择法律状态" clearable class="filter-item" @change="getData">
+            <setting-select name="所属领域" :flag="1" v-model="industry" @input="getFiliter"></setting-select>
+            <el-select
+                v-model="lawStatus"
+                placeholder="请选择法律状态"
+                clearable
+                class="filter-item"
+                @change="getFiliter"
+            >
                 <el-option
                     v-for="item in lawStatusOptions"
                     :key="item.value"
@@ -36,7 +42,7 @@
                 placeholder="请选择专利分类"
                 clearable
                 class="filter-item"
-                @change="getData"
+                @change="getFiliter"
             >
                 <el-option
                     v-for="item in patentTypeOptions"
@@ -50,7 +56,7 @@
                 placeholder="请选择交易方式"
                 clearable
                 class="filter-item"
-                @change="getData"
+                @change="getFiliter"
             >
                 <el-option
                     v-for="item in tradingMethodOptions"
@@ -59,15 +65,15 @@
                     :label="item.label"
                 ></el-option>
             </el-select>
-            <created-picker v-model="createdAt" @input="getData"></created-picker>
+            <created-picker v-model="createdAt" @input="getFiliter"></created-picker>
             <el-input
                 placeholder="搜索..."
                 v-model="search"
                 clearable
                 class="filter-item search"
-                @keyup.enter.native="getData"
+                @keyup.enter.native="getFiliter"
             >
-                <el-button @click="getData" slot="append" icon="el-icon-search"> </el-button>
+                <el-button @click="getFiliter" slot="append" icon="el-icon-search"> </el-button>
             </el-input>
         </div>
         <el-table