diff --git a/src/api/special-fund/index.js b/src/api/special-fund/index.js index f76b2c4..2f662e1 100644 --- a/src/api/special-fund/index.js +++ b/src/api/special-fund/index.js @@ -38,3 +38,9 @@ export const resubmitFund= (data) => { data }); }; +export const deleteFund = (id) => { + return request({ + url: `/workflow/mosr/special/fund/${id}`, + method: "delete" + }); +}; diff --git a/src/components/DetailComponent/Opinion.vue b/src/components/DetailComponent/Opinion.vue index 4e60ebb..dc50ef1 100644 --- a/src/components/DetailComponent/Opinion.vue +++ b/src/components/DetailComponent/Opinion.vue @@ -11,7 +11,8 @@ import {ElNotification} from 'element-plus'; import {agreeTask, rejectTask} from "@/api/project-demand/index.js"; -import { useTagsView } from '@/stores/tagsview.js' +import {useTagsView} from '@/stores/tagsview.js' + const tagsViewStore = useTagsView() const route = useRoute() const router = useRouter() @@ -84,7 +85,11 @@ const back = () => { } break; case 'Fund/detail': - router.push({name: 'Fund'}) + if (route.query.source === 'home') { + router.push('/home') + } else { + router.push({name: 'Fund'}) + } break; case 'Share/detail': router.push({name: 'Expense/share'}) diff --git a/src/components/DetailComponent/SpecialFundDetail.vue b/src/components/DetailComponent/SpecialFundDetail.vue index 68ba4fb..140f81f 100644 --- a/src/components/DetailComponent/SpecialFundDetail.vue +++ b/src/components/DetailComponent/SpecialFundDetail.vue @@ -30,7 +30,7 @@ -