Showing
2 changed files
with
16 additions
and
8 deletions
@@ -43,7 +43,7 @@ | @@ -43,7 +43,7 @@ | ||
43 | </filter-item> | 43 | </filter-item> |
44 | 44 | ||
45 | <filter-item> | 45 | <filter-item> |
46 | - <Button type="primary" @click="list">筛选</Button> | 46 | + <Button type="primary" @click="filterSearch">筛选</Button> |
47 | <Button @click="clearFilters">清空条件</Button> | 47 | <Button @click="clearFilters">清空条件</Button> |
48 | </filter-item> | 48 | </filter-item> |
49 | </layout-filter> | 49 | </layout-filter> |
@@ -125,7 +125,7 @@ | @@ -125,7 +125,7 @@ | ||
125 | answerEndTime = fts.answerEndTime.model; | 125 | answerEndTime = fts.answerEndTime.model; |
126 | 126 | ||
127 | let page = this.pageData.current; | 127 | let page = this.pageData.current; |
128 | - let pageSize = this.pageData.pageSize; | 128 | + let size = this.pageData.size; |
129 | 129 | ||
130 | if (this.filters.productSKN.model) { | 130 | if (this.filters.productSKN.model) { |
131 | if (this.isNumber(this.filters.productSKN.model)) { | 131 | if (this.isNumber(this.filters.productSKN.model)) { |
@@ -135,7 +135,7 @@ | @@ -135,7 +135,7 @@ | ||
135 | } | 135 | } |
136 | } | 136 | } |
137 | 137 | ||
138 | - params.pageSize = this.pageData.pageSize; | 138 | + params.size = this.pageData.size; |
139 | params.page = this.pageData.current; | 139 | params.page = this.pageData.current; |
140 | 140 | ||
141 | return Promise.resolve({ | 141 | return Promise.resolve({ |
@@ -153,7 +153,7 @@ | @@ -153,7 +153,7 @@ | ||
153 | answerStartTime, | 153 | answerStartTime, |
154 | answerEndTime, | 154 | answerEndTime, |
155 | page, | 155 | page, |
156 | - pageSize | 156 | + size |
157 | }); | 157 | }); |
158 | }, | 158 | }, |
159 | list() { | 159 | list() { |
@@ -192,6 +192,10 @@ | @@ -192,6 +192,10 @@ | ||
192 | this.$Message.error(err); | 192 | this.$Message.error(err); |
193 | }); | 193 | }); |
194 | }, | 194 | }, |
195 | + filterSearch() { | ||
196 | + this.pageData.current = 1; | ||
197 | + this.list(); | ||
198 | + }, | ||
195 | isNumber(numStr) { | 199 | isNumber(numStr) { |
196 | const isNumber = /^[0-9]+$/; | 200 | const isNumber = /^[0-9]+$/; |
197 | 201 |
@@ -31,7 +31,7 @@ | @@ -31,7 +31,7 @@ | ||
31 | </Date-picker> | 31 | </Date-picker> |
32 | </filter-item> | 32 | </filter-item> |
33 | <filter-item> | 33 | <filter-item> |
34 | - <Button type="primary" @click="list">筛选</Button> | 34 | + <Button type="primary" @click="filterSearch">筛选</Button> |
35 | <Button @click="clearFilters">清空条件</Button> | 35 | <Button @click="clearFilters">清空条件</Button> |
36 | </filter-item> | 36 | </filter-item> |
37 | </layout-filter> | 37 | </layout-filter> |
@@ -93,7 +93,7 @@ | @@ -93,7 +93,7 @@ | ||
93 | endTime = fts.endTime.model; | 93 | endTime = fts.endTime.model; |
94 | 94 | ||
95 | let page = this.pageData.current; | 95 | let page = this.pageData.current; |
96 | - let pageSize = this.pageData.pageSize; | 96 | + let size = this.pageData.size; |
97 | 97 | ||
98 | if (this.filters.erpSkuId.model) { | 98 | if (this.filters.erpSkuId.model) { |
99 | if (this.isNumber(this.filters.erpSkuId.model)) { | 99 | if (this.isNumber(this.filters.erpSkuId.model)) { |
@@ -111,7 +111,7 @@ | @@ -111,7 +111,7 @@ | ||
111 | } | 111 | } |
112 | } | 112 | } |
113 | 113 | ||
114 | - params.pageSize = this.pageData.pageSize; | 114 | + params.size = this.pageData.size; |
115 | params.page = this.pageData.current; | 115 | params.page = this.pageData.current; |
116 | 116 | ||
117 | return Promise.resolve({ | 117 | return Promise.resolve({ |
@@ -124,7 +124,7 @@ | @@ -124,7 +124,7 @@ | ||
124 | beginTime, | 124 | beginTime, |
125 | endTime, | 125 | endTime, |
126 | page, | 126 | page, |
127 | - pageSize | 127 | + size |
128 | }); | 128 | }); |
129 | }, | 129 | }, |
130 | list() { | 130 | list() { |
@@ -161,6 +161,10 @@ | @@ -161,6 +161,10 @@ | ||
161 | this.$Message.error(err); | 161 | this.$Message.error(err); |
162 | }); | 162 | }); |
163 | }, | 163 | }, |
164 | + filterSearch() { | ||
165 | + this.pageData.current = 1; | ||
166 | + this.list(); | ||
167 | + }, | ||
164 | isNumber(numStr) { | 168 | isNumber(numStr) { |
165 | const isNumber = /^[0-9]+$/; | 169 | const isNumber = /^[0-9]+$/; |
166 | 170 |
-
Please register or login to post a comment