|
@@ -458,9 +458,6 @@ export default {
|
|
|
// 如果是新页签打开,则重置当前页面
|
|
|
if (this.$store.state.app.isNewTab) {
|
|
|
this.resetData()
|
|
|
- if (this.$route.query.pageParams) {
|
|
|
- this.queryParam.billStatus = this.$route.query.pageParams.billStatus
|
|
|
- }
|
|
|
this.pageInit()
|
|
|
this.$refs.table.refresh(true)
|
|
|
}
|
|
@@ -473,9 +470,14 @@ export default {
|
|
|
beforeRouteEnter (to, from, next) {
|
|
|
next(vm => {
|
|
|
// 从首页点击销售开单过来的,直接打开选择客户弹框
|
|
|
- if (from.name == 'home' && vm.$store.state.app.isHomeNav && vm.$route.query.pageParams == null) {
|
|
|
- vm.openModal = true
|
|
|
- vm.$store.state.app.isHomeNav = false
|
|
|
+ if (from.name == 'home' && vm.$store.state.app.isHomeNav) {
|
|
|
+ console.log(vm.$route.query.pageParams)
|
|
|
+ if (vm.$route.query.pageParams) {
|
|
|
+ vm.queryParam.billStatus = vm.$route.query.pageParams.billStatus
|
|
|
+ } else {
|
|
|
+ vm.openModal = true
|
|
|
+ vm.$store.state.app.isHomeNav = false
|
|
|
+ }
|
|
|
}
|
|
|
})
|
|
|
}
|