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
d9a82d77
Unverified
Commit
d9a82d77
authored
Oct 09, 2020
by
lanyulei
Committed by
GitHub
Oct 09, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #37 from lanyulei/dev
fix: fix bug.
parents
3fd6d8a4
e8e47232
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
4 deletions
+19
-4
src/views/process/list/all.vue
+3
-1
src/views/process/list/my-create.vue
+3
-1
src/views/process/list/related.vue
+3
-1
src/views/process/list/upcoming.vue
+10
-1
No files found.
src/views/process/list/all.vue
View file @
d9a82d77
...
@@ -23,7 +23,9 @@
...
@@ -23,7 +23,9 @@
<el-table-column
label=
"标题"
prop=
"title"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"标题"
prop=
"title"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"当前状态"
:show-overflow-tooltip=
"true"
>
<el-table-column
label=
"当前状态"
:show-overflow-tooltip=
"true"
>
<template
slot-scope=
"scope"
>
<template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
.
state
[
0
].
label
}}
</span>
<span>
{{
scope
.
row
.
state_name
}}
</span>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"当前处理人"
:show-overflow-tooltip=
"true"
>
<el-table-column
label=
"当前处理人"
:show-overflow-tooltip=
"true"
>
...
...
src/views/process/list/my-create.vue
View file @
d9a82d77
...
@@ -23,7 +23,9 @@
...
@@ -23,7 +23,9 @@
<el-table-column
label=
"标题"
prop=
"title"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"标题"
prop=
"title"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"当前状态"
:show-overflow-tooltip=
"true"
>
<el-table-column
label=
"当前状态"
:show-overflow-tooltip=
"true"
>
<template
slot-scope=
"scope"
>
<template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
.
state
[
0
].
label
}}
</span>
<span>
{{
scope
.
row
.
state_name
}}
</span>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"当前处理人"
:show-overflow-tooltip=
"true"
>
<el-table-column
label=
"当前处理人"
:show-overflow-tooltip=
"true"
>
...
...
src/views/process/list/related.vue
View file @
d9a82d77
...
@@ -23,7 +23,9 @@
...
@@ -23,7 +23,9 @@
<el-table-column
label=
"标题"
prop=
"title"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"标题"
prop=
"title"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"当前状态"
:show-overflow-tooltip=
"true"
>
<el-table-column
label=
"当前状态"
:show-overflow-tooltip=
"true"
>
<template
slot-scope=
"scope"
>
<template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
.
state
[
0
].
label
}}
</span>
<span>
{{
scope
.
row
.
state_name
}}
</span>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"当前处理人"
:show-overflow-tooltip=
"true"
>
<el-table-column
label=
"当前处理人"
:show-overflow-tooltip=
"true"
>
...
...
src/views/process/list/upcoming.vue
View file @
d9a82d77
...
@@ -23,7 +23,9 @@
...
@@ -23,7 +23,9 @@
<el-table-column
label=
"标题"
prop=
"title"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"标题"
prop=
"title"
:show-overflow-tooltip=
"true"
/>
<el-table-column
label=
"当前状态"
:show-overflow-tooltip=
"true"
>
<el-table-column
label=
"当前状态"
:show-overflow-tooltip=
"true"
>
<template
slot-scope=
"scope"
>
<template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
.
state
[
0
].
label
}}
</span>
<span>
{{
scope
.
row
.
state_name
}}
</span>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"当前处理人"
:show-overflow-tooltip=
"true"
>
<el-table-column
label=
"当前处理人"
:show-overflow-tooltip=
"true"
>
...
@@ -116,6 +118,8 @@
...
@@ -116,6 +118,8 @@
<
script
>
<
script
>
import
{
workOrderList
,
inversionWorkOrder
}
from
'@/api/process/work-order'
import
{
workOrderList
,
inversionWorkOrder
}
from
'@/api/process/work-order'
import
{
listUser
}
from
'@/api/system/sysuser'
import
{
listUser
}
from
'@/api/system/sysuser'
import
{
mapGetters
}
from
'vuex'
export
default
{
export
default
{
data
()
{
data
()
{
return
{
return
{
...
@@ -146,6 +150,11 @@ export default {
...
@@ -146,6 +150,11 @@ export default {
}
}
}
}
},
},
computed
:
{
...
mapGetters
([
'userId'
])
},
created
()
{
created
()
{
this
.
getList
()
this
.
getList
()
},
},
...
...
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