Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-app-operator-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lanbaoming
jiedao-app-operator-master
Commits
beda2dfe
Commit
beda2dfe
authored
May 09, 2024
by
lanbaoming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
2024-05-09 流程待办更新
parent
2f19f13c
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
166 additions
and
46 deletions
+166
-46
index.vue
src/views/bpm/processInstance/index.vue
+10
-1
copy.vue
src/views/bpm/task/copy.vue
+10
-1
done.vue
src/views/bpm/task/done.vue
+10
-1
todo.vue
src/views/bpm/task/todo.vue
+136
-43
No files found.
src/views/bpm/processInstance/index.vue
View file @
beda2dfe
...
@@ -106,7 +106,8 @@
...
@@ -106,7 +106,8 @@
import
{
getMyProcessInstancePage
,
cancelProcessInstance
}
from
"
@/api/bpm/processInstance
"
;
import
{
getMyProcessInstancePage
,
cancelProcessInstance
}
from
"
@/api/bpm/processInstance
"
;
export
default
{
export
default
{
name
:
"
ProcessInstance
"
,
//lanbm 2024-05-08 添加查询条件不清空优化
name
:
"
BpmProcessinstanceIndex
"
,
components
:
{
components
:
{
},
},
data
()
{
data
()
{
...
@@ -137,6 +138,14 @@ export default {
...
@@ -137,6 +138,14 @@ export default {
created
()
{
created
()
{
this
.
getList
();
this
.
getList
();
},
},
watch
:
{
//lanbm 2024-05-08 添加页面再次进入刷新列表优化
$route
(
to
)
{
if
(
this
.
$route
.
path
==
"
/task/my
"
)
{
this
.
getList
();
}
},
},
methods
:
{
methods
:
{
/** 查询列表 */
/** 查询列表 */
getList
()
{
getList
()
{
...
...
src/views/bpm/task/copy.vue
View file @
beda2dfe
...
@@ -73,7 +73,8 @@
...
@@ -73,7 +73,8 @@
import
{
getCopyTaskPage
}
from
'
@/api/bpm/task
'
import
{
getCopyTaskPage
}
from
'
@/api/bpm/task
'
export
default
{
export
default
{
name
:
"
Copy
"
,
//lanbm 2024-05-08 添加查询条件不清空优化
name
:
"
BpmTaskCopy
"
,
components
:
{},
components
:
{},
data
()
{
data
()
{
return
{
return
{
...
@@ -100,6 +101,14 @@ export default {
...
@@ -100,6 +101,14 @@ export default {
created
()
{
created
()
{
this
.
getList
();
this
.
getList
();
},
},
watch
:
{
//lanbm 2024-05-08 添加页面再次进入刷新列表优化
$route
(
to
)
{
if
(
this
.
$route
.
path
==
"
/task/copy
"
)
{
this
.
getList
();
}
},
},
methods
:
{
methods
:
{
/** 查询列表 */
/** 查询列表 */
getList
()
{
getList
()
{
...
...
src/views/bpm/task/done.vue
View file @
beda2dfe
...
@@ -80,7 +80,8 @@ import {getDoneTaskPage} from '@/api/bpm/task'
...
@@ -80,7 +80,8 @@ import {getDoneTaskPage} from '@/api/bpm/task'
import
{
getDate
}
from
"
@/utils/dateUtils
"
;
import
{
getDate
}
from
"
@/utils/dateUtils
"
;
export
default
{
export
default
{
name
:
"
Done
"
,
//lanbm 2024-05-08 添加查询条件不清空优化
name
:
"
BpmTaskDone
"
,
components
:
{},
components
:
{},
data
()
{
data
()
{
return
{
return
{
...
@@ -104,6 +105,14 @@ export default {
...
@@ -104,6 +105,14 @@ export default {
created
()
{
created
()
{
this
.
getList
();
this
.
getList
();
},
},
watch
:
{
//lanbm 2024-05-08 添加页面再次进入刷新列表优化
$route
(
to
)
{
if
(
this
.
$route
.
path
==
"
/task/done
"
)
{
this
.
getList
();
}
},
},
methods
:
{
methods
:
{
/** 查询列表 */
/** 查询列表 */
getList
()
{
getList
()
{
...
...
src/views/bpm/task/todo.vue
View file @
beda2dfe
<
template
>
<
template
>
<div
class=
"app-container"
>
<div
class=
"app-container"
>
<!-- 搜索工作栏 -->
<!-- 搜索工作栏 -->
<el-form
:model=
"queryParams"
ref=
"queryForm"
size=
"small"
:inline=
"true"
v-show=
"showSearch"
label-width=
"68px"
>
<el-form
:model=
"queryParams"
ref=
"queryForm"
size=
"small"
:inline=
"true"
v-show=
"showSearch"
label-width=
"68px"
>
<el-form-item
:label=
"$t('流程编号')"
prop=
"processInstanceId"
>
<el-form-item
:label=
"$t('流程编号')"
prop=
"processInstanceId"
>
<el-input
v-model=
"queryParams.processInstanceId"
:placeholder=
"$t('流程编号')"
clearable
<el-input
@
keyup.enter.native=
"handleQuery"
/>
v-model=
"queryParams.processInstanceId"
:placeholder=
"$t('流程编号')"
clearable
@
keyup.enter.native=
"handleQuery"
/>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('流程名称')"
prop=
"name"
>
<el-form-item
:label=
"$t('流程名称')"
prop=
"name"
>
<el-input
v-model=
"queryParams.name"
:placeholder=
"$t('任务名称')"
clearable
@
keyup.enter.native=
"handleQuery"
/>
<el-input
v-model=
"queryParams.name"
:placeholder=
"$t('任务名称')"
clearable
@
keyup.enter.native=
"handleQuery"
/>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('流程分类')"
prop=
"category"
>
<el-form-item
:label=
"$t('流程分类')"
prop=
"category"
>
<el-select
v-model=
"queryParams.category"
:placeholder=
"$t('请选择流程分类')"
clearable
>
<el-select
<el-option
v-for=
"dict in this.getDictDatas(DICT_TYPE.BPM_MODEL_CATEGORY)"
v-model=
"queryParams.category"
:key=
"dict.value"
:label=
"$l(dict, 'label')"
:value=
"dict.value"
/>
:placeholder=
"$t('请选择流程分类')"
clearable
>
<el-option
v-for=
"dict in this.getDictDatas(DICT_TYPE.BPM_MODEL_CATEGORY)"
:key=
"dict.value"
:label=
"$l(dict, 'label')"
:value=
"dict.value"
/>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('提交时间')"
>
<el-form-item
:label=
"$t('提交时间')"
>
<el-date-picker
v-model=
"dateRangeCreateTime"
style=
"width: 240px"
value-format=
"yyyy-MM-dd"
<el-date-picker
type=
"daterange"
range-separator=
"-"
:start-placeholder=
"$t('开始日期')"
v-model=
"dateRangeCreateTime"
:end-placeholder=
"$t('结束日期')"
/>
style=
"width: 240px"
value-format=
"yyyy-MM-dd"
type=
"daterange"
range-separator=
"-"
:start-placeholder=
"$t('开始日期')"
:end-placeholder=
"$t('结束日期')"
/>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('业务编号')"
prop=
"businessNo"
>
<el-form-item
:label=
"$t('业务编号')"
prop=
"businessNo"
>
<el-input
v-model=
"queryParams.businessNo"
:placeholder=
"$t('请输入业务编号')"
clearable
<el-input
@
keyup.enter.native=
"handleQuery"
/>
v-model=
"queryParams.businessNo"
:placeholder=
"$t('请输入业务编号')"
clearable
@
keyup.enter.native=
"handleQuery"
/>
</el-form-item>
</el-form-item>
<el-form-item>
<el-form-item>
<el-button
type=
"primary"
icon=
"el-icon-search"
@
click=
"handleQuery"
>
{{
$t
(
'
搜索
'
)
}}
</el-button>
<el-button
type=
"primary"
icon=
"el-icon-search"
@
click=
"handleQuery"
>
{{
<el-button
icon=
"el-icon-refresh"
@
click=
"resetQuery"
>
{{
$t
(
'
重置
'
)
}}
</el-button>
$t
(
"
搜索
"
)
}}
</el-button>
<el-button
icon=
"el-icon-refresh"
@
click=
"resetQuery"
>
{{
$t
(
"
重置
"
)
}}
</el-button>
</el-form-item>
</el-form-item>
</el-form>
</el-form>
<!-- 列表 -->
<!-- 列表 -->
<el-table
v-loading=
"loading"
:data=
"list"
>
<el-table
v-loading=
"loading"
:data=
"list"
>
<el-table-column
:label=
"$t('流程编号')"
align=
"center"
prop=
"processInstance.id"
width=
"220"
/>
<el-table-column
<el-table-column
:label=
"$t('流程名称')"
align=
"center"
prop=
"processInstance.name"
width=
"220"
/>
:label=
"$t('流程编号')"
align=
"center"
prop=
"processInstance.id"
width=
"220"
/>
<el-table-column
:label=
"$t('流程名称')"
align=
"center"
prop=
"processInstance.name"
width=
"220"
/>
<el-table-column
:label=
"$t('流程分类')"
align=
"center"
prop=
"category"
>
<el-table-column
:label=
"$t('流程分类')"
align=
"center"
prop=
"category"
>
<template
slot-scope=
"scope"
>
<template
slot-scope=
"scope"
>
<dict-tag
:type=
"DICT_TYPE.BPM_MODEL_CATEGORY"
:value=
"scope.row.category"
/>
<dict-tag
:type=
"DICT_TYPE.BPM_MODEL_CATEGORY"
:value=
"scope.row.category"
/>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
:label=
"$t('业务编号')"
align=
"center"
prop=
"businessNo"
/>
<el-table-column
:label=
"$t('业务编号')"
align=
"center"
prop=
"businessNo"
/>
<el-table-column
:label=
"$t('当前审批节点')"
align=
"center"
prop=
"name"
/>
<el-table-column
:label=
"$t('当前审批节点')"
align=
"center"
prop=
"name"
/>
<!-- <el-table-column :label="$t('状态')" align="center" prop="version" width="80">
<!-- <el-table-column :label="$t('状态')" align="center" prop="version" width="80">
<template slot-scope="scope">
<template slot-scope="scope">
<el-tag type="success" v-if="scope.row.suspensionState === 1">{{ $t('激活') }}</el-tag>
<el-tag type="success" v-if="scope.row.suspensionState === 1">{{ $t('激活') }}</el-tag>
...
@@ -56,7 +111,12 @@
...
@@ -56,7 +111,12 @@
<dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT" :value="scope.row.result"/>
<dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT" :value="scope.row.result"/>
</template>
</template>
</el-table-column> -->
</el-table-column> -->
<el-table-column
:label=
"$t('提交时间')"
align=
"center"
prop=
"createTime"
width=
"180"
>
<el-table-column
:label=
"$t('提交时间')"
align=
"center"
prop=
"createTime"
width=
"180"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<span>
{{
parseTime
(
scope
.
row
.
createTime
)
}}
</span>
<span>
{{
parseTime
(
scope
.
row
.
createTime
)
}}
</span>
</
template
>
</
template
>
...
@@ -66,32 +126,52 @@
...
@@ -66,32 +126,52 @@
<span>{{ parseTime(scope.row.endTime) }}</span>
<span>{{ parseTime(scope.row.endTime) }}</span>
</template>
</template>
</el-table-column> -->
</el-table-column> -->
<el-table-column
:label=
"$t('操作')"
align=
"center"
fixed=
"right"
class-name=
"small-padding fixed-width"
width=
"150"
>
<el-table-column
:label=
"$t('操作')"
align=
"center"
fixed=
"right"
class-name=
"small-padding fixed-width"
width=
"150"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<!--
<el-button
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handleCancel(scope.row)"
<!--
<el-button
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handleCancel(scope.row)"
v-hasPermi=
"['bpm:task:update']"
>
{{
$t
(
'
取消
'
)
}}
v-hasPermi=
"['bpm:task:update']"
>
{{
$t
(
'
取消
'
)
}}
</el-button>
-->
</el-button>
-->
<el-button
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handleAudit(scope.row)"
<el-button
v-hasPermi=
"['bpm:task:update']"
>
{{
$t
(
'
详情
'
)
}}
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handleAudit(scope.row)"
v-hasPermi=
"['bpm:task:update']"
>
{{
$t
(
"
详情
"
)
}}
</el-button>
</el-button>
<el-button
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handleAudit(scope.row)"
<el-button
v-hasPermi=
"['bpm:task:update']"
>
{{
$t
(
'
审批
'
)
}}
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handleAudit(scope.row)"
v-hasPermi=
"['bpm:task:update']"
>
{{
$t
(
"
审批
"
)
}}
</el-button>
</el-button>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
</el-table>
</el-table>
<!-- 分页组件 -->
<!-- 分页组件 -->
<pagination
v-show=
"total > 0"
:total=
"total"
:page.sync=
"queryParams.pageNo"
:limit.sync=
"queryParams.pageSize"
<pagination
@
pagination=
"getList"
/>
v-show=
"total > 0"
:total=
"total"
:page.sync=
"queryParams.pageNo"
:limit.sync=
"queryParams.pageSize"
@
pagination=
"getList"
/>
</div>
</div>
</template>
</template>
<
script
>
<
script
>
import
{
getTodoTaskPage
}
from
'
@/api/bpm/task
'
import
{
getTodoTaskPage
}
from
"
@/api/bpm/task
"
;
import
{
cancelProcessInstance
}
from
"
@/api/bpm/processInstance
"
;
import
{
cancelProcessInstance
}
from
"
@/api/bpm/processInstance
"
;
export
default
{
export
default
{
//lanbm 2024-05-08 添加查询条件不清空优化
name
:
"
BpmTaskTodo
"
,
name
:
"
BpmTaskTodo
"
,
components
:
{},
components
:
{},
data
()
{
data
()
{
...
@@ -118,14 +198,22 @@ export default {
...
@@ -118,14 +198,22 @@ export default {
created
()
{
created
()
{
this
.
getList
();
this
.
getList
();
},
},
watch
:
{
//lanbm 2024-05-08 添加页面再次进入刷新列表优化
$route
(
to
)
{
if
(
this
.
$route
.
path
==
"
/task/todo
"
)
{
this
.
getList
();
}
},
},
methods
:
{
methods
:
{
/** 查询列表 */
/** 查询列表 */
getList
()
{
getList
()
{
this
.
loading
=
true
;
this
.
loading
=
true
;
// 处理查询参数
// 处理查询参数
let
params
=
{
...
this
.
queryParams
};
let
params
=
{
...
this
.
queryParams
};
this
.
addBeginAndEndTime
(
params
,
this
.
dateRangeCreateTime
,
'
createTime
'
);
this
.
addBeginAndEndTime
(
params
,
this
.
dateRangeCreateTime
,
"
createTime
"
);
getTodoTaskPage
(
params
).
then
(
response
=>
{
getTodoTaskPage
(
params
).
then
(
(
response
)
=>
{
this
.
list
=
response
.
data
.
list
;
this
.
list
=
response
.
data
.
list
;
this
.
total
=
response
.
data
.
total
;
this
.
total
=
response
.
data
.
total
;
this
.
loading
=
false
;
this
.
loading
=
false
;
...
@@ -144,23 +232,28 @@ export default {
...
@@ -144,23 +232,28 @@ export default {
},
},
/** 处理审批按钮 */
/** 处理审批按钮 */
handleAudit
(
row
)
{
handleAudit
(
row
)
{
this
.
$router
.
push
({
path
:
"
/bpm/process-instance/detail
"
,
query
:
{
id
:
row
.
processInstance
.
id
}});
this
.
$router
.
push
({
path
:
"
/bpm/process-instance/detail
"
,
query
:
{
id
:
row
.
processInstance
.
id
},
});
},
},
handleCancel
(
row
)
{
handleCancel
(
row
)
{
const
id
=
row
.
id
;
const
id
=
row
.
id
;
this
.
$prompt
(
this
.
$t
(
'
请输入取消原因?
'
),
this
.
$t
(
"
取消流程
"
),
{
this
.
$prompt
(
this
.
$t
(
"
请输入取消原因?
"
),
this
.
$t
(
"
取消流程
"
),
{
type
:
'
warning
'
,
type
:
"
warning
"
,
confirmButtonText
:
this
.
$t
(
"
确定
"
),
confirmButtonText
:
this
.
$t
(
"
确定
"
),
cancelButtonText
:
this
.
$t
(
"
取消
"
),
cancelButtonText
:
this
.
$t
(
"
取消
"
),
inputPattern
:
/^
[\s\S]
*.*
[^\s][\s\S]
*$/
,
// 判断非空,且非空格
inputPattern
:
/^
[\s\S]
*.*
[^\s][\s\S]
*$/
,
// 判断非空,且非空格
inputErrorMessage
:
this
.
$t
(
"
取消原因不能为空
"
),
inputErrorMessage
:
this
.
$t
(
"
取消原因不能为空
"
),
}).
then
(({
value
})
=>
{
})
.
then
(({
value
})
=>
{
return
cancelProcessInstance
(
id
,
value
);
return
cancelProcessInstance
(
id
,
value
);
}).
then
(()
=>
{
})
.
then
(()
=>
{
this
.
getList
();
this
.
getList
();
this
.
$modal
.
msgSuccess
(
this
.
$t
(
"
取消成功
"
));
this
.
$modal
.
msgSuccess
(
this
.
$t
(
"
取消成功
"
));
})
});
},
},
},
}
};
};
</
script
>
</
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