Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
FLIPPED-AURORA
gin-vue-admin
提交
f326752c
G
gin-vue-admin
项目概览
FLIPPED-AURORA
/
gin-vue-admin
大约 1 年 前同步成功
通知
332
Star
18154
Fork
5505
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gin-vue-admin
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f326752c
编写于
11月 24, 2020
作者:
Mr.奇淼(
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
增加工作流步骤查看
上级
4f673493
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
57 addition
and
9 deletion
+57
-9
web/src/components/gva-wfd/components/DetailPanel/ProcessDetail.vue
...mponents/gva-wfd/components/DetailPanel/ProcessDetail.vue
+2
-2
web/src/view/exa_wf_leave/exa_wf_leaveFrom.vue
web/src/view/exa_wf_leave/exa_wf_leaveFrom.vue
+1
-0
web/src/view/workflow/workflowCreate/workflowCreate.vue
web/src/view/workflow/workflowCreate/workflowCreate.vue
+1
-0
web/src/view/workflow/workflowUse/workflowUse.vue
web/src/view/workflow/workflowUse/workflowUse.vue
+53
-7
未找到文件。
web/src/components/gva-wfd/components/DetailPanel/ProcessDetail.vue
浏览文件 @
f326752c
...
...
@@ -17,7 +17,7 @@
/>
</div>
<DefaultDetail
:model=
"model"
:onChange=
"onChange"
:readOnly=
"readOnly"
/>
<div
class=
"panelRow"
>
<
!--
<
div
class=
"panelRow"
>
<div>
{{
i18n
[
'
process.category
'
]
}}
:
</div>
<el-select
style=
"width: 90%; font-size: 12px"
...
...
@@ -35,7 +35,7 @@
:value=
"category.id"
/>
</el-select>
</div>
</div>
-->
<div
class=
"panelRow"
>
<div>
{{
i18n
[
'
process.name
'
]
}}
:
</div>
...
...
web/src/view/exa_wf_leave/exa_wf_leaveFrom.vue
浏览文件 @
f326752c
...
...
@@ -96,6 +96,7 @@ export default {
return
false
}
}
return
true
},
...
mapGetters
(
"
user
"
,
[
"
userInfo
"
])
},
...
...
web/src/view/workflow/workflowCreate/workflowCreate.vue
浏览文件 @
f326752c
...
...
@@ -140,6 +140,7 @@ export default {
});
}
const
authorityRes
=
await
getAuthorityList
({
page
:
1
,
pageSize
:
9999999
});
console
.
log
(
authorityRes
)
if
(
authorityRes
.
code
==
0
)
{
authorityRes
.
data
.
list
.
map
(
item
=>
{
this
.
authorities
.
push
({
...
...
web/src/view/workflow/workflowUse/workflowUse.vue
浏览文件 @
f326752c
<
template
>
<div
class=
"workflow-use"
>
<WorkflowInfo
v-if=
"done"
:wf=
"this.node"
:business=
"business"
:workflowMoveID=
"$route.query.workflowMoveID"
/>
</div>
<div
class=
"workflow-use"
>
<div
style=
"padding:10px 20px"
>
<el-steps
:active=
"moves.length-1"
:process-status=
"processStatus"
finish-status=
"finish"
align-center
>
<el-step
v-for=
"(item, key) in moves"
:key=
"key"
>
<div
slot=
"title"
>
{{
item
.
workflowNode
.
label
}}
</div>
<div
slot=
"description"
>
<div>
节点说明:
{{
item
.
workflowNode
.
description
}}
</div>
<div>
操作人:
{{
item
.
promoter
.
nickName
}}
</div>
<div>
操作参数:
{{
item
.
param
||
'
无参数
'
}}
</div>
</div>
</el-step>
</el-steps>
</div>
<WorkflowInfo
v-if=
"done"
:wf=
"this.node"
:business=
"business"
:workflowMoveID=
"$route.query.workflowMoveID"
/>
</div>
</
template
>
<
script
>
import
{
findWorkflowStep
,
getWorkflowMoveByID
}
from
"
@/api/workflowProcess.js
"
...
...
@@ -11,7 +28,34 @@ export default {
return
{
done
:
false
,
business
:
null
,
node
:
null
node
:
null
,
moves
:[]
}
},
computed
:{
processStatus
(){
const
node
=
this
.
moves
[
this
.
moves
.
length
-
1
]
if
(
node
&&
node
.
workflowNode
.
clazz
==
"
end
"
){
if
(
node
.
workflowNode
.
success
){
return
"
success
"
}
else
{
return
"
error
"
}
}
else
{
return
"
process
"
}
}
},
methods
:{
createDone
(){
let
path
=
""
if
(
this
.
node
.
view
){
path
=
this
.
node
.
view
}
else
{
path
=
this
.
workflow
.
view
}
this
.
$options
.
components
.
WorkflowInfo
=
()
=>
import
(
"
@/
"
+
path
)
this
.
done
=
true
}
},
async
created
(){
...
...
@@ -22,19 +66,21 @@ export default {
if
(
res
.
code
==
0
){
this
.
workflow
=
res
.
data
.
workflow
this
.
node
=
res
.
data
.
workflow
.
nodes
[
0
]
this
.
done
=
true
this
.
createDone
()
}
}
else
if
(
workflowMoveID
){
const
res
=
await
getWorkflowMoveByID
({
id
:
workflowMoveID
})
if
(
res
.
code
==
0
){
this
.
business
=
res
.
data
.
business
this
.
workflow
=
res
.
data
.
move
.
workflowProcess
this
.
node
=
res
.
data
.
move
.
workflowNode
this
.
done
=
true
this
.
moves
=
res
.
data
.
moves
this
.
createDone
()
}
}
},
beforeCreate
(){
this
.
$options
.
components
.
WorkflowInfo
=
()
=>
import
(
"
@/
"
+
this
.
node
.
view
)
}
}
</
script
>
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录