Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
ferry_web
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
jianan
ferry_web
Commits
6373aeaa
Commit
6373aeaa
authored
Jul 25, 2020
by
Mr. Lan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug.
parent
d7f325f7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
11 deletions
+13
-11
src/components/wfd/components/Wfd.vue
+0
-1
src/views/process/admin/process-manager.vue
+13
-10
No files found.
src/components/wfd/components/Wfd.vue
View file @
6373aeaa
...
...
@@ -204,7 +204,6 @@ export default {
this
.
graph
.
on
(
'afteritemselected'
,
(
items
)
=>
{
if
(
items
&&
items
.
length
>
0
)
{
if
(
this
.
previous
!==
''
)
{
// 1. 获取之前的数据
var
previousValue
=
''
const
item
=
this
.
graph
.
findById
(
this
.
previous
[
0
])
previousValue
=
{
...
item
.
getModel
()
}
...
...
src/views/process/admin/process-manager.vue
View file @
6373aeaa
...
...
@@ -199,6 +199,7 @@ export default {
// 是否显示弹出层
open
:
false
,
// 查询参数
structureValue
:
[],
users
:
[],
groups
:
[],
departments
:
[],
...
...
@@ -338,9 +339,11 @@ export default {
})
})
},
verifyProcess
()
{
this
.
ruleForm
.
structure
=
this
.
$refs
.
wfd
.
graph
.
save
()
for
(
var
r
of
this
.
ruleForm
.
structure
.
nodes
)
{
verifyProcess
(
structureValue
)
{
if
(
structureValue
===
undefined
&&
structureValue
===
null
)
{
structureValue
=
this
.
ruleForm
.
structure
}
for
(
var
r
of
structureValue
.
nodes
)
{
if
(
r
.
sort
===
undefined
||
r
.
sort
===
null
||
r
.
sort
===
''
)
{
return
'流程节点顺序不能为空'
}
else
if
(
r
.
label
===
undefined
||
r
.
label
===
null
||
r
.
label
===
''
)
{
...
...
@@ -354,7 +357,7 @@ export default {
}
}
}
for
(
var
e
of
this
.
ruleForm
.
structur
e
.
edges
)
{
for
(
var
e
of
structureValu
e
.
edges
)
{
if
(
e
.
sort
===
undefined
||
e
.
sort
===
null
||
e
.
sort
===
''
)
{
return
'流转顺序不能为空'
}
else
if
(
e
.
label
===
undefined
||
e
.
label
===
null
||
e
.
label
===
''
)
{
...
...
@@ -385,20 +388,20 @@ export default {
})
},
editForm
(
formName
)
{
var
r
=
this
.
verifyProcess
()
if
(
r
!==
''
)
{
this
.
$message
.
error
(
r
)
return
}
this
.
$refs
[
formName
].
validate
((
valid
)
=>
{
if
(
valid
)
{
var
structureValue
=
this
.
$refs
.
wfd
.
graph
.
save
()
var
r
=
this
.
verifyProcess
(
structureValue
)
if
(
r
!==
''
)
{
this
.
$message
.
error
(
r
)
return
}
if
(
structureValue
.
nodes
.
length
>
0
&&
structureValue
.
edges
.
length
>
0
)
{
updateProcess
({
id
:
this
.
ruleForm
.
id
,
name
:
this
.
ruleForm
.
name
,
tpls
:
this
.
ruleForm
.
tpls
,
structure
:
this
.
$refs
.
wfd
.
graph
.
save
()
,
structure
:
structureValue
,
classify
:
this
.
ruleForm
.
classify
,
task
:
this
.
ruleForm
.
task
,
notice
:
this
.
ruleForm
.
notice
...
...
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