Merge pull request 'fix : 修复页面' (#135) from dd into master

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

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: {},
 })
 

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: '',

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();

src/views/workflow/common/InstanceDetails.vue

@@ -95,4 +95,4 @@ defineExpose({
   init
 })
 
-</script>
+</script>

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">