Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
iBiz-Vue-R7-Res
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
iBiz-R7前端标准模板
iBiz-Vue-R7-Res
提交
75970c5f
提交
75970c5f
编写于
5月 25, 2020
作者:
tony001
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
zpc ------ 提交工作流审核意见控件
上级
a8be9288
变更
3
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
63 行增加
和
73 行删除
+63
-73
app-wf-approval.less
src/components/app-wf-approval/app-wf-approval.less
+6
-6
app-wf-approval.vue
src/components/app-wf-approval/app-wf-approval.vue
+56
-66
entity-service.ts
src/service/entity-service.ts
+1
-1
未找到文件。
src/components/app-wf-approval/app-wf-approval.less
浏览文件 @
75970c5f
.app-wf-approval{
.app-wf-approval{
width:
400px
;
width:
100%
;
.app-wf-approval-header{
.app-wf-approval-header{
width: 100%;
width: 100%;
text-align: center;
text-align: center;
background: #
9acdf5
;
background: #
e5eaef
;
height: 32px;
height: 32px;
line-height: 32px;
line-height: 32px;
font-size: 16px;
font-size: 16px;
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
.app-wf-approval-bottom{
.app-wf-approval-bottom{
width: 100%;
width: 100%;
text-align: center;
text-align: center;
background: #
9acdf5
;
background: #
e5eaef
;
height: 32px;
height: 32px;
line-height: 32px;
line-height: 32px;
font-size: 16px;
font-size: 16px;
...
@@ -32,11 +32,12 @@
...
@@ -32,11 +32,12 @@
font-size: 16px;
font-size: 16px;
border-bottom: 1px solid #565656;
border-bottom: 1px solid #565656;
.approval-content-item-left{
.approval-content-item-left{
width:
30%
;
width:
130px
;
padding: 8px;
padding: 8px;
text-align: center;
}
}
.approval-content-item-right{
.approval-content-item-right{
width:
70%
;
width:
calc(100% - 130px)
;
border-left:1px solid #565656;
border-left:1px solid #565656;
.approval-content-item-wait{
.approval-content-item-wait{
padding: 0px 4px;
padding: 0px 4px;
...
@@ -79,7 +80,6 @@
...
@@ -79,7 +80,6 @@
}
}
}
}
.approval-content-item-memo{
.approval-content-item-memo{
border-top:1px solid #565656;
padding: 0px 4px;
padding: 0px 4px;
.el-textarea__inner{
.el-textarea__inner{
border: 0px !important;
border: 0px !important;
...
...
src/components/app-wf-approval/app-wf-approval.vue
浏览文件 @
75970c5f
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
<span
class=
"approval-header-left"
>
{{
data
.
startTime
}}
</span>
<span
class=
"approval-header-left"
>
{{
data
.
startTime
}}
</span>
<span>
{{
data
.
startUserName
}}
提交
</span>
<span>
{{
data
.
startUserName
}}
提交
</span>
</div>
</div>
<div
class=
"app-wf-approval-content"
v-if=
"data.usertasks.length >0"
>
<div
class=
"app-wf-approval-content"
v-if=
"data.usertasks
&& data.usertasks
.length >0"
>
<div
class=
"approval-content-item"
v-for=
"(usertask,index) in data.usertasks"
:key=
"index"
>
<div
class=
"approval-content-item"
v-for=
"(usertask,index) in data.usertasks"
:key=
"index"
>
<div
class=
"approval-content-item-left"
>
<div
class=
"approval-content-item-left"
>
{{
usertask
.
userTaskName
}}
{{
usertask
.
userTaskName
}}
...
@@ -24,8 +24,8 @@
...
@@ -24,8 +24,8 @@
<
/div
>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
<
div
class
=
"approval-content-item-memo"
v
-
if
=
"usertask.userTaskId ===
'tid-2-c60d498abacb47b510e0aa9d64a55e57'
"
>
<
div
class
=
"approval-content-item-memo"
v
-
if
=
"usertask.userTaskId ===
viewparams.userTaskId
"
>
<
el
-
input
type
=
"textarea"
:
rows
=
"2"
v
-
model
=
"input
"
placeholder
=
"请输入内容"
><
/el-input
>
<
el
-
input
type
=
"textarea"
v
-
model
=
"initmemo"
:
rows
=
"2"
@
blur
=
"handleBlur
"
placeholder
=
"请输入内容"
><
/el-input
>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
...
@@ -36,80 +36,70 @@
...
@@ -36,80 +36,70 @@
<
/div
>
<
/div
>
<
/template
>
<
/template
>
<
script
lang
=
'ts'
>
<
script
lang
=
'ts'
>
import
{
Vue
,
Component
}
from
'vue-property-decorator'
;
import
{
Vue
,
Component
,
Prop
}
from
'vue-property-decorator'
;
@
Component
({
@
Component
({
}
)
}
)
export
default
class
AppWFApproval
extends
Vue
{
export
default
class
AppWFApproval
extends
Vue
{
public
input
:
any
=
""
;
/**
* 数据
*
* @memberof AppWFApproval
*/
public
data
:
any
=
{
}
;
/**
* 初始化memo
*
* @memberof AppWFApproval
*/
public
initmemo
:
string
=
""
;
/**
* 传入数据服务
*
* @memberof AppWFApproval
*/
@
Prop
()
public
service
:
any
;
/**
/**
*
传入数据
*
上下文
*
*
* @memberof AppWFApproval
* @memberof AppWFApproval
*/
*/
public
data
:
any
=
{
@
Prop
()
public
context
:
any
;
"id"
:
"40833204-9be4-11ea-9c94-0242130d84ce"
,
"name"
:
null
,
"processDefinitionKey"
:
null
,
"processDefinitionName"
:
null
,
"businessKey"
:
"DC20200522022"
,
"startTime"
:
"2020-05-22 12:25:22"
,
"endTime"
:
null
,
"startUserId"
:
"001-004_0001"
,
"startUserName"
:
"隆俊杰"
,
"usertasks"
:
[{
"userTaskId"
:
"tid-1-1f3eda90105907e25e6f2e8c0f82b903"
,
"userTaskName"
:
"管理员审批"
,
"processDefinitionKey"
:
null
,
"processDefinitionName"
:
null
,
"identitylinks"
:
[],
"comments"
:
[{
"id"
:
"44eddf40-9be4-11ea-9c94-0242130d84ce"
,
"author"
:
"001-004_0001"
,
"authorName"
:
"隆俊杰"
,
"fullMessage"
:
""
,
"time"
:
"2020-05-22 12:25:29"
,
"type"
:
"审批不通过"
,
"taskId"
:
"40844383-9be4-11ea-9c94-0242130d84ce"
,
"processInstanceId"
:
"40833204-9be4-11ea-9c94-0242130d84ce"
,
"processInstanceBusinessKey"
:
"DC20200522022"
}
,
{
"id"
:
"b39cfc68-9be4-11ea-9c94-0242130d84ce"
,
"author"
:
"450000-000"
,
"authorName"
:
"ibzadmin"
,
"fullMessage"
:
""
,
"time"
:
"2020-05-22 12:28:35"
,
"type"
:
"审批不通过"
,
"taskId"
:
"a6c57ad1-9be4-11ea-9c94-0242130d84ce"
,
"processInstanceId"
:
"40833204-9be4-11ea-9c94-0242130d84ce"
,
"processInstanceBusinessKey"
:
"DC20200522022"
}
]
}
,
{
"userTaskId"
:
"tid-2-c60d498abacb47b510e0aa9d64a55e57"
,
"userTaskName"
:
"被驳回"
,
"processDefinitionKey"
:
null
,
"processDefinitionName"
:
null
,
"identitylinks"
:
[{
"id"
:
"001-004_0001"
,
"firstname"
:
null
,
"displayname"
:
"隆俊杰"
}
],
"comments"
:
[{
"id"
:
"a6c21f6e-9be4-11ea-9c94-0242130d84ce"
,
"author"
:
"001-004_0001"
,
"authorName"
:
"隆俊杰"
,
"fullMessage"
:
""
,
"time"
:
"2020-05-22 12:28:14"
,
"type"
:
"提交"
,
"taskId"
:
"44f09e63-9be4-11ea-9c94-0242130d84ce"
,
"processInstanceId"
:
"40833204-9be4-11ea-9c94-0242130d84ce"
,
"processInstanceBusinessKey"
:
"DC20200522022"
}
]
}
]
}
;
/**
* 视图参数
*
* @memberof AppWFApproval
*/
@
Prop
()
public
viewparams
:
any
;
/**
* 初始化数据
*
* @memberof AppWFApproval
*/
public
created
(){
if
(
this
.
service
){
this
.
service
.
GetWFHistory
(
this
.
context
).
then
((
res
:
any
)
=>
{
if
(
res
&&
(
res
.
status
===
200
)){
this
.
data
=
res
.
data
;
}
}
)
}
}
/**
* 抛出wfprocmemo
*
* @memberof AppWFApproval
*/
public
handleBlur
(
$event
:
any
){
this
.
$emit
(
'formitemvaluechange'
,{
name
:
'srfwfmemo'
,
value
:
$event
.
target
.
value
}
);
}
}
}
<
/script
>
<
/script
>
...
...
src/service/entity-service.ts
浏览文件 @
75970c5f
...
@@ -775,7 +775,7 @@ export default class EntityService {
...
@@ -775,7 +775,7 @@ export default class EntityService {
* @memberof EntityService
* @memberof EntityService
*/
*/
public
async
GetWFHistory
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
public
async
GetWFHistory
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
return
Http
.
getInstance
().
get
(
`/
${
this
.
SYSTEMNAME
}
-app-
${
this
.
APPNAME
}
/
${
this
.
APPDENAME
}
/
${
context
[
this
.
APPLYDEKEY
]}
/process-instances/alls/history`
);
return
Http
.
getInstance
().
get
(
`/
wfcore/
${
this
.
SYSTEMNAME
}
-app-
${
this
.
APPNAME
}
/
${
this
.
APPDENAME
}
/
${
context
[
this
.
APPLYDEKEY
]}
/process-instances/alls/history`
);
}
}
/**
/**
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录