Skip to content

phsl / admin

Go to a project
Commit 7993c32f by 芋道源码 Committed by Gitee
Options

!716 修复流程模块相关问题 

Merge pull request !716 from huchao/master
parents 3154aa75 8c9bf457
Showing with 10 additions and 10 deletions
src/views/bpm/processInstance/index.vue
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
<Icon icon="ep:plus" class="mr-5px" />高级筛选 <Icon icon="ep:plus" class="mr-5px" />高级筛选
</el-button> </el-button>
</template> </template>
<el-form-item label="流程发起人" class="bold-label" label-position="top" prop="category"> <!-- <el-form-item label="流程发起人" class="bold-label" label-position="top" prop="category">
<el-select <el-select
v-model="queryParams.category" v-model="queryParams.category"
placeholder="请选择流程发起人" placeholder="请选择流程发起人"
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
:value="category.code" :value="category.code"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item <el-form-item
label="所属流程" label="所属流程"
class="bold-label" class="bold-label"
......
src/views/bpm/task/done/index.vue
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
</el-button> </el-button>
</template> </template>
<el-form-item label="流程发起人" class="bold-label" label-position="top" prop="category"> <!-- <el-form-item label="流程发起人" class="bold-label" label-position="top" prop="category">
<el-select <el-select
v-model="queryParams.category" v-model="queryParams.category"
placeholder="请选择流程发起人" placeholder="请选择流程发起人"
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
:value="category.code" :value="category.code"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item label="发起时间" class="bold-label" label-position="top" prop="createTime"> <el-form-item label="发起时间" class="bold-label" label-position="top" prop="createTime">
<el-date-picker <el-date-picker
v-model="queryParams.createTime" v-model="queryParams.createTime"
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,7 @@
{{ formatPast2(scope.row.durationInMillis) }} {{ formatPast2(scope.row.durationInMillis) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="流程编号" prop="id" :show-overflow-tooltip="true" /> <el-table-column align="center" label="流程编号" prop="processInstanceId" :show-overflow-tooltip="true" />
<el-table-column align="center" label="任务编号" prop="id" :show-overflow-tooltip="true" /> <el-table-column align="center" label="任务编号" prop="id" :show-overflow-tooltip="true" />
<el-table-column align="center" label="操作" fixed="right" width="80"> <el-table-column align="center" label="操作" fixed="right" width="80">
<template #default="scope"> <template #default="scope">
...@@ -193,7 +193,7 @@ import { dateFormatter, formatPast2 } from '@/utils/formatTime' ...@@ -193,7 +193,7 @@ import { dateFormatter, formatPast2 } from '@/utils/formatTime'
import * as TaskApi from '@/api/bpm/task' import * as TaskApi from '@/api/bpm/task'
import { CategoryApi, CategoryVO } from '@/api/bpm/category' import { CategoryApi, CategoryVO } from '@/api/bpm/category'
defineOptions({ name: 'BpmTodoTask' }) defineOptions({ name: 'BpmDoneTask' })
const { push } = useRouter() // 路由 const { push } = useRouter() // 路由
......
src/views/bpm/task/manager/index.vue
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
{{ formatPast2(scope.row.durationInMillis) }} {{ formatPast2(scope.row.durationInMillis) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="流程编号" prop="id" :show-overflow-tooltip="true" /> <el-table-column align="center" label="流程编号" prop="processInstanceId" :show-overflow-tooltip="true" />
<el-table-column align="center" label="任务编号" prop="id" :show-overflow-tooltip="true" /> <el-table-column align="center" label="任务编号" prop="id" :show-overflow-tooltip="true" />
<el-table-column align="center" label="操作" fixed="right" width="80"> <el-table-column align="center" label="操作" fixed="right" width="80">
<template #default="scope"> <template #default="scope">
......
src/views/bpm/task/todo/index.vue
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
</el-button> </el-button>
</template> </template>
<el-form-item label="流程发起人" class="bold-label" label-position="top" prop="category"> <!-- <el-form-item label="流程发起人" class="bold-label" label-position="top" prop="category">
<el-select <el-select
v-model="queryParams.category" v-model="queryParams.category"
placeholder="请选择流程发起人" placeholder="请选择流程发起人"
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
:value="category.code" :value="category.code"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item label="发起时间" class="bold-label" label-position="top" prop="createTime"> <el-form-item label="发起时间" class="bold-label" label-position="top" prop="createTime">
<el-date-picker <el-date-picker
v-model="queryParams.createTime" v-model="queryParams.createTime"
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
prop="createTime" prop="createTime"
width="180" width="180"
/> />
<el-table-column align="center" label="流程编号" prop="id" :show-overflow-tooltip="true" /> <el-table-column align="center" label="流程编号" prop="processInstanceId" :show-overflow-tooltip="true" />
<el-table-column align="center" label="任务编号" prop="id" :show-overflow-tooltip="true" /> <el-table-column align="center" label="任务编号" prop="id" :show-overflow-tooltip="true" />
<el-table-column align="center" label="操作" fixed="right" width="80"> <el-table-column align="center" label="操作" fixed="right" width="80">
<template #default="scope"> <template #default="scope">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment