|
@@ -306,7 +306,6 @@ export default {
|
|
|
this.spinning = true
|
|
|
// 查询总计
|
|
|
salesCount(Object.assign(parameter, this.queryParam)).then(res => {
|
|
|
- console.log(res, 'res')
|
|
|
this.totalData = Object.assign(this.totalData, res.data || {})
|
|
|
})
|
|
|
return salesList(Object.assign(parameter, this.queryParam)).then(res => {
|
|
@@ -574,7 +573,7 @@ export default {
|
|
|
// 是否从首页点击进入
|
|
|
const isHomeNav = this.getIsHomeNav()[this.$route.name]
|
|
|
console.log(a, b)
|
|
|
-
|
|
|
+ console.log(isHomeNav)
|
|
|
// 从首页进入,判断式新建还式待办查询
|
|
|
if (isHomeNav) {
|
|
|
// 新增
|
|
@@ -587,7 +586,9 @@ export default {
|
|
|
this.resetData(true)
|
|
|
this.queryParam = Object.assign(this.queryParam, isHomeNav.pageParams)
|
|
|
this.$refs.rangeDate.resetDate([this.queryParam.beginDate, this.queryParam.endDate])
|
|
|
- this.$refs.table.refresh(true)
|
|
|
+ setTimeout(() => {
|
|
|
+ this.$refs.table.refresh(true)
|
|
|
+ }, 100)
|
|
|
}
|
|
|
} else {
|
|
|
// 如果是新页签打开,则重置当前页面
|