diff --git a/src/components/DetailComponent/Opinion.vue b/src/components/DetailComponent/Opinion.vue index 638d049..4e60ebb 100644 --- a/src/components/DetailComponent/Opinion.vue +++ b/src/components/DetailComponent/Opinion.vue @@ -11,6 +11,8 @@ import {ElNotification} from 'element-plus'; import {agreeTask, rejectTask} from "@/api/project-demand/index.js"; +import { useTagsView } from '@/stores/tagsview.js' +const tagsViewStore = useTagsView() const route = useRoute() const router = useRouter() const props = defineProps({ @@ -51,23 +53,35 @@ const back = () => { router.push({name: 'Filing'}) break; case 'Implementation/detail': - if (route.query.step === '10') { - router.push({name: 'Summary'}) - } else if (route.query.step === '20') { - router.push({name: 'Initiation'}) - } else if (route.query.step === '40') { - router.push({name: 'Implementation'}) - } else if (route.query.step === '50') { - router.push({name: 'Filing'}) - }else if (route.query.step === '00') { - router.push({name: 'Requirement'}) + if (route.query.source === 'home') { + router.push('/home') + } else { + if (route.query.step === '10') { + router.push({name: 'Summary'}) + } else if (route.query.step === '20') { + router.push({name: 'Initiation'}) + } else if (route.query.step === '40') { + router.push({name: 'Implementation'}) + } else if (route.query.step === '50') { + router.push({name: 'Filing'}) + } else if (route.query.step === '00') { + router.push({name: 'Requirement'}) + } } break; case 'Summary/detail': - router.push({name: 'Summary'}) + if (route.query.source === 'home') { + router.push('/home') + } else { + router.push({name: 'Summary'}) + } break; case 'Requirement/detail': - router.push({name: 'Requirement'}) + if (route.query.source === 'home') { + router.push('/home') + } else { + router.push({name: 'Requirement'}) + } break; case 'Fund/detail': router.push({name: 'Fund'}) @@ -88,7 +102,6 @@ const handleReject = async () => { }) return } - console.log('values', values) const params = { taskId: props.taskId, ...values @@ -99,6 +112,7 @@ const handleReject = async () => { message: res.msg, type: res.code === 1000 ? 'success' : 'error' }) + tagsViewStore.delVisitedViews(router.currentRoute.value.path) back() } @@ -115,6 +129,7 @@ const handleAgree = async () => { message: res.msg, type: res.code === 1000 ? 'success' : 'error' }) + tagsViewStore.delVisitedViews(router.currentRoute.value.path) back() } diff --git a/src/views/home/index.vue b/src/views/home/index.vue index d8fd861..094467b 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -46,14 +46,14 @@ -
+
您没有任何角色, 请联系管理员!