diff --git a/src/views/ReceivingRecords/index.vue b/src/views/ReceivingRecords/index.vue index e422a2b..73356d0 100644 --- a/src/views/ReceivingRecords/index.vue +++ b/src/views/ReceivingRecords/index.vue @@ -587,6 +587,17 @@ export default { if(this.$route.query.markAdvisor){ this.searchForm.markAdvisor = this.$route.query.markAdvisor; } + if(this.$route.query.dateType){ + this.searchForm.dateType = this.$route.query.dateType; + } + if(this.$route.query.staDate){ + this.searchForm.dateType = this.$route.query.dateType; + this.searchForm.staDate = this.$route.query.staDate; + } + if(this.$route.query.endDate){ + this.searchForm.dateType = this.$route.query.dateType; + this.searchForm.endDate = this.$route.query.endDate; + } // 获取项目列表 this.zkhousePage(); }, diff --git a/src/views/Statistics/index.vue b/src/views/Statistics/index.vue index 98d005c..b0a61f3 100644 --- a/src/views/Statistics/index.vue +++ b/src/views/Statistics/index.vue @@ -211,11 +211,26 @@ export default { methods: { goTo(i){ if(i==1){ - Router.push("/ReceivingRecords/index?activeTotal=0&validInvalid=0") + if(this.TimetoAhoose==6){ + Router.push(`/ReceivingRecords/index?alidInvalid=0&dateType=${this.TimetoAhoose}&staDate=${this.fromobj.starttime}&endDate=${this.fromobj.endoftime}`) + }else{ + Router.push(`/ReceivingRecords/index?alidInvalid=0&dateType=${this.TimetoAhoose}`) + } + }else if(i==2){ - Router.push("/ReceivingRecords/index?activeTotal=0&markAdvisor=1"); + if(this.TimetoAhoose==6){ + Router.push(`/ReceivingRecords/index?markAdvisor=1&dateType=${this.TimetoAhoose}&staDate=${this.fromobj.starttime}&endDate=${this.fromobj.endoftime}`); + }else{ + Router.push(`/ReceivingRecords/index?markAdvisor=1&dateType=${this.TimetoAhoose}`); + } + }else{ - Router.push("/ReceivingRecords/index?activeTotal=0&markAdvisor=0"); + if(this.TimetoAhoose==6){ + Router.push(`/ReceivingRecords/index?markAdvisor=0&dateType=${this.TimetoAhoose}&staDate=${this.fromobj.starttime}&endDate=${this.fromobj.endoftime}`); + }else{ + Router.push(`/ReceivingRecords/index?markAdvisor=0&dateType=${this.TimetoAhoose}`); + } + } }, backTop(){