diff --git a/src/components/DetailComponent/SummaryDetail.vue b/src/components/DetailComponent/SummaryDetail.vue index 7e87e27..4d9b23f 100644 --- a/src/components/DetailComponent/SummaryDetail.vue +++ b/src/components/DetailComponent/SummaryDetail.vue @@ -292,8 +292,8 @@ const filterDict = (data, value) => { if (data === undefined || value === undefined) return; let label = '' let result = [] - if (JSON.parse(value) instanceof Array) { - JSON.parse(value).forEach(item1 => { + if (value instanceof Array) { + value.forEach(item1 => { data.find(item => { if (item.value == item1) { result.push(item.label) diff --git a/src/views/project-demand/summary/add.vue b/src/views/project-demand/summary/add.vue index bf76f2a..0e29d7d 100644 --- a/src/views/project-demand/summary/add.vue +++ b/src/views/project-demand/summary/add.vue @@ -424,7 +424,7 @@ const handleSubmit = debounce(async (instance) => { }) return; } else { - formData.value.resultForm=JSON.stringify(formData.value.resultForm) + // formData.value.resultForm=JSON.stringify(formData.value.resultForm) attachment.value.clearValidate() } let params = { @@ -465,7 +465,7 @@ const handleResubmit = debounce(() => { }) return; } else { - formData.value.resultForm=JSON.stringify(formData.value.resultForm) + // formData.value.resultForm=JSON.stringify(formData.value.resultForm) attachment.value.clearValidate() } if (formData.value.isSpecialFund && formData.value.specialFund === null) { @@ -475,7 +475,7 @@ const handleResubmit = debounce(() => { ...formData.value, deploymentId: deploymentId.value, fileList: otherFiles, - requirementId: route.query.requirementId ? route.query.requirementId : '-1' + requirementId: route.query.id ? route.query.id : '-1' } // console.log('重新提交params', params, formData.value.specialFund, formData.value.specialFundId) resubmitReported(params).then(res => { @@ -503,7 +503,7 @@ const getDetailInfo = async () => { }) if (res.code === 1000) { res.data.formData.specialFundId = res.data.formData.specialFundId === 0 ? null : res.data.formData.specialFundId - res.data.formData.resultForm = JSON.parse(res.data.formData.resultForm) + // res.data.formData.resultForm = JSON.parse(res.data.formData.resultForm) formData.value = res.data.formData loading.value = false } diff --git a/src/views/project-demand/summary/index.vue b/src/views/project-demand/summary/index.vue index 3b8c7b1..a1d1c4d 100644 --- a/src/views/project-demand/summary/index.vue +++ b/src/views/project-demand/summary/index.vue @@ -342,7 +342,7 @@ const handleEdit = (row) => { router.push({ name: 'Summary/edit', query: { - requirementId: row.requirementId, + id: row.requirementId, projectId: row.projectId } })