diff --git a/src/components/DetailComponent/CollectionDetail.vue b/src/components/DetailComponent/CollectionDetail.vue index fbc65a8..7c6ec41 100644 --- a/src/components/DetailComponent/CollectionDetail.vue +++ b/src/components/DetailComponent/CollectionDetail.vue @@ -32,8 +32,8 @@ {{ formData.specialFund }} - +
diff --git a/src/router/index.js b/src/router/index.js index d0b07f3..a2a6185 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -30,6 +30,16 @@ const router = createRouter({ name: 'projectDetailMobile', component: () => import('@/views/project-management/mobledetail/index.vue') }, + { + path: '/fund/mobile', + name: 'specialFundDetailMobile', + component: () => import('@/views/project-management/mobledetail/SpecialFundDetailMobile.vue') + }, + { + path: '/share/mobile', + name: 'shareDetailMobile', + component: () => import('@/views/project-management/mobledetail/ShareDetailMobile.vue') + }, { path: '/', name: 'layout', diff --git a/src/views/project-management/mobledetail/OpinionMoblie.vue b/src/views/project-management/mobledetail/OpinionMoblie.vue index 9b775e6..08eca75 100644 --- a/src/views/project-management/mobledetail/OpinionMoblie.vue +++ b/src/views/project-management/mobledetail/OpinionMoblie.vue @@ -12,7 +12,7 @@ import {ElNotification} from 'element-plus'; import {agreeTask, rejectTask} from "@/api/project-demand/index.js"; import {useTagsView} from '@/stores/tagsview.js' -const tagsViewStore = useTagsView() +// const tagsViewStore = useTagsView() const route = useRoute() const router = useRouter() const props = defineProps({ @@ -141,8 +141,9 @@ const handleReject = async () => { message: res.msg, type: res.code === 1000 ? 'success' : 'error' }) - tagsViewStore.delVisitedViews(router.currentRoute.value.path) - back() + // tagsViewStore.delVisitedViews(router.currentRoute.value.path) + location.reload() + // back() } const handleAgree = async () => { @@ -158,8 +159,9 @@ const handleAgree = async () => { message: res.msg, type: res.code === 1000 ? 'success' : 'error' }) - tagsViewStore.delVisitedViews(router.currentRoute.value.path) - back() + // tagsViewStore.delVisitedViews(router.currentRoute.value.path) + location.reload() + // back() } diff --git a/src/views/project-management/mobledetail/ProjectApplyMoblie.vue b/src/views/project-management/mobledetail/ProjectApplyMoblie.vue index 28e4403..a1e661d 100644 --- a/src/views/project-management/mobledetail/ProjectApplyMoblie.vue +++ b/src/views/project-management/mobledetail/ProjectApplyMoblie.vue @@ -45,7 +45,7 @@ 重新提交 返回
- + @@ -62,19 +62,20 @@ - + - - + + - + + +
确定 取消 @@ -148,7 +149,7 @@ const pageInfo = reactive({ const rules = reactive({ requestName: [{required: true, message: '请选择前置流程', trigger: 'blur'}], }) -const tagsViewStore = useTagsView() +// const tagsViewStore = useTagsView() const processStore = useProcessStore() const otherFileList = ref([]) const localFormData = ref({ @@ -212,7 +213,7 @@ const getPreProcessList = () => { }) total.value = searchArray.length currentList.value = searchArray - preProcessList.value = currentList.value.slice(0, 10) + preProcessList.value = currentList.value.slice(0, 5) }) } const choosePreProcess = () => { @@ -360,20 +361,21 @@ const handleSubmit = async () => { type: res.code === 1000 ? 'success' : 'error' }) if (res.code === 1000) { - tagsViewStore.delVisitedViews(router.currentRoute.value.path) - if (props.step === '20') { - await router.push({ - name: 'Initiation' - }) - } else if (props.step === '40') { - await router.push({ - name: 'Implementation' - }) - } else if (props.step === '50') { - await router.push({ - name: 'Filing' - }) - } + // tagsViewStore.delVisitedViews(router.currentRoute.value.path) + location.reload() + // if (props.step === '20') { + // await router.push({ + // name: 'Initiation' + // }) + // } else if (props.step === '40') { + // await router.push({ + // name: 'Implementation' + // }) + // } else if (props.step === '50') { + // await router.push({ + // name: 'Filing' + // }) + // } } } const init = async () => { @@ -426,4 +428,10 @@ onMounted(async () => { display: flex; justify-content: flex-end; } +:deep(.el-upload-list) { + width: auto; +} +:deep(.el-overlay-dialog ){ + left: 0!important; +} diff --git a/src/views/project-management/mobledetail/ShareDetailMobile.vue b/src/views/project-management/mobledetail/ShareDetailMobile.vue new file mode 100644 index 0000000..3578ed3 --- /dev/null +++ b/src/views/project-management/mobledetail/ShareDetailMobile.vue @@ -0,0 +1,135 @@ + + + + diff --git a/src/views/project-management/mobledetail/SpecialFundDetailMobile.vue b/src/views/project-management/mobledetail/SpecialFundDetailMobile.vue new file mode 100644 index 0000000..4257601 --- /dev/null +++ b/src/views/project-management/mobledetail/SpecialFundDetailMobile.vue @@ -0,0 +1,242 @@ + + + + diff --git a/src/views/project-management/mobledetail/index.vue b/src/views/project-management/mobledetail/index.vue index d24040b..74b09c4 100644 --- a/src/views/project-management/mobledetail/index.vue +++ b/src/views/project-management/mobledetail/index.vue @@ -36,7 +36,7 @@ :processViewer="commonProvessViewer" :fileListShow="fileListShow" v-model:value="auditOpinion"/> - -
- @@ -56,9 +55,10 @@ import {ElLoading, ElNotification} from "element-plus"; import ApprovalDetail from './ApprovalDetailMoblie.vue'; import CollectionDetail from './CollectionDetailMoblie.vue'; import SummaryDetail from './SummaryDetailMoblie.vue'; -import Opinion from './OpinionMoblie.vue'; import StepsMoblie from './StepsMoblie.vue'; -import ProjectApply from './ProjectApplyMoblie.vue'; +import {getMapProjectStateInfo} from "./api"; +import OpinionMoblie from "./OpinionMoblie.vue"; +import ProjectApplyMoblie from "./ProjectApplyMoblie.vue"; const route = useRoute() @@ -70,7 +70,6 @@ const fileListShow = ref('READ') const mode = ref('') const currentStep = ref() const auditOpinion = ref('') -// const step = ref(route.query.step) route.query.step == '10' && (currentStep.value = 1) route.query.step == '20' && (currentStep.value = 2) route.query.step == '40' && (currentStep.value = 3) @@ -167,4 +166,4 @@ const stepChange = (data) => { //} } } - \ No newline at end of file + diff --git a/src/views/special-fund/detail.vue b/src/views/special-fund/detail.vue index a6760a2..1d08334 100644 --- a/src/views/special-fund/detail.vue +++ b/src/views/special-fund/detail.vue @@ -19,11 +19,6 @@ const getDetail = async () => { loading.value = true fundProcessViewer.value = false const {code, data, msg} = await getFundDetailProcess(specialFundId) - ElNotification({ - title: '提示', - message: msg, - type: code === 1000 ? 'success' : 'error' - }) if (code === 1000) { fundData.value = data loading.value = false @@ -39,6 +34,11 @@ const getDetail = async () => { showTable.value = true }) }else { + ElNotification({ + title: '提示', + message: msg, + type: 'error' + }) loading.value = false } }