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
24514722
authored
Sep 24, 2023
by
YunaiV
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
code review:驳回逻辑
parent
ada93a16
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
20 deletions
+14
-20
src/api/bpm/task/index.ts
+3
-9
src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue
+10
-10
src/views/bpm/processInstance/detail/TaskReturnDialogForm.vue
+1
-1
No files found.
src/api/bpm/task/index.ts
View file @
24514722
...
@@ -42,18 +42,12 @@ export const exportTask = async (params) => {
...
@@ -42,18 +42,12 @@ export const exportTask = async (params) => {
return
await
request
.
download
({
url
:
'/bpm/task/export'
,
params
})
return
await
request
.
download
({
url
:
'/bpm/task/export'
,
params
})
}
}
/**
// 获取所有可回退的节点
* 获取所有可回退的节点
* @param params
*/
export
const
getReturnList
=
async
(
params
)
=>
{
export
const
getReturnList
=
async
(
params
)
=>
{
return
await
request
.
get
({
url
:
'/bpm/task/get-return-list'
,
params
})
return
await
request
.
get
({
url
:
'/bpm/task/get-return-list'
,
params
})
}
}
/**
// 回退
* 确认回退
export
const
returnTask
=
async
(
data
)
=>
{
* @param params
*/
export
const
okReturnTask
=
async
(
data
)
=>
{
return
await
request
.
put
({
url
:
'/bpm/task/return'
,
data
})
return
await
request
.
put
({
url
:
'/bpm/task/return'
,
data
})
}
}
src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue
View file @
24514722
...
@@ -249,7 +249,7 @@ const getResultCss = (result) => {
...
@@ -249,7 +249,7 @@ const getResultCss = (result) => {
return
'highlight-cancel'
return
'highlight-cancel'
}
else
if
(
result
===
5
)
{
}
else
if
(
result
===
5
)
{
// 退回
// 退回
return
'highlight-r
ollback
'
return
'highlight-r
eturn
'
}
}
return
''
return
''
}
}
...
@@ -586,41 +586,41 @@ watch(
...
@@ -586,41 +586,41 @@ watch(
}
}
/** 回退 */
/** 回退 */
.highlight-r
ollback
.djs-shape
.djs-visual
>
:nth-child
(
1
)
{
.highlight-r
eturn
.djs-shape
.djs-visual
>
:nth-child
(
1
)
{
fill
:
#e6a23c
!important
;
fill
:
#e6a23c
!important
;
stroke
:
#e6a23c
!important
;
stroke
:
#e6a23c
!important
;
fill-opacity
:
0.2
!important
;
fill-opacity
:
0.2
!important
;
}
}
.highlight-r
ollback
.djs-shape
.djs-visual
>
:nth-child
(
2
)
{
.highlight-r
eturn
.djs-shape
.djs-visual
>
:nth-child
(
2
)
{
fill
:
#e6a23c
!important
;
fill
:
#e6a23c
!important
;
}
}
.highlight-r
ollback
.djs-shape
.djs-visual
>
path
{
.highlight-r
eturn
.djs-shape
.djs-visual
>
path
{
fill
:
#e6a23c
!important
;
fill
:
#e6a23c
!important
;
fill-opacity
:
0.2
!important
;
fill-opacity
:
0.2
!important
;
stroke
:
#e6a23c
!important
;
stroke
:
#e6a23c
!important
;
}
}
.highlight-r
ollback
.djs-connection
>
.djs-visual
>
path
{
.highlight-r
eturn
.djs-connection
>
.djs-visual
>
path
{
stroke
:
#e6a23c
!important
;
stroke
:
#e6a23c
!important
;
}
}
.highlight-r
ollback
:not
(
.djs-connection
)
.djs-visual
>
:nth-child
(
1
)
{
.highlight-r
eturn
:not
(
.djs-connection
)
.djs-visual
>
:nth-child
(
1
)
{
fill
:
#e6a23c
!important
;
/* color elements as green */
fill
:
#e6a23c
!important
;
/* color elements as green */
}
}
:deep
(
.highlight-r
ollback
.djs-shape
.djs-visual
>
:nth-child
(
1
))
{
:deep
(
.highlight-r
eturn
.djs-shape
.djs-visual
>
:nth-child
(
1
))
{
fill
:
#e6a23c
!important
;
fill
:
#e6a23c
!important
;
stroke
:
#e6a23c
!important
;
stroke
:
#e6a23c
!important
;
fill-opacity
:
0.2
!important
;
fill-opacity
:
0.2
!important
;
}
}
:deep
(
.highlight-r
ollback
.djs-shape
.djs-visual
>
:nth-child
(
2
))
{
:deep
(
.highlight-r
eturn
.djs-shape
.djs-visual
>
:nth-child
(
2
))
{
fill
:
#e6a23c
!important
;
fill
:
#e6a23c
!important
;
}
}
:deep
(
.highlight-r
ollback
.djs-shape
.djs-visual
>
path
)
{
:deep
(
.highlight-r
eturn
.djs-shape
.djs-visual
>
path
)
{
fill
:
#e6a23c
!important
;
fill
:
#e6a23c
!important
;
fill-opacity
:
0.2
!important
;
fill-opacity
:
0.2
!important
;
stroke
:
#e6a23c
!important
;
stroke
:
#e6a23c
!important
;
}
}
:deep
(
.highlight-r
ollback
.djs-connection
>
.djs-visual
>
path
)
{
:deep
(
.highlight-r
eturn
.djs-connection
>
.djs-visual
>
path
)
{
stroke
:
#e6a23c
!important
;
stroke
:
#e6a23c
!important
;
}
}
...
...
src/views/bpm/processInstance/detail/TaskReturnDialogForm.vue
View file @
24514722
...
@@ -68,7 +68,7 @@ const submitForm = async () => {
...
@@ -68,7 +68,7 @@ const submitForm = async () => {
// 提交请求
// 提交请求
formLoading
.
value
=
true
formLoading
.
value
=
true
try
{
try
{
await
TaskApi
.
okR
eturnTask
(
formData
.
value
)
await
TaskApi
.
r
eturnTask
(
formData
.
value
)
message
.
success
(
'回退成功'
)
message
.
success
(
'回退成功'
)
dialogVisible
.
value
=
false
dialogVisible
.
value
=
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