From 3bc1224c69e262c84a864bfbc91a94607187100c Mon Sep 17 00:00:00 2001
From: jyt <1592211625@qq.com>
Date: Wed, 22 Jun 2022 16:35:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ReceivingRecords/index.vue | 11 +++++++++++
 src/views/Statistics/index.vue       | 21 ++++++++++++++++++---
 2 files changed, 29 insertions(+), 3 deletions(-)

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(){