Merge pull request 'fix : 首页待办列表' (#136) from dd into master

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

src/views/home/index.vue

@@ -105,25 +105,30 @@ const todoNum = ref(20)
 const tableConfig = reactive({
   columns: [
     {
-      prop: 'taskId',
-      label: '单据编号',
+      prop: 'processName',
+      label: '流程名称',
       align: 'center',
     },
     {
-      prop: 'nickName',
-      label: '消息主题',
+      prop: 'initiatorName',
+      label: '发起人',
       align: 'center',
     },
     {
-      prop: 'type',
+      prop: 'state',
       label: '类型',
       align: 'center',
       showOverflowTooltip: false,
       currentRender: ({row, index}) => (<Tag dictType={'todo_type'} value={row.state}/>)
     },
     {
-      prop: 'createTime',
-      label: '创建时间',
+      prop: 'submitTime',
+      label: '提交时间',
+      align: 'center',
+    },
+    {
+      prop: 'taskName',
+      label: '当前节点',
       align: 'center',
     },
     {

src/views/projectdemand/demandcollection/add.vue

@@ -7,7 +7,7 @@
           <el-input v-model="fromData.name" placeholder="请输入名称" clearable></el-input>
         </el-form-item>
         <el-form-item label="所属公司" prop="company">
-          <el-select v-model="fromData.company" placeholder="登录状态" clearable filterable>
+          <el-select v-model="fromData.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="fromData.type" placeholder="登录状态" clearable filterable>
+          <el-select v-model="fromData.type" placeholder="征集类型" clearable filterable>
             <el-option
                 v-for="item in typeOption"
                 :key="item.value"
@@ -67,7 +67,10 @@ import {getWorkflowInfo, addRequirement} from "@/api/project-demand/index.js";
 import FileUpload from "../../../components/FileUpload.vue";
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
 import {useProcessStore} from '@/stores/processStore.js';
+import {ElMessage} from "element-plus";
+import {useRouter} from 'vue-router'
 
+const router = useRouter()
 const dateValue = ref()
 const fromData = reactive({
   name: '',
@@ -214,17 +217,24 @@ const init = async () => {
 
 
 const handleSubmit = () => {
-  console.log(fromData,"fromData")
+  console.log(fromData, "fromData")
   addRequirement({
     "collectExplain": "需求说明",
     "collectType": "征集类型",
-    "companyIds": [22,23,24],
+    "companyIds": [22, 23, 24],
     "files": [],
     "requirementId": 0,
     "requirementName": "测试需求征集20240519001",
     "deploymentId": "1817079f-0f74-11ef-8b96-f268fc747b04"
-  }).then(res=>{
-
+  }).then(res => {
+    if (res.code === 1000) {
+      ElMessage.success(res.msg)
+      router.push({
+        path: '/projectdemand/demandcollection'
+      })
+    } else {
+      ElMessage.error(res.msg)
+    }
   })
 }