diff --git a/src/components/DetailComponent/SummaryDetail.vue b/src/components/DetailComponent/SummaryDetail.vue index da790e8..8ded615 100644 --- a/src/components/DetailComponent/SummaryDetail.vue +++ b/src/components/DetailComponent/SummaryDetail.vue @@ -9,7 +9,7 @@ - {{localFormData.specialFund }} + {{localFormData.specialFundId===0?localFormData.specialFund:changeName(fundOption,localFormData.specialFundId) }} diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue index 57ada02..1aaf3bc 100644 --- a/src/views/project-demand/summary/add.vue +++ b/src/views/project-demand/summary/add.vue @@ -10,18 +10,18 @@ - + - + {{ formData.specialFund }} - + { const getIsFund = async () => { if (!route.query.id) return; - loading.value = true + // loading.value = true await getFormInfo(route.query.id).then(res => { if (res.code === 1000) { - loading.value = false + // loading.value = false formData.value.isSpecialFund = res.data.isSpecialFund if (res.data.isSpecialFund) { res.data.specialFundId = getSpecialFundId(res.data.specialFund) @@ -428,7 +428,7 @@ const handleResubmit = debounce(() => { otherFiles.push(getFileParam(item)) }) } - if (attachment.value.singleFile==null) { + if (attachment.value.singleFile == null) { attachment.value.validate() ElNotification({ title: '提示', @@ -436,7 +436,7 @@ const handleResubmit = debounce(() => { type: 'error' }) return; - } else{ + } else { attachment.value.clearValidate() } let params = { @@ -475,17 +475,26 @@ const getDetailInfo = async () => { } }) } +const specialFundChange = () => { + processInfo() +} const init = async () => { + await getIsFund() loading.value = true const resFund = await getFundOption() specialFundOption.value = resFund.data const res = await getSubCompOpt() companyOption.value = res.data + await processInfo() + loading.value = false +} +const processInfo = () => { + processStore.setDesign(null) + processDiagramViewer.value=false getProcessInfo(formData.value.isSpecialFund).then(res => { if (res.code === 1000) { let data = res.data deploymentId.value = data.deploymentId - loading.value = false processStore.setDesign(data) processStore.runningList.value = data.runningList; processStore.endList.value = data.endList; @@ -495,7 +504,6 @@ const init = async () => { nextTick(() => { processDiagramViewer.value = true }) - getIsFund() } else { ElNotification({ title: '提示', @@ -506,10 +514,10 @@ const init = async () => { }) } onMounted(async () => { - await init() if (route.query.projectId) { await getDetailInfo() } + await init() }) const staging = async () => { }