Merge remote-tracking branch 'origin/master'

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

@@ -412,14 +412,14 @@ const handleSubmit = debounce(async (instance) => {
     if (formData.value.singleFile !== undefined) {
       formData.value.singleFile = getFileParam(formData.value.singleFile)
     }
-    formData.value.resultForm=formData.value.resultForm.map(item=>item).join(',')
+    // formData.value.resultForm=formData.value.resultForm?.map(item=>item).join(',')
     let params = {
       ...formData.value,
       deploymentId: deploymentId.value,
       fileList: otherFiles,
       requirementId: route.query.id ? route.query.id : '-1'
     }
-    // console.log('params', params)
+    console.log('params', params)
     if (!attachment.value.isSingleFile) {
       attachment.value.validate()
       ElNotification({
@@ -466,12 +466,12 @@ const handleResubmit = debounce(() => {
   if (formData.value.isSpecialFund && formData.value.specialFund === null) {
     formData.value.specialFund = getFundName(formData.value.specialFundId)
   }
-  formData.value.resultForm=formData.value.resultForm.map(item=>item).join(',')
+  // formData.value.resultForm=formData.value.resultForm?.map(item=>item).join(',')
   let params = {
     ...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 => {

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

@@ -304,7 +304,7 @@ const handleEdit = (row) => {
   router.push({
     name: 'Summary/edit',
     query: {
-      requirementId: row.requirementId,
+      // requirementId: row.requirementId,
       projectId: row.projectId
     }
   })