From 6c27a5f954f37db6289910a3d3e5876f7090841f Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 11 May 2024 18:06:25 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E5=AF=B9=E6=8E=A5=E9=9C=80=E6=B1=82?=
 =?UTF-8?q?=E5=BE=81=E9=9B=86=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectdemand/demandcollection/detail.vue | 12 ++++++------
 src/views/projectdemand/demandcollection/index.vue  |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/projectdemand/demandcollection/detail.vue b/src/views/projectdemand/demandcollection/detail.vue
index 10c1b04..aaa074b 100644
--- a/src/views/projectdemand/demandcollection/detail.vue
+++ b/src/views/projectdemand/demandcollection/detail.vue
@@ -10,13 +10,13 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="名称">
-                  <span>{{ formData.requirementName }}</span>
+                <el-form-item label="所属公司">
+                  <span>{{ formData.affiliatedCompany }}</span>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="名称">
-                  <span>{{ formData.requirementName }}</span>
+                <el-form-item label="征集类型">
+                  <span>{{ formData.collectType }}</span>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -79,7 +79,7 @@ import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.v
 import {useProcessStore} from '@/stores/processStore.js';
 import {getInfo} from "@/api/project-demand/index.js";
 import {ElMessage} from "element-plus";
-
+const route = useRoute()
 const form = ref();
 const processStore = useProcessStore()
 const processInstanceData = ref()
@@ -119,7 +119,7 @@ const tableConfig = reactive({
   api: ''
 })
 const getTree = async () => {
-  getInfo(10).then(res => {
+  getInfo(route.query.id).then(res => {
     let data = res.data
     formData.value = data.formData;
     processInstanceData.value = data
diff --git a/src/views/projectdemand/demandcollection/index.vue b/src/views/projectdemand/demandcollection/index.vue
index 14ce54d..0fa62b4 100644
--- a/src/views/projectdemand/demandcollection/index.vue
+++ b/src/views/projectdemand/demandcollection/index.vue
@@ -124,7 +124,7 @@ const handleDetail = (row) => {
   router.push({
     path: '/projectdemand/demanddetail',
     query: {
-      id: row.roleId
+      id: row.requirementId
     }
   })
 }