diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue index d2b79e8..417f16c 100644 --- a/src/views/project-demand/summary/add.vue +++ b/src/views/project-demand/summary/add.vue @@ -434,6 +434,7 @@ import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.v import {getFormInfo, getInfo} from "@/api/project-demand"; import {getFundOption} from "@/api/special-fund"; import UserPicker from "@/views/workflow/process/common/UserPicker.vue"; +import {nextTick} from "vue"; const authStore = useAuthStore() const changeDiagram = ref(false) @@ -517,6 +518,7 @@ watch(() => singleList.value, (newVal) => { }, {deep: true}) localStorage.removeItem('originallySelectedList') if (name.value === 'Summary/edit') { + } else { if (localStorage.getItem('collectData')) { let collectData = JSON.parse(localStorage.getItem('collectData')) @@ -548,6 +550,14 @@ const changeRequirement=async ()=>{ const changeCollectData = () => { if (name.value === 'Summary/edit') { // params.fileList= attachment.value.allFileList + let params = { + ...formData.value, + deploymentId: deploymentId.value, + fileList: [], + requirementId: route.query.id ? route.query.id : formData.value.requirementId ? formData.value.requirementId : null + } + params.fileList = otherFileList.value + localStorage.setItem(`collectResubmitData-${route.query.projectId}`, JSON.stringify(params)) } else { let params = { ...formData.value, @@ -721,6 +731,9 @@ const handleSubmit = debounce(async (instance) => { } if (formData.value.isSpecialFund && !formData.value.specialFund) { formData.value.specialFund = getFundName(formData.value.specialFundId) + }else{ + formData.value.specialFundId=0 + formData.value.specialFund=null } if (formData.value.masterProjectId) { formData.value.masterProjectName = getProjectName(formData.value.masterProjectId) @@ -781,6 +794,9 @@ const handleResubmit = debounce((instance) => { formData.value.optionalChargeLeadership = optionalChargeLeadershipList.value if (formData.value.isSpecialFund && !formData.value.specialFund) { formData.value.specialFund = getFundName(formData.value.specialFundId) + }else{ + formData.value.specialFundId=0 + formData.value.specialFund=null } if (formData.value.masterProjectId) { formData.value.masterProjectName = getProjectName(formData.value.masterProjectId) @@ -817,8 +833,8 @@ const handleResubmit = debounce((instance) => { router.push({ name: 'Summary' }) - // localStorage.removeItem('collectData') } + localStorage.removeItem(`collectResubmitData-${route.query.projectId}`) }) }) }) @@ -835,6 +851,22 @@ const getDetailInfo = async () => { opentionData.value = res.data optionalChargeLeadershipList.value = formData.value.optionalChargeLeadership loading.value = false + + if (name.value === 'Summary/edit') { + if (localStorage.getItem(`collectResubmitData-${route.query.projectId}`)) { + let collectResubmitData = JSON.parse(localStorage.getItem(`collectResubmitData-${route.query.projectId}`)) + + if(formData.value.projectId==collectResubmitData.projectId){ + if (collectResubmitData.fileList) { + otherFileList.value = collectResubmitData.fileList + } + if (collectResubmitData.optionalChargeLeadership) { + optionalChargeLeadershipList.value = collectResubmitData.optionalChargeLeadership + } + formData.value = collectResubmitData + } + } + } }else{ loading.value = false ElNotification({