From 9c6c494b8059f0af712262ac622a5141b722b08b Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 11 May 2024 21:37:15 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/index.vue                            |  4 ++--
 src/views/projectdemand/demandcollection/add.vue    | 10 +++++-----
 src/views/projectdemand/demandcollection/detail.vue |  5 +++--
 src/views/workflow/common/InstanceDetails.vue       |  2 +-
 src/views/workflow/common/OperationRender.vue       |  1 +
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 3a37363..bd72a33 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -105,7 +105,7 @@ const todoNum = ref(20)
 const tableConfig = reactive({
   columns: [
     {
-      prop: 'userName',
+      prop: 'taskId',
       label: '单据编号',
       align: 'center',
     },
@@ -143,7 +143,7 @@ const tableConfig = reactive({
       }
     }
   ],
-  api: '',
+  api: '/workflow/process/task',
   params: {},
 })
 
diff --git a/src/views/projectdemand/demandcollection/add.vue b/src/views/projectdemand/demandcollection/add.vue
index 3a80b0a..88234cb 100644
--- a/src/views/projectdemand/demandcollection/add.vue
+++ b/src/views/projectdemand/demandcollection/add.vue
@@ -1,13 +1,13 @@
 <template>
   <div v-loading="loading" class="add-block">
     <baseTitle title="需求征集信息录入"></baseTitle>
-    <el-form :model="queryParams" inline class="query-form" ref="demandForm">
+    <el-form :model="demandInfo" inline class="query-form" ref="demandForm">
       <div class="left-info">
         <el-form-item label="名称" prop="name">
-          <el-input v-model="queryParams.name" placeholder="请输入名称" clearable></el-input>
+          <el-input v-model="demandInfo.name" placeholder="请输入名称" clearable></el-input>
         </el-form-item>
         <el-form-item label="所属公司" prop="company">
-          <el-select v-model="queryParams.company" placeholder="登录状态" clearable filterable>
+          <el-select v-model="demandInfo.company" placeholder="登录状态" clearable filterable>
             <el-option
                 v-for="item in companyOption"
                 :key="item.value"
@@ -17,7 +17,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="征集类型" prop="type">
-          <el-select v-model="queryParams.type" placeholder="登录状态" clearable filterable>
+          <el-select v-model="demandInfo.type" placeholder="登录状态" clearable filterable>
             <el-option
                 v-for="item in typeOption"
                 :key="item.value"
@@ -73,7 +73,7 @@ import ProcessTree from '@/views/workflow/process/ProcessTree.vue';
 import {useProcessStore} from '@/stores/processStore.js';
 
 const dateValue = ref()
-const queryParams = reactive({
+const demandInfo = reactive({
   name: '',
   company: '',
   type: '',
diff --git a/src/views/projectdemand/demandcollection/detail.vue b/src/views/projectdemand/demandcollection/detail.vue
index 8dab32e..f89771e 100644
--- a/src/views/projectdemand/demandcollection/detail.vue
+++ b/src/views/projectdemand/demandcollection/detail.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="detail-block">
-    <el-form :model="form" label-width="auto">
+    <el-form :model="formData" label-width="auto">
       <baseTitle title="需求征集详情"></baseTitle>
       <div class="left-info">
         <el-row>
@@ -63,7 +63,7 @@
         <baseTitle title="审批记录"></baseTitle>
         <div class="process">
           <operation-render :operation-list="processInstanceData.operationList"
-                            :state="'1'"/>
+                            :state="'4'"/>
 <!--          <process-diagram-viewer v-if="processDiagramViewer"/>-->
         </div>
       </div>
@@ -82,6 +82,7 @@ import OperationRender from '@/views/workflow/common/OperationRender.vue'
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
 import {useProcessStore} from '@/stores/processStore.js';
 import {getInfo} from "@/api/project-demand/index.js";
+import {CircleCheckFilled, Close, Loading, MoreFilled} from "@element-plus/icons-vue";
 
 const route = useRoute()
 const form = ref();
diff --git a/src/views/workflow/common/InstanceDetails.vue b/src/views/workflow/common/InstanceDetails.vue
index 8e66901..0e0cadd 100644
--- a/src/views/workflow/common/InstanceDetails.vue
+++ b/src/views/workflow/common/InstanceDetails.vue
@@ -95,4 +95,4 @@ defineExpose({
   init
 })
 
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/workflow/common/OperationRender.vue b/src/views/workflow/common/OperationRender.vue
index 1a1b139..e415143 100644
--- a/src/views/workflow/common/OperationRender.vue
+++ b/src/views/workflow/common/OperationRender.vue
@@ -7,6 +7,7 @@
                         :color="operation.color"
                         size="large"
                         placement="top">
+
         <el-card>
           <div style="display: flex;">
             <div v-for="(user,index) in operation.userInfo" :key="index" class="avatar_name">