Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
phsl
/
admin
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
1e39af84
authored
Nov 05, 2024
by
YunaiV
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
【代码删除】工作流:删除老的加签组件
parent
55da3583
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
210 deletions
+3
-210
src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue
+3
-13
src/views/bpm/processInstance/detail/dialog/TaskSignDeleteForm.vue
+0
-90
src/views/bpm/processInstance/detail/dialog/TaskSignList.vue
+0
-107
No files found.
src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue
View file @
1e39af84
...
@@ -154,7 +154,6 @@
...
@@ -154,7 +154,6 @@
:rows=
"3"
:rows=
"3"
/>
/>
</el-form-item>
</el-form-item>
<el-form-item>
<el-form-item>
<el-button
:disabled=
"formLoading"
type=
"primary"
@
click=
"handleCopy"
>
<el-button
:disabled=
"formLoading"
type=
"primary"
@
click=
"handleCopy"
>
{{ getButtonDisplayName(OperationButtonType.COPY) }}
{{ getButtonDisplayName(OperationButtonType.COPY) }}
...
@@ -207,7 +206,6 @@
...
@@ -207,7 +206,6 @@
:rows=
"3"
:rows=
"3"
/>
/>
</el-form-item>
</el-form-item>
<el-form-item>
<el-form-item>
<el-button
:disabled=
"formLoading"
type=
"primary"
@
click=
"handleTransfer()"
>
<el-button
:disabled=
"formLoading"
type=
"primary"
@
click=
"handleTransfer()"
>
{{ getButtonDisplayName(OperationButtonType.TRANSFER) }}
{{ getButtonDisplayName(OperationButtonType.TRANSFER) }}
...
@@ -232,7 +230,6 @@
...
@@ -232,7 +230,6 @@
{{
getButtonDisplayName
(
OperationButtonType
.
DELEGATE
)
}}
{{
getButtonDisplayName
(
OperationButtonType
.
DELEGATE
)
}}
</div>
</div>
</
template
>
</
template
>
<div
class=
"flex flex-col flex-1 pt-20px px-20px"
v-loading=
"formLoading"
>
<div
class=
"flex flex-col flex-1 pt-20px px-20px"
v-loading=
"formLoading"
>
<el-form
<el-form
label-position=
"top"
label-position=
"top"
...
@@ -252,7 +249,6 @@
...
@@ -252,7 +249,6 @@
/>
/>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"审批意见"
prop=
"reason"
>
<el-form-item
label=
"审批意见"
prop=
"reason"
>
<el-input
<el-input
v-model=
"genericForm.reason"
v-model=
"genericForm.reason"
...
@@ -262,7 +258,6 @@
...
@@ -262,7 +258,6 @@
:rows=
"3"
:rows=
"3"
/>
/>
</el-form-item>
</el-form-item>
<el-form-item>
<el-form-item>
<el-button
:disabled=
"formLoading"
type=
"primary"
@
click=
"handleDelegate()"
>
<el-button
:disabled=
"formLoading"
type=
"primary"
@
click=
"handleDelegate()"
>
{{ getButtonDisplayName(OperationButtonType.DELEGATE) }}
{{ getButtonDisplayName(OperationButtonType.DELEGATE) }}
...
@@ -287,7 +282,6 @@
...
@@ -287,7 +282,6 @@
{{
getButtonDisplayName
(
OperationButtonType
.
ADD_SIGN
)
}}
{{
getButtonDisplayName
(
OperationButtonType
.
ADD_SIGN
)
}}
</div>
</div>
</
template
>
</
template
>
<div
class=
"flex flex-col flex-1 pt-20px px-20px"
v-loading=
"formLoading"
>
<div
class=
"flex flex-col flex-1 pt-20px px-20px"
v-loading=
"formLoading"
>
<el-form
<el-form
label-position=
"top"
label-position=
"top"
...
@@ -307,7 +301,6 @@
...
@@ -307,7 +301,6 @@
/>
/>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"审批意见"
prop=
"reason"
>
<el-form-item
label=
"审批意见"
prop=
"reason"
>
<el-input
<el-input
v-model=
"genericForm.reason"
v-model=
"genericForm.reason"
...
@@ -343,7 +336,6 @@
...
@@ -343,7 +336,6 @@
<Icon
:size=
"14"
icon=
"ep:semi-select"
/>
减签
<Icon
:size=
"14"
icon=
"ep:semi-select"
/>
减签
</div>
</div>
</
template
>
</
template
>
<div
class=
"flex flex-col flex-1 pt-20px px-20px"
v-loading=
"formLoading"
>
<div
class=
"flex flex-col flex-1 pt-20px px-20px"
v-loading=
"formLoading"
>
<el-form
<el-form
label-position=
"top"
label-position=
"top"
...
@@ -363,7 +355,6 @@
...
@@ -363,7 +355,6 @@
/>
/>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"审批意见"
prop=
"reason"
>
<el-form-item
label=
"审批意见"
prop=
"reason"
>
<el-input
<el-input
v-model=
"genericForm.reason"
v-model=
"genericForm.reason"
...
@@ -490,7 +481,6 @@
...
@@ -490,7 +481,6 @@
>
>
<Icon
:size=
"14"
icon=
"ep:refresh"
/>
再次提交
<Icon
:size=
"14"
icon=
"ep:refresh"
/>
再次提交
</div>
</div>
</div>
</div>
</template>
</template>
<
script
lang=
"ts"
setup
>
<
script
lang=
"ts"
setup
>
...
@@ -787,10 +777,10 @@ const handleReCreate = async () => {
...
@@ -787,10 +777,10 @@ const handleReCreate = async () => {
}
}
/** 获取减签人员标签 */
/** 获取减签人员标签 */
const
getDeleteSignUserLabel
=
(
task
:
any
)
:
string
=>
{
const
getDeleteSignUserLabel
=
(
task
:
any
)
:
string
=>
{
const
deptName
=
task
?.
assigneeUser
?.
deptName
||
task
?.
ownerUser
?.
deptName
const
deptName
=
task
?.
assigneeUser
?.
deptName
||
task
?.
ownerUser
?.
deptName
const
nickname
=
task
?.
assigneeUser
?.
nickname
||
task
?.
ownerUser
?.
nickname
const
nickname
=
task
?.
assigneeUser
?.
nickname
||
task
?.
ownerUser
?.
nickname
return
`
${
nickname
}
( 所属部门:
${
deptName
}
)`
;
return
`
${
nickname
}
( 所属部门:
${
deptName
}
)`
}
}
/** 处理减签 */
/** 处理减签 */
const
handlerDeleteSign
=
async
()
=>
{
const
handlerDeleteSign
=
async
()
=>
{
...
@@ -805,7 +795,7 @@ const handlerDeleteSign = async () => {
...
@@ -805,7 +795,7 @@ const handlerDeleteSign = async () => {
// 1.2 提交减签
// 1.2 提交减签
const
data
=
{
const
data
=
{
id
:
genericForm
.
value
.
deleteSignTaskId
,
id
:
genericForm
.
value
.
deleteSignTaskId
,
reason
:
genericForm
.
value
.
reason
,
reason
:
genericForm
.
value
.
reason
}
}
await
TaskApi
.
signDeleteTask
(
data
)
await
TaskApi
.
signDeleteTask
(
data
)
message
.
success
(
'减签成功'
)
message
.
success
(
'减签成功'
)
...
...
src/views/bpm/processInstance/detail/dialog/TaskSignDeleteForm.vue
deleted
100644 → 0
View file @
55da3583
<
template
>
<Dialog
v-model=
"dialogVisible"
title=
"减签"
width=
"500"
>
<el-form
ref=
"formRef"
v-loading=
"formLoading"
:model=
"formData"
:rules=
"formRules"
label-width=
"110px"
>
<el-form-item
label=
"减签任务"
prop=
"id"
>
<el-radio-group
v-model=
"formData.id"
>
<el-radio-button
v-for=
"item in childrenTaskList"
:key=
"item.id"
:value=
"item.id"
>
{{
item
.
name
}}
(
{{
item
.
assigneeUser
?.
deptName
||
item
.
ownerUser
?.
deptName
}}
-
{{
item
.
assigneeUser
?.
nickname
||
item
.
ownerUser
?.
nickname
}}
)
</el-radio-button>
</el-radio-group>
</el-form-item>
<el-form-item
label=
"减签理由"
prop=
"reason"
>
<el-input
v-model=
"formData.reason"
clearable
placeholder=
"请输入减签理由"
/>
</el-form-item>
</el-form>
<template
#
footer
>
<el-button
:disabled=
"formLoading"
type=
"primary"
@
click=
"submitForm"
>
确 定
</el-button>
<el-button
@
click=
"dialogVisible = false"
>
取 消
</el-button>
</
template
>
</Dialog>
</template>
<
script
lang=
"ts"
setup
>
import
*
as
TaskApi
from
'@/api/bpm/task'
import
{
isEmpty
}
from
'@/utils/is'
defineOptions
({
name
:
'TaskSignDeleteForm'
})
const
message
=
useMessage
()
// 消息弹窗
const
dialogVisible
=
ref
(
false
)
// 弹窗的是否展示
const
formLoading
=
ref
(
false
)
// 表单的加载中
const
formData
=
ref
({
id
:
''
,
reason
:
''
})
const
formRules
=
ref
({
id
:
[{
required
:
true
,
message
:
'必须选择减签任务'
,
trigger
:
'change'
}],
reason
:
[{
required
:
true
,
message
:
'减签理由不能为空'
,
trigger
:
'blur'
}]
})
const
formRef
=
ref
()
// 表单 Ref
const
childrenTaskList
=
ref
([])
/** 打开弹窗 */
const
open
=
async
(
id
:
string
)
=>
{
childrenTaskList
.
value
=
await
TaskApi
.
getChildrenTaskList
(
id
)
if
(
isEmpty
(
childrenTaskList
.
value
))
{
message
.
warning
(
'当前没有可减签的任务'
)
return
false
}
dialogVisible
.
value
=
true
resetForm
()
}
defineExpose
({
open
})
// 提供 openModal 方法,用于打开弹窗
/** 提交表单 */
const
emit
=
defineEmits
([
'success'
])
// 定义 success 事件,用于操作成功后的回调
const
submitForm
=
async
()
=>
{
// 校验表单
if
(
!
formRef
)
return
const
valid
=
await
formRef
.
value
.
validate
()
if
(
!
valid
)
return
// 提交请求
formLoading
.
value
=
true
try
{
await
TaskApi
.
signDeleteTask
(
formData
.
value
)
message
.
success
(
'减签成功'
)
dialogVisible
.
value
=
false
// 发送操作成功的事件
emit
(
'success'
)
}
finally
{
formLoading
.
value
=
false
}
}
/** 重置表单 */
const
resetForm
=
()
=>
{
formData
.
value
=
{
id
:
''
,
reason
:
''
}
formRef
.
value
?.
resetFields
()
}
// TODO @jason:新界面搞完,可以删除
</
script
>
src/views/bpm/processInstance/detail/dialog/TaskSignList.vue
deleted
100644 → 0
View file @
55da3583
<
template
>
<el-drawer
v-model=
"drawerVisible"
title=
"子任务"
size=
"880px"
>
<!-- 当前任务 -->
<template
#
header
>
<h4>
【
{{
parentTask
.
name
}}
】审批人:
{{
parentTask
?.
ownerUser
?.
nickname
}}
</h4>
<el-button
style=
"margin-left: 5px"
v-if=
"isSignDeleteButtonVisible(parentTask)"
type=
"danger"
plain
@
click=
"handleSignDelete(parentTask)"
>
<Icon
icon=
"ep:remove"
/>
减签
</el-button>
</
template
>
<!-- 子任务列表 -->
<el-table
:data=
"parentTask.children"
style=
"width: 100%"
row-key=
"id"
border
>
<el-table-column
prop=
"assigneeUser.nickname"
label=
"审批人"
min-width=
"100"
>
<
template
#
default=
"scope"
>
{{
scope
.
row
.
assigneeUser
?.
nickname
||
scope
.
row
.
ownerUser
?.
nickname
}}
</
template
>
</el-table-column>
<el-table-column
prop=
"assigneeUser.deptName"
label=
"所在部门"
min-width=
"100"
>
<
template
#
default=
"scope"
>
{{
scope
.
row
.
assigneeUser
?.
deptName
||
scope
.
row
.
ownerUser
?.
deptName
}}
</
template
>
</el-table-column>
<el-table-column
label=
"审批状态"
prop=
"status"
width=
"120"
>
<
template
#
default=
"scope"
>
<dict-tag
:type=
"DICT_TYPE.BPM_TASK_STATUS"
:value=
"scope.row.status"
/>
</
template
>
</el-table-column>
<el-table-column
label=
"提交时间"
align=
"center"
prop=
"createTime"
width=
"180"
:formatter=
"dateFormatter"
/>
<el-table-column
label=
"结束时间"
align=
"center"
prop=
"endTime"
width=
"180"
:formatter=
"dateFormatter"
/>
<el-table-column
label=
"操作"
prop=
"operation"
width=
"90"
>
<
template
#
default=
"scope"
>
<el-button
v-if=
"isSignDeleteButtonVisible(scope.row)"
type=
"danger"
plain
size=
"small"
@
click=
"handleSignDelete(scope.row)"
>
<Icon
icon=
"ep:remove"
/>
减签
</el-button>
</
template
>
</el-table-column>
</el-table>
<!-- 减签 -->
<TaskSignDeleteForm
ref=
"taskSignDeleteFormRef"
@
success=
"handleSignDeleteSuccess"
/>
</el-drawer>
</template>
<
script
lang=
"ts"
setup
>
import
{
isEmpty
}
from
'@/utils/is'
import
{
DICT_TYPE
}
from
'@/utils/dict'
import
{
dateFormatter
}
from
'@/utils/formatTime'
import
TaskSignDeleteForm
from
'./TaskSignDeleteForm.vue'
defineOptions
({
name
:
'TaskSignList'
})
const
message
=
useMessage
()
// 消息弹窗
const
drawerVisible
=
ref
(
false
)
// 抽屉的是否展示
const
parentTask
=
ref
({}
as
any
)
/** 打开弹窗 */
const
open
=
async
(
task
:
any
)
=>
{
if
(
isEmpty
(
task
.
children
))
{
message
.
warning
(
'该任务没有子任务'
)
return
}
parentTask
.
value
=
task
// 展开抽屉
drawerVisible
.
value
=
true
}
defineExpose
({
open
})
// 提供 openModal 方法,用于打开弹窗
/** 发起减签 */
const
taskSignDeleteFormRef
=
ref
()
const
emit
=
defineEmits
([
'success'
])
// 定义 success 事件,用于操作成功后的回调
const
handleSignDelete
=
(
item
:
any
)
=>
{
taskSignDeleteFormRef
.
value
.
open
(
item
.
id
)
}
const
handleSignDeleteSuccess
=
()
=>
{
emit
(
'success'
)
// 关闭抽屉
drawerVisible
.
value
=
false
}
/** 是否显示减签按钮 */
const
isSignDeleteButtonVisible
=
(
task
:
any
)
=>
{
return
task
&&
task
.
children
&&
!
isEmpty
(
task
.
children
)
}
// TODO @jason:新界面搞完,可以删除
</
script
>
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