From 707176613178702e2ef202b2530979b14c971dcb Mon Sep 17 00:00:00 2001
From: bianyaqi <bianyaqi>
Date: Mon, 13 Nov 2023 15:23:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=82=A3=E8=80=85=E6=94=B6=E8=97=8F=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC360=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/360View/collection.vue |  5 ++++-
 src/components/360View/index.vue      |  4 ++--
 src/page-subspecialty/App.vue         | 13 ++++++++++++-
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/components/360View/collection.vue b/src/components/360View/collection.vue
index d769e32..ea467c5 100644
--- a/src/components/360View/collection.vue
+++ b/src/components/360View/collection.vue
@@ -104,6 +104,7 @@ export default {
       default: ''
     }
   },
+  inject: ['reload'],
   data() {
     return {
       defaultExpandIds: [],
@@ -222,9 +223,11 @@ export default {
           onlyRead: true,
           isSearch: this.platform,
           patientId: scopeRow.patientId,
-          jzNumber: scopeRow.jzNumber
+          jzNumber: scopeRow.jzNumber,
+          isCollection: true
         }
       })
+      this.reload()
     },
     levelClick(data) {
       this.curNode = data
diff --git a/src/components/360View/index.vue b/src/components/360View/index.vue
index 1b5b768..97ae215 100644
--- a/src/components/360View/index.vue
+++ b/src/components/360View/index.vue
@@ -413,9 +413,9 @@ export default {
       }
     },
     backList() {
-      if (this.$route.query.patientId && !this.$route.query.doctorId) {
+      if (this.$route.query.patientId && !this.$route.query.doctorId && !this.$route.query.isCollection) {
         this.$router.go(-1)
-      } else if (this.$route.query.doctorId) {
+      } else if (this.$route.query.doctorId || this.$route.query.isCollection) {
         this.$router.push('/outpatientManagement-call')
       } else {
         this.$parent.detailViewVisible = false
diff --git a/src/page-subspecialty/App.vue b/src/page-subspecialty/App.vue
index 07dfdde..8c137a4 100644
--- a/src/page-subspecialty/App.vue
+++ b/src/page-subspecialty/App.vue
@@ -1,6 +1,6 @@
 <template>
   <transition name="el-fade-in-linear">
-    <router-view />
+    <router-view v-if="isRouterAlive" />
   </transition>
 </template>
 
@@ -13,6 +13,11 @@
 import Cookies from 'js-cookie'
 import { messages } from '@/i18n'
 export default {
+  provide() {
+    return {
+      reload: this.reload
+    }
+  },
   data() {
     return {
       isRouterAlive: true
@@ -25,6 +30,12 @@ export default {
     this.i18nHandle(this.$i18n.locale)
   },
   methods: {
+    reload() {
+      this.isRouterAlive = false
+      this.$nextTick(function() {
+        this.isRouterAlive = true
+      })
+    },
     i18nHandle(val, oldVal) {
       Cookies.set('language', val)
       document.querySelector('html').setAttribute('lang', val)