Merge pull request 'fix : 修复编辑数据回显功能' (#154) from dj into master

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

src/views/projectdemand/demandcollection/add.vue

@@ -74,7 +74,7 @@
 <script setup lang="jsx">
 import {useAuthStore} from '@/stores/userstore.js'
 import {useProcessStore} from '@/stores/processStore.js';
-import {getWorkflowInfo, addRequirement, getFormInfo,resubmit,deleteFile} from "@/api/project-demand/index.js";
+import {getWorkflowInfo, addRequirement, getFormInfo, resubmit, deleteFile} from "@/api/project-demand/index.js";
 import FileUpload from "@/components/FileUpload.vue";
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
 import {ElMessage, ElMessageBox} from "element-plus";
@@ -122,41 +122,31 @@ const loading = ref(false)
 const processStore = useProcessStore()
 const processInstanceData = ref()
 
+const compositeParam=(item)=>{
+    return  {
+      fileId: item.id,
+      size: item.size,
+      fileName: item.fileName,
+      fileType: item.fileType,
+      url: item.url,
+      processNodeTag: null,
+      tag: formData.value.collectType,
+      userId: authStore.userinfo.userId
+    }
+}
 const getFile = (val) => {
-  console.log('val', val, route.query.isAdd)
-  if (route.query.isAdd == undefined) {
-    // showTable.value = true
-    let fileObj = {}
-    let newFileArray = []
+  let fileObj = {}
+  let newFileArray = []
+  if (route.query.isAdd === undefined) {
     val.forEach(item => {
-      fileObj = {
-        fileId: item.id,
-        size: item.size,
-        fileName: item.fileName,
-        fileType: item.fileType,
-        url: item.url,
-        processNodeTag: null,
-        tag: formData.value.collectType,
-        userId: authStore.userinfo.userId
-      }
+      fileObj =compositeParam(item)
       newFileArray.push(fileObj)
       formData.value.fileList.push(fileObj)
     })
     fileList.value = formData.value.fileList
   } else {
-    let fileObj = {}
-    let newFileArray = []
     val.forEach(item => {
-      fileObj = {
-        fileId: item.id,
-        size: item.size,
-        fileName: item.fileName,
-        fileType: item.fileType,
-        url: item.url,
-        processNodeTag: null,
-        tag: formData.value.collectType,
-        userId: authStore.userinfo.userId
-      }
+      fileObj =compositeParam(item)
       newFileArray.push(fileObj)
     })
     formData.value.fileList = newFileArray
@@ -164,7 +154,6 @@ const getFile = (val) => {
   }
 }
 
-
 const init = async () => {
   const res = await getSubCompOpt()
   companyOption.value = res.data
@@ -183,39 +172,26 @@ const init = async () => {
   })
 }
 
-const handleSubmit = () => {
-  if (route.query.isAdd == undefined) {
-    resubmit({
-      ...formData.value,
-      requirementId: 0,
-      files: fileList.value,
-      deploymentId: processInstanceData.value.deploymentId
-    }).then(res => {
-      if (res.code === 1000) {
-        ElMessage.success(res.msg)
-        router.push({
-          path: '/projectdemand/demandcollection'
-        })
-      } else {
-        ElMessage.error(res.msg)
-      }
-    })
-  }else {
-    addRequirement({
-      ...formData.value,
-      requirementId: 0,
-      files: fileList.value,
-      deploymentId: processInstanceData.value.deploymentId
-    }).then(res => {
-      if (res.code === 1000) {
-        ElMessage.success(res.msg)
-        router.push({
-          path: '/projectdemand/demandcollection'
-        })
-      } else {
-        ElMessage.error(res.msg)
-      }
+const handleSubmit = async () => {
+  let params = {
+    ...formData.value,
+    requirementId: 0,
+    files: fileList.value,
+    deploymentId: processInstanceData.value.deploymentId
+  }
+  let res
+  if (route.query.isAdd === undefined) {
+    res = await resubmit(params)
+  } else {
+    res = await addRequirement(params)
+  }
+  if (res.code === 1000) {
+    ElMessage.success(res.msg)
+    await router.push({
+      path: '/projectdemand/demandcollection'
     })
+  } else {
+    ElMessage.error(res.msg)
   }
 }
 const getDetailInfo = async () => {
@@ -223,11 +199,7 @@ const getDetailInfo = async () => {
     if (res.code === 1000) {
       console.log(res)
       ElMessage.success(res.msg)
-      // formData.value = res.data
-      formData.value = res.data.formData
-      // if (route.query.isAdd == undefined) {
-      //   showTable.value = true
-      // }
+      formData.value = res.data
     } else {
       ElMessage.error(res.msg)
     }