|
@@ -573,7 +573,7 @@ export default {
|
|
const b = this.$store.state.app.updateList
|
|
const b = this.$store.state.app.updateList
|
|
// 是否从首页点击进入
|
|
// 是否从首页点击进入
|
|
const isHomeNav = this.getIsHomeNav()[this.$route.name]
|
|
const isHomeNav = this.getIsHomeNav()[this.$route.name]
|
|
- console.log(a, b)
|
|
|
|
|
|
+ console.log(a, b,'++++++++++++')
|
|
console.log(isHomeNav)
|
|
console.log(isHomeNav)
|
|
// 从首页进入,判断式新建还式待办查询
|
|
// 从首页进入,判断式新建还式待办查询
|
|
if (isHomeNav) {
|
|
if (isHomeNav) {
|
|
@@ -584,22 +584,19 @@ export default {
|
|
}
|
|
}
|
|
// 待办
|
|
// 待办
|
|
if (isHomeNav.type == 'todo') {
|
|
if (isHomeNav.type == 'todo') {
|
|
- this.resetData(true)
|
|
|
|
|
|
+ this.$refs.rangeDate.resetDate([isHomeNav.pageParams.beginDate, isHomeNav.pageParams.endDate])
|
|
this.queryParam = Object.assign(this.queryParam, isHomeNav.pageParams)
|
|
this.queryParam = Object.assign(this.queryParam, isHomeNav.pageParams)
|
|
- this.$refs.rangeDate.resetDate([this.queryParam.beginDate, this.queryParam.endDate])
|
|
|
|
- setTimeout(() => {
|
|
|
|
- this.$refs.table.refresh(true)
|
|
|
|
- }, 100)
|
|
|
|
|
|
+ this.$refs.table.refresh(true)
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
// 如果是新页签打开,则重置当前页面
|
|
// 如果是新页签打开,则重置当前页面
|
|
if (a && !b) {
|
|
if (a && !b) {
|
|
this.resetSearchForm()
|
|
this.resetSearchForm()
|
|
}
|
|
}
|
|
- }
|
|
|
|
- // 仅刷新列表,不重置页面
|
|
|
|
- if (b || a == b) {
|
|
|
|
- this.$refs.table.refresh()
|
|
|
|
|
|
+ // 仅刷新列表,不重置页面
|
|
|
|
+ if (b || a == b) {
|
|
|
|
+ this.$refs.table.refresh()
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
},
|
|
},
|