Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
phsl
/
admin
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
62a95381
authored
Oct 10, 2023
by
youkehai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 减签按钮显示和api地址修改
parent
683e319c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
5 deletions
+18
-5
src/api/bpm/task/index.ts
+2
-2
src/views/bpm/processInstance/detail/ProcessInstanceChildrenTaskList.vue
+15
-2
src/views/bpm/processInstance/detail/TaskSubSignDialogForm.vue
+1
-1
No files found.
src/api/bpm/task/index.ts
View file @
62a95381
...
@@ -69,8 +69,8 @@ export const taskAddSign = async (data) => {
...
@@ -69,8 +69,8 @@ export const taskAddSign = async (data) => {
/**
/**
* 获取减签任务列表
* 获取减签任务列表
*/
*/
export
const
get
SubSig
nTaskList
=
async
(
id
:
string
)
=>
{
export
const
get
Childre
nTaskList
=
async
(
id
:
string
)
=>
{
return
await
request
.
get
({
url
:
'/bpm/task/get-
sub-sign
?taskId='
+
id
})
return
await
request
.
get
({
url
:
'/bpm/task/get-
children-task-list
?taskId='
+
id
})
}
}
/**
/**
...
...
src/views/bpm/processInstance/detail/ProcessInstanceChildrenTaskList.vue
View file @
62a95381
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
<el-drawer
v-model=
"drawerVisible"
title=
"子任务"
size=
"70%"
>
<el-drawer
v-model=
"drawerVisible"
title=
"子任务"
size=
"70%"
>
<template
#
header
>
<template
#
header
>
<h4>
【
{{
baseTask
.
name
}}
】审批人:
{{
baseTask
.
assigneeUser
?.
nickname
}}
</h4>
<h4>
【
{{
baseTask
.
name
}}
】审批人:
{{
baseTask
.
assigneeUser
?.
nickname
}}
</h4>
<el-button
style=
"margin-left: 5px"
type=
"danger"
plain
@
click=
"handleSubSign(baseTask)"
>
<el-button
style=
"margin-left: 5px"
v-if=
"showSubSignButton(baseTask)"
type=
"danger"
plain
@
click=
"handleSubSign(baseTask)"
>
<Icon
icon=
"ep:remove"
/>
<Icon
icon=
"ep:remove"
/>
减签
减签
</el-button>
</el-button>
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
<el-table-column
label=
"操作"
prop=
"operation"
>
<el-table-column
label=
"操作"
prop=
"operation"
>
<
template
#
default=
"scope"
>
<
template
#
default=
"scope"
>
<el-button
<el-button
v-if=
"
!isEmpty(scope.row.children
)"
v-if=
"
showSubSignButton(scope.row
)"
type=
"danger"
type=
"danger"
plain
plain
@
click=
"handleSubSign(scope.row)"
@
click=
"handleSubSign(scope.row)"
...
@@ -83,4 +83,17 @@ const taskSubSignDialogForm = ref()
...
@@ -83,4 +83,17 @@ const taskSubSignDialogForm = ref()
const
handleSubSign
=
(
item
)
=>
{
const
handleSubSign
=
(
item
)
=>
{
taskSubSignDialogForm
.
value
.
open
(
item
.
id
)
taskSubSignDialogForm
.
value
.
open
(
item
.
id
)
}
}
/**
* 显示减签按钮
* @param task
*/
const
showSubSignButton
=
(
task
:
any
)
=>
{
if
(
!
isEmpty
(
task
.
children
)){
//有子任务,且子任务有任意一个是 待处理 和 待前置任务完成 则显示减签按钮
const
subTask
=
task
.
children
.
find
((
item
)
=>
item
.
result
===
1
||
item
.
result
===
9
)
return
!
isEmpty
(
subTask
)
}
return
false
}
</
script
>
</
script
>
src/views/bpm/processInstance/detail/TaskSubSignDialogForm.vue
View file @
62a95381
...
@@ -44,7 +44,7 @@ const formRef = ref() // 表单 Ref
...
@@ -44,7 +44,7 @@ const formRef = ref() // 表单 Ref
const
subTaskList
=
ref
([])
const
subTaskList
=
ref
([])
/** 打开弹窗 */
/** 打开弹窗 */
const
open
=
async
(
id
:
string
)
=>
{
const
open
=
async
(
id
:
string
)
=>
{
subTaskList
.
value
=
await
TaskApi
.
get
SubSig
nTaskList
(
id
)
subTaskList
.
value
=
await
TaskApi
.
get
Childre
nTaskList
(
id
)
if
(
isEmpty
(
subTaskList
.
value
))
{
if
(
isEmpty
(
subTaskList
.
value
))
{
message
.
warning
(
'当前没有可减签的任务'
)
message
.
warning
(
'当前没有可减签的任务'
)
return
false
return
false
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment