Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/api/project-demand/index.js
#	src/views/projectdemand/demandcollection/add.vue

src/views/projectdemand/demandcollection/add.vue

@@ -65,6 +65,7 @@
     </div>
     <div class="oper-page-btn">
       <el-button color="#DED0B2" @click="handleSubmit">提交</el-button>
+      <el-button color="#DED0B2" @click="handleResubmit">重新提交</el-button>
       <el-button @click="handleBack">返回</el-button>
     </div>
   </div>
@@ -73,7 +74,7 @@
 <script setup lang="jsx">
 import {useAuthStore} from '@/stores/userstore.js'
 import {useProcessStore} from '@/stores/processStore.js';
-import {getWorkflowInfo, addRequirement, getInfo} from "@/api/project-demand/index.js";
+import {getWorkflowInfo, addRequirement, getFormInfo,resubmit} 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";
@@ -164,6 +165,8 @@ const getFile = (val) => {
     fileList.value = newFileArray
   }
 }
+
+
 const init = async () => {
   const res = await getSubCompOpt()
   companyOption.value = res.data
@@ -218,9 +221,11 @@ const handleSubmit = () => {
   }
 }
 const getDetailInfo = async () => {
-  getInfo(route.query.id).then(res => {
+  getFormInfo(route.query.id).then(res => {
     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