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
0fc97eb3
Unverified
Commit
0fc97eb3
authored
Jun 26, 2021
by
lanyulei
Committed by
GitHub
Jun 26, 2021
Browse files
Options
Browse Files
Download
Plain Diff
feat: 添加任务是否需执行的配置。
feat: 添加任务是否需执行的配置。
parents
b46fdbf1
1be2ba66
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
6 deletions
+15
-6
src/components/wfd/components/DetailPanel/FlowDetail.vue
+8
-0
src/components/wfd/components/DetailPanel/index.vue
+1
-1
src/views/process/admin/process-manager.vue
+0
-1
src/views/process/list/create.vue
+5
-4
src/views/process/list/handle.vue
+1
-0
No files found.
src/components/wfd/components/DetailPanel/FlowDetail.vue
View file @
0fc97eb3
...
...
@@ -18,6 +18,14 @@
</el-select>
</div>
<div
class=
"panelRow"
>
<el-checkbox
size=
"small"
:disabled=
"readOnly"
:value=
"model.isExecuteTask"
@
change=
"(e) => onChange('isExecuteTask', e)"
>
是否执行任务
</el-checkbox>
</div>
<div
class=
"panelRow"
>
<div>
{{
i18n
[
'sequenceFlow.expression'
]
}}
:
</div>
<el-input
style=
"width:90%; font-size:12px"
...
...
src/components/wfd/components/DetailPanel/index.vue
View file @
0fc97eb3
<
template
>
<div
class=
"detailPanel"
:style=
"
{'height':height+'px'}" style="overflow-y:
scroll
; padding-bottom: 10px;">
<div
class=
"detailPanel"
:style=
"
{'height':height+'px'}" style="overflow-y:
auto
; padding-bottom: 10px;">
<UserTaskDetail
v-if=
"model.clazz === 'userTask'"
:model=
"model"
...
...
src/views/process/admin/process-manager.vue
View file @
0fc97eb3
...
...
@@ -319,7 +319,6 @@ export default {
getDepartments
()
{
getOrdinaryDeptList
().
then
(
response
=>
{
this
.
departments
=
response
.
data
console
.
log
(
this
.
departments
)
})
},
/** 查询流程列表 */
...
...
src/views/process/list/create.vue
View file @
0fc97eb3
...
...
@@ -51,7 +51,7 @@
:key=
"index"
type=
"primary"
:disabled=
"submitDisabled"
@
click=
"submitAction(item
.target
)"
@
click=
"submitAction(item)"
>
{{ item.label }}
</el-button>
...
...
@@ -129,17 +129,17 @@ export default {
this
.
currentNode
=
this
.
processStructureValue
.
nodes
[
0
]
})
},
submitAction
(
target
)
{
submitAction
(
item
)
{
this
.
$refs
[
'ruleForm'
].
validate
((
valid
)
=>
{
if
(
valid
)
{
this
.
submitDisabled
=
true
var
stateMap
=
{}
this
.
ruleForm
.
process
=
parseInt
(
this
.
$route
.
query
.
processId
)
this
.
ruleForm
.
classify
=
this
.
processStructureValue
.
process
.
classify
stateMap
[
'id'
]
=
target
stateMap
[
'id'
]
=
item
.
target
this
.
ruleForm
.
source_state
=
this
.
processStructureValue
.
nodes
[
this
.
active
].
label
for
(
var
v
of
this
.
processStructureValue
.
nodes
)
{
if
(
v
.
id
===
target
)
{
if
(
v
.
id
===
item
.
target
)
{
if
(
v
.
assignType
!==
undefined
)
{
stateMap
[
'process_method'
]
=
v
.
assignType
}
...
...
@@ -176,6 +176,7 @@ export default {
Promise
.
all
(
promiseList
).
then
(
values
=>
{
this
.
ruleForm
.
source
=
this
.
processStructureValue
.
nodes
[
this
.
active
].
id
this
.
ruleForm
.
tpls
.
form_data
=
values
this
.
ruleForm
.
is_exec_task
=
item
.
isExecuteTask
createWorkOrder
(
this
.
ruleForm
).
then
(
response
=>
{
if
(
response
.
code
===
200
)
{
this
.
$router
.
push
({
path
:
'/process/upcoming'
})
...
...
src/views/process/list/handle.vue
View file @
0fc97eb3
...
...
@@ -301,6 +301,7 @@ export default {
flow_properties
:
item
.
flowProperties
===
undefined
?
2
:
parseInt
(
item
.
flowProperties
),
work_order_id
:
parseInt
(
this
.
$route
.
query
.
workOrderId
),
remarks
:
this
.
remarks
,
is_exec_task
:
item
.
isExecuteTask
,
tpls
:
this
.
tpls
}).
then
(
response
=>
{
if
(
response
.
code
===
200
)
{
...
...
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