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

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

src/views/projectdemand/demandcollection/add.vue

@@ -44,7 +44,7 @@
     <file-upload @getFile="getFile"/>
     <div class="approval-record">
       <baseTitle title="流程"></baseTitle>
-      <process-diagram-viewer mode="view" v-if="processDiagramViewer" />
+      <process-diagram-viewer mode="view" v-if="processDiagramViewer"/>
       <!--      <div class="process" id="approvalRecord">-->
       <!--        <process-tree ref="processTree" mode="view" id-name="approvalRecord"/>-->
       <!--      </div>-->
@@ -58,19 +58,20 @@
 
 <script setup lang="jsx">
 import {useProcessStore} from '@/stores/processStore.js';
-import {getWorkflowInfo, addRequirement,getInfo} from "@/api/project-demand/index.js";
+import {getWorkflowInfo, addRequirement, getInfo} from "@/api/project-demand/index.js";
 import FileUpload from "@/components/FileUpload.vue";
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
 import {ElMessage} from "element-plus";
-import {useRoute,useRouter} from 'vue-router'
+import {useRoute, useRouter} from 'vue-router'
 
 const router = useRouter()
 const route = useRoute()
 const dateValue = ref()
-let formData = reactive({
+const formData = ref({
   requirementName: '',
   companyIds: '',
   collectType: '',
+  deadline: '',
   collectExplain: ''
 })
 const processDiagramViewer = ref(false)
@@ -106,14 +107,12 @@ const processStore = useProcessStore()
 const processInstanceData = ref()
 
 const getFile = (val) => {
-  console.log('fileList', val)
   fileList.value = val
 }
 
 const init = async () => {
   getWorkflowInfo().then(res => {
     let data = res.data
-    console.log('res2', res)
     processInstanceData.value = data
     processStore.setDesign(data)
     processStore.runningList.value = data.runningList;
@@ -128,16 +127,12 @@ const init = async () => {
 }
 
 const handleSubmit = () => {
-  console.log(formData, "formData")
+  console.log(formData.value, "formData.value")
   addRequirement({
-    "collectExplain": formData.collectExplain,
+    ...formData.value,
-    "collectType": formData.collectType,
+    requirementId: 0,
-    "companyIds": formData.companyIds,
+    files: fileList.value,
-    "files": fileList.value,
+    deploymentId: processInstanceData.value.deploymentId
-    "deadline": formData.deadline,
-    "requirementId": 0,
-    "requirementName": formData.requirementName,
-    "deploymentId": processInstanceData.value.deploymentId
   }).then(res => {
     if (res.code === 1000) {
       ElMessage.success(res.msg)
@@ -153,8 +148,7 @@ const getDetailInfo = async () => {
   getInfo(route.query.id).then(res => {
     if (res.code === 1000) {
       ElMessage.success(res.msg)
-      console.log('res.data',res.data.formData)
+      formData.value = res.data.formData
-      formData=res.data.formData
     } else {
       ElMessage.error(res.msg)
     }
@@ -170,12 +164,12 @@ watch(localData, (val) => {
   menuTree.value.filter(val.filterText)
 })
 
-onMounted( async ()=>{
+onMounted(async () => {
   loading.value = true
   await init()
-  // if(route.query.id) {
+  if (route.query.id) {
-  //   await getDetailInfo()
+    await getDetailInfo()
-  // }
+  }
   loading.value = false
 })
 
@@ -187,7 +181,8 @@ onMounted( async ()=>{
   //justify-content: space-between;
   overflow-x: hidden;
   overflow-y: auto;
-  .approval-record{
+
+  .approval-record {
     position: relative;
   }
 }