|
|
@@ -70,7 +70,9 @@
|
|
|
<template #title>
|
|
|
<span class="custom-title"
|
|
|
>{{ item.taskName
|
|
|
- }}<van-tag class="resetDy" @click.stop="resetHandler(item.id)" v-if="item.status == 1" type="primary">重新调阅</van-tag></span
|
|
|
+ }}<van-tag class="resetDy" @click.stop="resetHandler(item.id)" v-if="item.status == 1" type="primary"
|
|
|
+ >重新调阅</van-tag
|
|
|
+ ></span
|
|
|
>
|
|
|
<!-- v-if="item.status == 1" -->
|
|
|
|
|
|
@@ -219,10 +221,12 @@ export default {
|
|
|
if (this.pageNum == 1) {
|
|
|
this.pageNum = 2
|
|
|
}
|
|
|
+ this.loading = true
|
|
|
|
|
|
this.selectListAppHandler(1, () => {
|
|
|
- this.loading = false
|
|
|
this.pageNum++
|
|
|
+ this.loading = false
|
|
|
+
|
|
|
})
|
|
|
},
|
|
|
//清空查询条件
|
|
|
@@ -247,12 +251,13 @@ export default {
|
|
|
this.columns.push(item.dictLabel)
|
|
|
})
|
|
|
})
|
|
|
- this.selectListAppHandler()
|
|
|
+ // this.selectListAppHandler()
|
|
|
},
|
|
|
selectListAppHandler(type = 0, callBack = () => {}) {
|
|
|
if (!type) {
|
|
|
this.pageNum = 1
|
|
|
}
|
|
|
+
|
|
|
//获取任务列表
|
|
|
selectListApp({
|
|
|
pageNum: this.pageNum,
|
|
|
@@ -261,15 +266,16 @@ export default {
|
|
|
orgId: this.cascaderValue || JSON.parse(window.sessionStorage.getItem('SET_USER_ORGID')) + '' || '',
|
|
|
moth: this.currentDate || ''
|
|
|
}).then(res => {
|
|
|
- let { code, rows, msg } = res
|
|
|
+ let { code, rows, total } = res
|
|
|
if (code == 200) {
|
|
|
if (type) {
|
|
|
this.taskList.push(...rows)
|
|
|
if (rows.length == 0 || rows.length < 10) {
|
|
|
//已加载完全部数据
|
|
|
this.finished = true
|
|
|
- }
|
|
|
+ }
|
|
|
callBack()
|
|
|
+
|
|
|
} else {
|
|
|
this.finished = false
|
|
|
this.taskList = rows || []
|