Merge branch 'master' of http://192.168.1.22:3000/frontend/admin-sjzx

# Conflicts:
#	src/views/pqs/task/myTask/index.vue

src/views/pqs/task/myTask/index.vue

@@ -3,8 +3,13 @@
     <div class="default-main">
         <TableHeader>
             <template v-slot:select>
-                <el-form-item label="筛选数据">
-                    <el-input v-model="tableStore.table.params.name" clearable placeholder="筛选数据" />
+                <el-form-item label='流程名称'>
+                    <el-input v-model='tableStore.table.params.name' clearable placeholder='流程名称' />
+                </el-form-item>
+                <el-form-item label='流程分类'>
+                    <el-select v-model="tableStore.table.params.searchState" clearable placeholder="请选择流程分类">
+                        <el-option v-for="item in categoryList" :key="item.id" :label="item.name" :value="item.id" />
+                    </el-select>
                 </el-form-item>
             </template>
         </TableHeader>
@@ -15,7 +20,7 @@
     </div>
 </template>
 
-<script setup lang="ts">
+<script setup lang='ts'>
 import { ElMessage } from 'element-plus'
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
@@ -36,11 +41,20 @@ const tableStore = new TableStore({
     url: '/process-boot/flowable/task/myProcess',
     method: 'GET',
     column: [
+        { title: '序号', type: 'seq',width: 60 },
+        { title: '流程名称', field: 'procDefName', width: 200 },
+        { title: '流程类别', field: 'category', width: 200 },
+        { title: '流程版本', field: 'procDefVersion' },
+        { title: '提交时间', field: 'createTime' },
         {
-            title: '序号',
-            width: 60,
-            formatter: (row: any) => {
-                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            title: '流程状态', field: 'finishTime',
+            render: 'tag',
+            custom: {
+                0: 'warning',
+                1: 'success'
+            },
+            formatter(row: any) {
+                return row.finishTime == null ? 0 : 1
             }
         },
         { title: '流程名称', field: 'procDefName', width: 200 },