|
@@ -218,7 +218,7 @@ export default {
|
|
|
*/
|
|
*/
|
|
|
pageInfo() {
|
|
pageInfo() {
|
|
|
if (!this.showPagination) return ''
|
|
if (!this.showPagination) return ''
|
|
|
- const total = this.pagination[this.totalKey]
|
|
|
|
|
|
|
+ const total = this.pagination.totalCount
|
|
|
if (total && total > 0) {
|
|
if (total && total > 0) {
|
|
|
const start = (this.currentPage - 1) * this.pageSize + 1
|
|
const start = (this.currentPage - 1) * this.pageSize + 1
|
|
|
let end = this.currentPage * this.pageSize
|
|
let end = this.currentPage * this.pageSize
|
|
@@ -244,6 +244,7 @@ export default {
|
|
|
methods: {
|
|
methods: {
|
|
|
search() {
|
|
search() {
|
|
|
this.loading = true
|
|
this.loading = true
|
|
|
|
|
+ console.log('this.pagination==>', this.pagination)
|
|
|
return new Promise((resolve, reject) => {
|
|
return new Promise((resolve, reject) => {
|
|
|
try {
|
|
try {
|
|
|
searchPagePermission({
|
|
searchPagePermission({
|
|
@@ -260,6 +261,7 @@ export default {
|
|
|
pageResult: {}
|
|
pageResult: {}
|
|
|
}
|
|
}
|
|
|
this.pagination = pageResult
|
|
this.pagination = pageResult
|
|
|
|
|
+ this.pagination.pageNo = pageResult.page
|
|
|
this.columns = data.roles
|
|
this.columns = data.roles
|
|
|
console.log('permissions===>', data.permissions)
|
|
console.log('permissions===>', data.permissions)
|
|
|
this.ibpsData = data.permissions
|
|
this.ibpsData = data.permissions
|
|
@@ -341,19 +343,28 @@ export default {
|
|
|
* @description 当前页码改变
|
|
* @description 当前页码改变
|
|
|
*/
|
|
*/
|
|
|
handlePaginationCurrentChange(currentPage) {
|
|
handlePaginationCurrentChange(currentPage) {
|
|
|
- this.handlePaginationChange({ currentPage: currentPage })
|
|
|
|
|
|
|
+ this.handlePaginationChange({
|
|
|
|
|
+ currentPage: currentPage,
|
|
|
|
|
+ pageSize: this.pageSize
|
|
|
|
|
+ })
|
|
|
},
|
|
},
|
|
|
/**
|
|
/**
|
|
|
* @description 上一页
|
|
* @description 上一页
|
|
|
*/
|
|
*/
|
|
|
handlePaginationPrevClick(currentPage) {
|
|
handlePaginationPrevClick(currentPage) {
|
|
|
- this.handlePaginationChange({ currentPage: currentPage })
|
|
|
|
|
|
|
+ this.handlePaginationChange({
|
|
|
|
|
+ currentPage: currentPage,
|
|
|
|
|
+ pageSize: this.pageSize
|
|
|
|
|
+ })
|
|
|
},
|
|
},
|
|
|
/**
|
|
/**
|
|
|
* @description 下一页
|
|
* @description 下一页
|
|
|
*/
|
|
*/
|
|
|
handlePaginationNextClick(currentPage) {
|
|
handlePaginationNextClick(currentPage) {
|
|
|
- this.handlePaginationChange({ currentPage: currentPage })
|
|
|
|
|
|
|
+ this.handlePaginationChange({
|
|
|
|
|
+ currentPage: currentPage,
|
|
|
|
|
+ pageSize: this.pageSize
|
|
|
|
|
+ })
|
|
|
},
|
|
},
|
|
|
handlePaginationChange({ pageSize, currentPage }) {
|
|
handlePaginationChange({ pageSize, currentPage }) {
|
|
|
this.pagination.limit = pageSize || this.pageSize
|
|
this.pagination.limit = pageSize || this.pageSize
|