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
8f748edd
authored
Aug 24, 2024
by
YunaiV
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
【代码优化】工作流:调整多人审批的文案
parent
e75f9544
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
10 deletions
+10
-10
src/components/SimpleProcessDesignerV2/src/NodeHandler.vue
+1
-1
src/components/SimpleProcessDesignerV2/src/consts.ts
+5
-5
src/components/SimpleProcessDesignerV2/src/node.ts
+1
-1
src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue
+3
-3
No files found.
src/components/SimpleProcessDesignerV2/src/NodeHandler.vue
View file @
8f748edd
...
@@ -81,7 +81,7 @@ const addNode = (type: number) => {
...
@@ -81,7 +81,7 @@ const addNode = (type: number) => {
name
:
NODE_DEFAULT_NAME
.
get
(
NodeType
.
USER_TASK_NODE
)
as
string
,
name
:
NODE_DEFAULT_NAME
.
get
(
NodeType
.
USER_TASK_NODE
)
as
string
,
showText
:
''
,
showText
:
''
,
type
:
NodeType
.
USER_TASK_NODE
,
type
:
NodeType
.
USER_TASK_NODE
,
approveMethod
:
ApproveMethodType
.
RRANDOM_SELECT_ONE
_APPROVE
,
approveMethod
:
ApproveMethodType
.
SEQUENTIAL
_APPROVE
,
// 超时处理
// 超时处理
rejectHandler
:
{
rejectHandler
:
{
type
:
RejectHandlerType
.
FINISH_PROCESS
type
:
RejectHandlerType
.
FINISH_PROCESS
...
...
src/components/SimpleProcessDesignerV2/src/consts.ts
View file @
8f748edd
...
@@ -147,7 +147,7 @@ export enum ApproveMethodType {
...
@@ -147,7 +147,7 @@ export enum ApproveMethodType {
/**
/**
* 随机挑选一人审批
* 随机挑选一人审批
*/
*/
R
R
ANDOM_SELECT_ONE_APPROVE
=
1
,
RANDOM_SELECT_ONE_APPROVE
=
1
,
/**
/**
* 多人会签(按通过比例)
* 多人会签(按通过比例)
...
@@ -421,10 +421,10 @@ export const APPROVE_TYPE: DictDataVO[] = [
...
@@ -421,10 +421,10 @@ export const APPROVE_TYPE: DictDataVO[] = [
]
]
export
const
APPROVE_METHODS
:
DictDataVO
[]
=
[
export
const
APPROVE_METHODS
:
DictDataVO
[]
=
[
{
label
:
'
随机挑选一人审批'
,
value
:
ApproveMethodType
.
RRANDOM_SELECT_ONE
_APPROVE
},
{
label
:
'
按顺序依次审批'
,
value
:
ApproveMethodType
.
SEQUENTIAL
_APPROVE
},
{
label
:
'
多人会签(按通过比例%)
'
,
value
:
ApproveMethodType
.
APPROVE_BY_RATIO
},
{
label
:
'
会签(可同时审批,至少 % 人必须审批通过)
'
,
value
:
ApproveMethodType
.
APPROVE_BY_RATIO
},
{
label
:
'
多人或签(一人通过或拒绝
)'
,
value
:
ApproveMethodType
.
ANY_APPROVE
},
{
label
:
'
或签(可同时审批,有一人通过即可
)'
,
value
:
ApproveMethodType
.
ANY_APPROVE
},
{
label
:
'
依次审批(按顺序依次审批)'
,
value
:
ApproveMethodType
.
SEQUENTIAL
_APPROVE
}
{
label
:
'
随机挑选一人审批'
,
value
:
ApproveMethodType
.
RANDOM_SELECT_ONE
_APPROVE
}
]
]
export
const
CONDITION_CONFIG_TYPES
:
DictDataVO
[]
=
[
export
const
CONDITION_CONFIG_TYPES
:
DictDataVO
[]
=
[
...
...
src/components/SimpleProcessDesignerV2/src/node.ts
View file @
8f748edd
...
@@ -190,7 +190,7 @@ export function useNodeForm(nodeType: NodeType) {
...
@@ -190,7 +190,7 @@ export function useNodeForm(nodeType: NodeType) {
if
(
nodeType
===
NodeType
.
USER_TASK_NODE
)
{
if
(
nodeType
===
NodeType
.
USER_TASK_NODE
)
{
configForm
.
value
=
{
configForm
.
value
=
{
candidateStrategy
:
CandidateStrategy
.
USER
,
candidateStrategy
:
CandidateStrategy
.
USER
,
approveMethod
:
ApproveMethodType
.
RRANDOM_SELECT_ONE
_APPROVE
,
approveMethod
:
ApproveMethodType
.
SEQUENTIAL
_APPROVE
,
approveRatio
:
100
,
approveRatio
:
100
,
rejectHandlerType
:
RejectHandlerType
.
FINISH_PROCESS
,
rejectHandlerType
:
RejectHandlerType
.
FINISH_PROCESS
,
assignStartUserHandlerType
:
AssignStartUserHandlerType
.
START_USER_AUDIT
,
assignStartUserHandlerType
:
AssignStartUserHandlerType
.
START_USER_AUDIT
,
...
...
src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue
View file @
8f748edd
...
@@ -188,7 +188,7 @@
...
@@ -188,7 +188,7 @@
:value=
"item.value"
:value=
"item.value"
:label=
"item.value"
:label=
"item.value"
:disabled=
"
:disabled=
"
item.value !== ApproveMethodType.R
R
ANDOM_SELECT_ONE_APPROVE &&
item.value !== ApproveMethodType.RANDOM_SELECT_ONE_APPROVE &&
notAllowedMultiApprovers
notAllowedMultiApprovers
"
"
>
>
...
@@ -547,7 +547,7 @@ const changeCandidateStrategy = () => {
...
@@ -547,7 +547,7 @@ const changeCandidateStrategy = () => {
configForm
.
value
.
postIds
=
[]
configForm
.
value
.
postIds
=
[]
configForm
.
value
.
userGroups
=
[]
configForm
.
value
.
userGroups
=
[]
configForm
.
value
.
deptLevel
=
1
configForm
.
value
.
deptLevel
=
1
configForm
.
value
.
approveMethod
=
ApproveMethodType
.
RRANDOM_SELECT_ONE
_APPROVE
configForm
.
value
.
approveMethod
=
ApproveMethodType
.
SEQUENTIAL
_APPROVE
if
(
if
(
configForm
.
value
.
candidateStrategy
===
CandidateStrategy
.
START_USER
||
configForm
.
value
.
candidateStrategy
===
CandidateStrategy
.
START_USER
||
configForm
.
value
.
candidateStrategy
===
CandidateStrategy
.
USER
configForm
.
value
.
candidateStrategy
===
CandidateStrategy
.
USER
...
@@ -564,7 +564,7 @@ const changedCandidateUsers = () => {
...
@@ -564,7 +564,7 @@ const changedCandidateUsers = () => {
configForm
.
value
.
userIds
?.
length
<=
1
&&
configForm
.
value
.
userIds
?.
length
<=
1
&&
configForm
.
value
.
candidateStrategy
===
CandidateStrategy
.
USER
configForm
.
value
.
candidateStrategy
===
CandidateStrategy
.
USER
)
{
)
{
configForm
.
value
.
approveMethod
=
ApproveMethodType
.
R
R
ANDOM_SELECT_ONE_APPROVE
configForm
.
value
.
approveMethod
=
ApproveMethodType
.
RANDOM_SELECT_ONE_APPROVE
configForm
.
value
.
rejectHandlerType
=
RejectHandlerType
.
FINISH_PROCESS
configForm
.
value
.
rejectHandlerType
=
RejectHandlerType
.
FINISH_PROCESS
notAllowedMultiApprovers
.
value
=
true
notAllowedMultiApprovers
.
value
=
true
}
else
{
}
else
{
...
...
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