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
46da7e28
authored
Jul 20, 2024
by
YunaiV
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
【缺陷修复】BPM:流程设计器中,选择表达式时,不生效的情况
parent
4a829c75
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
16 deletions
+22
-16
src/components/bpmnProcessDesigner/package/penal/listeners/ProcessListenerDialog.vue
+9
-7
src/components/bpmnProcessDesigner/package/penal/task/task-components/ProcessExpressionDialog.vue
+10
-8
src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue
+3
-1
No files found.
src/components/bpmnProcessDesigner/package/penal/listeners/ProcessListenerDialog.vue
View file @
46da7e28
...
@@ -43,9 +43,6 @@ import { CommonStatusEnum } from '@/utils/constants'
...
@@ -43,9 +43,6 @@ import { CommonStatusEnum } from '@/utils/constants'
/** BPM 流程 表单 */
/** BPM 流程 表单 */
defineOptions
({
name
:
'ProcessListenerDialog'
})
defineOptions
({
name
:
'ProcessListenerDialog'
})
const
{
t
}
=
useI18n
()
// 国际化
const
message
=
useMessage
()
// 消息弹窗
const
dialogVisible
=
ref
(
false
)
// 弹窗的是否展示
const
dialogVisible
=
ref
(
false
)
// 弹窗的是否展示
const
loading
=
ref
(
true
)
// 列表的加载中
const
loading
=
ref
(
true
)
// 列表的加载中
const
list
=
ref
<
ProcessListenerVO
[]
>
([])
// 列表的数据
const
list
=
ref
<
ProcessListenerVO
[]
>
([])
// 列表的数据
...
@@ -53,17 +50,23 @@ const total = ref(0) // 列表的总页数
...
@@ -53,17 +50,23 @@ const total = ref(0) // 列表的总页数
const
queryParams
=
reactive
({
const
queryParams
=
reactive
({
pageNo
:
1
,
pageNo
:
1
,
pageSize
:
10
,
pageSize
:
10
,
type
:
undefined
,
type
:
''
,
status
:
CommonStatusEnum
.
ENABLE
status
:
CommonStatusEnum
.
ENABLE
})
})
/** 打开弹窗 */
/** 打开弹窗 */
const
open
=
async
(
type
:
string
)
=>
{
const
open
=
async
(
type
:
string
)
=>
{
queryParams
.
pageNo
=
1
queryParams
.
type
=
type
getList
()
dialogVisible
.
value
=
true
dialogVisible
.
value
=
true
}
defineExpose
({
open
})
// 提供 open 方法,用于打开弹窗
/** 查询列表 */
const
getList
=
async
()
=>
{
loading
.
value
=
true
loading
.
value
=
true
try
{
try
{
queryParams
.
pageNo
=
1
queryParams
.
type
=
type
const
data
=
await
ProcessListenerApi
.
getProcessListenerPage
(
queryParams
)
const
data
=
await
ProcessListenerApi
.
getProcessListenerPage
(
queryParams
)
list
.
value
=
data
.
list
list
.
value
=
data
.
list
total
.
value
=
data
.
total
total
.
value
=
data
.
total
...
@@ -71,7 +74,6 @@ const open = async (type: string) => {
...
@@ -71,7 +74,6 @@ const open = async (type: string) => {
loading
.
value
=
false
loading
.
value
=
false
}
}
}
}
defineExpose
({
open
})
// 提供 open 方法,用于打开弹窗
/** 提交表单 */
/** 提交表单 */
const
emit
=
defineEmits
([
'success'
])
// 定义 success 事件,用于操作成功后的回调
const
emit
=
defineEmits
([
'success'
])
// 定义 success 事件,用于操作成功后的回调
...
...
src/components/bpmnProcessDesigner/package/penal/task/task-components/ProcessExpressionDialog.vue
View file @
46da7e28
...
@@ -28,9 +28,6 @@ import { ProcessExpressionApi, ProcessExpressionVO } from '@/api/bpm/processExpr
...
@@ -28,9 +28,6 @@ import { ProcessExpressionApi, ProcessExpressionVO } from '@/api/bpm/processExpr
/** BPM 流程 表单 */
/** BPM 流程 表单 */
defineOptions
({
name
:
'ProcessExpressionDialog'
})
defineOptions
({
name
:
'ProcessExpressionDialog'
})
const
{
t
}
=
useI18n
()
// 国际化
const
message
=
useMessage
()
// 消息弹窗
const
dialogVisible
=
ref
(
false
)
// 弹窗的是否展示
const
dialogVisible
=
ref
(
false
)
// 弹窗的是否展示
const
loading
=
ref
(
true
)
// 列表的加载中
const
loading
=
ref
(
true
)
// 列表的加载中
const
list
=
ref
<
ProcessExpressionVO
[]
>
([])
// 列表的数据
const
list
=
ref
<
ProcessExpressionVO
[]
>
([])
// 列表的数据
...
@@ -38,17 +35,23 @@ const total = ref(0) // 列表的总页数
...
@@ -38,17 +35,23 @@ const total = ref(0) // 列表的总页数
const
queryParams
=
reactive
({
const
queryParams
=
reactive
({
pageNo
:
1
,
pageNo
:
1
,
pageSize
:
10
,
pageSize
:
10
,
type
:
undefined
,
type
:
''
,
status
:
CommonStatusEnum
.
ENABLE
status
:
CommonStatusEnum
.
ENABLE
})
})
/** 打开弹窗 */
/** 打开弹窗 */
const
open
=
async
(
type
:
string
)
=>
{
const
open
=
(
type
:
string
)
=>
{
queryParams
.
pageNo
=
1
queryParams
.
type
=
type
getList
()
dialogVisible
.
value
=
true
dialogVisible
.
value
=
true
}
defineExpose
({
open
})
// 提供 open 方法,用于打开弹窗
/** 查询列表 */
const
getList
=
async
()
=>
{
loading
.
value
=
true
loading
.
value
=
true
try
{
try
{
queryParams
.
pageNo
=
1
queryParams
.
type
=
type
const
data
=
await
ProcessExpressionApi
.
getProcessExpressionPage
(
queryParams
)
const
data
=
await
ProcessExpressionApi
.
getProcessExpressionPage
(
queryParams
)
list
.
value
=
data
.
list
list
.
value
=
data
.
list
total
.
value
=
data
.
total
total
.
value
=
data
.
total
...
@@ -56,7 +59,6 @@ const open = async (type: string) => {
...
@@ -56,7 +59,6 @@ const open = async (type: string) => {
loading
.
value
=
false
loading
.
value
=
false
}
}
}
}
defineExpose
({
open
})
// 提供 open 方法,用于打开弹窗
/** 提交表单 */
/** 提交表单 */
const
emit
=
defineEmits
([
'success'
])
// 定义 success 事件,用于操作成功后的回调
const
emit
=
defineEmits
([
'success'
])
// 定义 success 事件,用于操作成功后的回调
...
...
src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue
View file @
46da7e28
...
@@ -135,6 +135,7 @@ import * as PostApi from '@/api/system/post'
...
@@ -135,6 +135,7 @@ import * as PostApi from '@/api/system/post'
import
*
as
UserApi
from
'@/api/system/user'
import
*
as
UserApi
from
'@/api/system/user'
import
*
as
UserGroupApi
from
'@/api/bpm/userGroup'
import
*
as
UserGroupApi
from
'@/api/bpm/userGroup'
import
ProcessExpressionDialog
from
'./ProcessExpressionDialog.vue'
import
ProcessExpressionDialog
from
'./ProcessExpressionDialog.vue'
import
{
ProcessExpressionVO
}
from
'@/api/bpm/processExpression'
defineOptions
({
name
:
'UserTask'
})
defineOptions
({
name
:
'UserTask'
})
const
props
=
defineProps
({
const
props
=
defineProps
({
...
@@ -197,8 +198,9 @@ const processExpressionDialogRef = ref()
...
@@ -197,8 +198,9 @@ const processExpressionDialogRef = ref()
const
openProcessExpressionDialog
=
async
()
=>
{
const
openProcessExpressionDialog
=
async
()
=>
{
processExpressionDialogRef
.
value
.
open
()
processExpressionDialogRef
.
value
.
open
()
}
}
const
selectProcessExpression
=
(
expression
)
=>
{
const
selectProcessExpression
=
(
expression
:
ProcessExpressionVO
)
=>
{
userTaskForm
.
value
.
candidateParam
=
[
expression
.
expression
]
userTaskForm
.
value
.
candidateParam
=
[
expression
.
expression
]
updateElementTask
()
}
}
watch
(
watch
(
...
...
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