Merge pull request 'fix : 修复需求上报预期成果形式回显' (#499) from dd into master

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/499

src/views/project-demand/summary/add.vue

@@ -415,14 +415,6 @@ const handleSubmit = debounce(async (instance) => {
     if (formData.value.singleFile !== undefined) {
       formData.value.singleFile = getFileParam(formData.value.singleFile)
     }
-    formData.value.resultForm=JSON.stringify(formData.value.resultForm)
-    let params = {
-      ...formData.value,
-      deploymentId: deploymentId.value,
-      fileList: otherFiles,
-      requirementId: route.query.id ? route.query.id : '-1'
-    }
-    console.log('params', params)
     if (!attachment.value.isSingleFile) {
       attachment.value.validate()
       ElNotification({
@@ -432,8 +424,17 @@ const handleSubmit = debounce(async (instance) => {
       })
       return;
     } else {
+      formData.value.resultForm=JSON.stringify(formData.value.resultForm)
       attachment.value.clearValidate()
     }
+    let params = {
+      ...formData.value,
+      deploymentId: deploymentId.value,
+      fileList: otherFiles,
+      requirementId: route.query.id ? route.query.id : '-1'
+    }
+    console.log('params', params)
+
     let res = await requirementReported(params)
     ElNotification({
       title: '提示',
@@ -464,12 +465,12 @@ const handleResubmit = debounce(() => {
     })
     return;
   } else {
+    formData.value.resultForm=JSON.stringify(formData.value.resultForm)
     attachment.value.clearValidate()
   }
   if (formData.value.isSpecialFund && formData.value.specialFund === null) {
     formData.value.specialFund = getFundName(formData.value.specialFundId)
   }
-  formData.value.resultForm=JSON.stringify(formData.value.resultForm)
   let params = {
     ...formData.value,
     deploymentId: deploymentId.value,