|
@@ -176,11 +176,13 @@ export default {
|
|
|
});
|
|
|
this.total = res.totalCount;
|
|
|
this.totalPage = res.pageCount;
|
|
|
+ this.current = res.page + 1;
|
|
|
},
|
|
|
async toPage(page) {
|
|
|
this.current = page;
|
|
|
await this.getList();
|
|
|
this.pageNo = this.current;
|
|
|
+ console.log(this.pageNo);
|
|
|
},
|
|
|
changePage() {
|
|
|
if (!this.pageNo) return;
|
|
@@ -195,12 +197,13 @@ export default {
|
|
|
await this.toPage(this.current + 1);
|
|
|
},
|
|
|
// menu
|
|
|
- toSwitchMenu(item) {
|
|
|
+ async toSwitchMenu(item) {
|
|
|
this.curMenu = item.value;
|
|
|
if (this.curMenu === "task") {
|
|
|
- this.initData();
|
|
|
+ await this.initData();
|
|
|
} else {
|
|
|
- this.toPage(1);
|
|
|
+ await this.toPage(1);
|
|
|
+ this.selectPaper(0);
|
|
|
}
|
|
|
},
|
|
|
// paper
|
|
@@ -217,6 +220,8 @@ export default {
|
|
|
this.curPaperIndex = nindex;
|
|
|
this.curPaper = this.papers[nindex] ? { ...this.papers[nindex] } : {};
|
|
|
|
|
|
+ if (this.curMenu === "history") return;
|
|
|
+
|
|
|
this.updateProgress();
|
|
|
},
|
|
|
async toPrevPaper() {
|
|
@@ -269,7 +274,7 @@ export default {
|
|
|
paperId: levelInfo.paperId,
|
|
|
level: levelInfo.selectedLevel,
|
|
|
userId: this.$ls.get("user", { id: "" }).id,
|
|
|
- paperCheckId: this.curPaper.id,
|
|
|
+ paperCheckId: this.taskInfo.id,
|
|
|
});
|
|
|
this.$Message.success("申请改档成功!");
|
|
|
await this.toNextPaper();
|