diff --git a/jero-web/src/views/documentManage/tags/dialog/DicList.vue b/jero-web/src/views/documentManage/tags/dialog/DicList.vue index 398f4e56c..383f989e0 100644 --- a/jero-web/src/views/documentManage/tags/dialog/DicList.vue +++ b/jero-web/src/views/documentManage/tags/dialog/DicList.vue @@ -196,6 +196,11 @@ getAction(`sys/dictItem/page`, params).then(res => { if (res.success) { + if (res.result.current > 1 && res.result.records.length == 0) { + this.queryParams.pageNo = 1 + this.loadData() + return + } this.total = res.result.total this.tableData = [...res.result.records] this.dataFlag = true @@ -210,6 +215,11 @@ sysDictId: this.record.id, isTagDict: 1 }).then(res => { + if (res.result.current > 1 && res.result.records.length == 0) { + this.queryParams.pageNo = 1 + this.loadData() + return + } this.tabletreeDataSource = [...res.result.records] this.total = res.result.total let data = this.toTree(this.tabletreeDataSource) diff --git a/jero-web/src/views/documentManage/tags/tabs/TagContent.vue b/jero-web/src/views/documentManage/tags/tabs/TagContent.vue index 62ef32172..1596e96d7 100644 --- a/jero-web/src/views/documentManage/tags/tabs/TagContent.vue +++ b/jero-web/src/views/documentManage/tags/tabs/TagContent.vue @@ -88,7 +88,7 @@ show-size-changer :page-size.sync="queryParams.pageSize" :total="total" - :current="pageNo" + :current="queryParams.pageNo" @change="onChangePage" @showSizeChange="SizeChange" /> @@ -233,12 +233,21 @@ // sys/dict/page postAction(`sys/dict/tagDictPage`, params).then(res => { if (res.success) { + if (res.result.current > 1 && res.result.records.length == 0) { + this.queryParams.pageNo = 1 + this.loadData() + return + } + this.loading = false this.total = res.result.total this.tableData = [...res.result.records] + }else{ + this.loading = false } - }).finally(() => { - this.loading = false }) + // .finally(() => { + // this.loading = false + //}) }, //查询 searchQuery() { @@ -260,7 +269,7 @@ }, hideModal() { this.form.dictName = this.form.dictName.trim() - if (this.form.description){ + if (this.form.description) { this.form.description = this.form.description.trim() } let params = { diff --git a/jero-web/src/views/documentManage/tags/tabs/TagItem.vue b/jero-web/src/views/documentManage/tags/tabs/TagItem.vue index 3b8025019..2643c4b11 100644 --- a/jero-web/src/views/documentManage/tags/tabs/TagItem.vue +++ b/jero-web/src/views/documentManage/tags/tabs/TagItem.vue @@ -305,6 +305,16 @@ } postAction(`tag/onlCgformTag/page`, paramsItem).then(res => { if (res.success) { + if (res.result.current > 1 && res.result.records.length == 0) { + if (this.key == 1) { + this.queryParamOne.pageNo = 1 + this.loadData(1) + } else if (this.key == 2) { + this.queryParamTwo.pageNo = 1 + this.loadData(0) + } + return + } this.total = res.result.total this.tableData = [...res.result.records] this.spinning = false