Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Chatopera OpenSource
/
ferry_web
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Members
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
0420ffdd
authored
Dec 03, 2020
by
lanyulei
Committed by
GitHub
Dec 03, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #53 from lanyulei/dev
fix: 修复主动接单无法使用的bug。
parents
96034872
83d4c173
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
3 deletions
src/views/process/list/handle.vue
src/views/process/list/handle.vue
View file @
0420ffdd
...
...
@@ -93,9 +93,7 @@
</div>
<div
class=
"text item"
style=
"text-align: center;margin-top:18px"
>
<div
v-if=
"
processStructureValue.workOrder.state.length > 1 &&
currentNode.activeOrder"
v-if=
"isActiveProcessing && currentNode.activeOrder"
>
<el-button
v-permisaction=
"['process:list:handle:active']"
...
...
@@ -177,6 +175,7 @@ import { mapGetters } from 'vuex'
export
default
{
data
()
{
return
{
isActiveProcessing
:
false
,
tpls
:
[],
remarks
:
''
,
// 备注信息
alertMessage
:
''
,
...
...
@@ -225,6 +224,7 @@ export default {
processId
:
this
.
$route
.
query
.
processId
,
workOrderId
:
this
.
$route
.
query
.
workOrderId
}).
then
(
response
=>
{
this
.
isActiveProcessing
=
false
this
.
processStructureValue
=
response
.
data
this
.
circulationHistoryList
=
this
.
processStructureValue
.
circulationHistory
// 获取当前展示节点列表
...
...
@@ -251,6 +251,14 @@ export default {
this
.
currentNode
.
writeTpls
.
push
(
tplTmp
.
form_structure
.
id
)
}
}
// 判断是否需要主动处理
for
(
var
stateValue
of
this
.
processStructureValue
.
workOrder
.
state
)
{
if
(
this
.
processStructureValue
.
workOrder
.
current_state
===
stateValue
.
id
&&
stateValue
.
processor
.
length
>
1
)
{
this
.
isActiveProcessing
=
true
break
}
}
this
.
getAlertMessage
()
})
},
...
...
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