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
d766b36e
authored
Dec 30, 2023
by
puhui999
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修复请假申请提交后页面不返回的bug
parent
aadad39a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
58 additions
and
44 deletions
+58
-44
src/views/bpm/oa/leave/create.vue
+11
-12
src/views/bpm/oa/leave/index.vue
+47
-32
No files found.
src/views/bpm/oa/leave/create.vue
View file @
d766b36e
<
template
>
<el-form
ref=
"formRef"
v-loading=
"formLoading"
:model=
"formData"
:rules=
"formRules"
label-width=
"80px"
v-loading=
"formLoading"
>
<el-form-item
label=
"请假类型"
prop=
"type"
>
<el-select
v-model=
"formData.type"
placeholder=
"请选择请假类型"
clearable
>
<el-select
v-model=
"formData.type"
clearable
placeholder=
"请选择请假类型"
>
<el-option
v-for=
"dict in getIntDictOptions(DICT_TYPE.BPM_OA_LEAVE_TYPE)"
:key=
"dict.value"
...
...
@@ -18,27 +18,27 @@
</el-form-item>
<el-form-item
label=
"开始时间"
prop=
"startTime"
>
<el-date-picker
clearable
v-model=
"formData.startTime"
clearable
placeholder=
"请选择开始时间"
type=
"datetime"
value-format=
"x"
placeholder=
"请选择开始时间"
/>
</el-form-item>
<el-form-item
label=
"结束时间"
prop=
"endTime"
>
<el-date-picker
clearable
v-model=
"formData.endTime"
clearable
placeholder=
"请选择结束时间"
type=
"datetime"
value-format=
"x"
placeholder=
"请选择结束时间"
/>
</el-form-item>
<el-form-item
label=
"原因"
prop=
"reason"
>
<el-input
v-model=
"formData.reason"
type=
"textarea"
placeholder=
"请输请假原因
"
/>
<el-input
v-model=
"formData.reason"
placeholder=
"请输请假原因"
type=
"textarea
"
/>
</el-form-item>
<el-form-item>
<el-button
@
click=
"submitForm"
type=
"primary"
:disabled=
"formLoading
"
>
确 定
</el-button>
<el-button
:disabled=
"formLoading"
type=
"primary"
@
click=
"submitForm
"
>
确 定
</el-button>
</el-form-item>
</el-form>
</
template
>
...
...
@@ -50,9 +50,6 @@ import { useTagsViewStore } from '@/store/modules/tagsView'
defineOptions
({
name
:
'BpmOALeaveCreate'
})
const
message
=
useMessage
()
// 消息弹窗
const
{
delView
}
=
useTagsViewStore
()
// 视图操作
const
{
currentRoute
}
=
useRouter
()
// 路由
const
formLoading
=
ref
(
false
)
// 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用
const
formData
=
ref
({
type
:
undefined
,
...
...
@@ -67,7 +64,8 @@ const formRules = reactive({
endTime
:
[{
required
:
true
,
message
:
'请假结束时间不能为空'
,
trigger
:
'change'
}]
})
const
formRef
=
ref
()
// 表单 Ref
const
{
delView
}
=
useTagsViewStore
()
// 视图操作
const
{
push
,
currentRoute
}
=
useRouter
()
// 路由
/** 提交表单 */
const
submitForm
=
async
()
=>
{
// 校验表单
...
...
@@ -82,6 +80,7 @@ const submitForm = async () => {
message
.
success
(
'发起成功'
)
// 关闭当前 Tab
delView
(
unref
(
currentRoute
))
await
push
({
name
:
'BpmOALeave'
})
}
finally
{
formLoading
.
value
=
false
}
...
...
src/views/bpm/oa/leave/index.vue
View file @
d766b36e
...
...
@@ -2,18 +2,18 @@
<ContentWrap>
<!-- 搜索工作栏 -->
<el-form
class=
"-mb-15px"
:model=
"queryParams"
ref=
"queryFormRef"
:inline=
"true"
:model=
"queryParams"
class=
"-mb-15px"
label-width=
"68px"
>
<el-form-item
label=
"请假类型"
prop=
"type"
>
<el-select
v-model=
"queryParams.type"
placeholder=
"请选择请假类型"
clearable
class=
"!w-240px"
clearable
placeholder=
"请选择请假类型"
>
<el-option
v-for=
"dict in getIntDictOptions(DICT_TYPE.BPM_OA_LEAVE_TYPE)"
...
...
@@ -26,16 +26,16 @@
<el-form-item
label=
"申请时间"
prop=
"createTime"
>
<el-date-picker
v-model=
"queryParams.createTime"
value-format=
"YYYY-MM-DD HH:mm:ss"
type=
"daterange"
start-placeholder=
"开始日期"
end-placeholder=
"结束日期"
:default-time=
"[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class=
"!w-240px"
end-placeholder=
"结束日期"
start-placeholder=
"开始日期"
type=
"daterange"
value-format=
"YYYY-MM-DD HH:mm:ss"
/>
</el-form-item>
<el-form-item
label=
"结果"
prop=
"result"
>
<el-select
v-model=
"queryParams.result"
placeholder=
"请选择结果"
clearable
class=
"!w-240px
"
>
<el-select
v-model=
"queryParams.result"
class=
"!w-240px"
clearable
placeholder=
"请选择结果
"
>
<el-option
v-for=
"dict in getIntDictOptions(DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT)"
:key=
"dict.value"
...
...
@@ -47,17 +47,24 @@
<el-form-item
label=
"原因"
prop=
"reason"
>
<el-input
v-model=
"queryParams.reason"
placeholder=
"请输入原因
"
class=
"!w-240px
"
clearable
placeholder=
"请输入原因"
@
keyup
.
enter=
"handleQuery"
class=
"!w-240px"
/>
</el-form-item>
<el-form-item>
<el-button
@
click=
"handleQuery"
><Icon
icon=
"ep:search"
class=
"mr-5px"
/>
搜索
</el-button>
<el-button
@
click=
"resetQuery"
><Icon
icon=
"ep:refresh"
class=
"mr-5px"
/>
重置
</el-button>
<el-button
type=
"primary"
plain
@
click=
"handleCreate()"
>
<Icon
icon=
"ep:plus"
class=
"mr-5px"
/>
发起请假
<el-button
@
click=
"handleQuery"
>
<Icon
class=
"mr-5px"
icon=
"ep:search"
/>
搜索
</el-button>
<el-button
@
click=
"resetQuery"
>
<Icon
class=
"mr-5px"
icon=
"ep:refresh"
/>
重置
</el-button>
<el-button
plain
type=
"primary"
@
click=
"handleCreate()"
>
<Icon
class=
"mr-5px"
icon=
"ep:plus"
/>
发起请假
</el-button>
</el-form-item>
</el-form>
...
...
@@ -66,63 +73,63 @@
<!-- 列表 -->
<ContentWrap>
<el-table
v-loading=
"loading"
:data=
"list"
>
<el-table-column
label=
"申请编号"
align=
"center
"
prop=
"id"
/>
<el-table-column
label=
"状态"
align=
"center
"
prop=
"result"
>
<el-table-column
align=
"center"
label=
"申请编号
"
prop=
"id"
/>
<el-table-column
align=
"center"
label=
"状态
"
prop=
"result"
>
<template
#
default=
"scope"
>
<dict-tag
:type=
"DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT"
:value=
"scope.row.result"
/>
</
template
>
</el-table-column>
<el-table-column
label=
"开始时间
"
:formatter=
"dateFormatter
"
align=
"center"
label=
"开始时间"
prop=
"startTime"
width=
"180"
:formatter=
"dateFormatter"
/>
<el-table-column
label=
"结束时间
"
:formatter=
"dateFormatter
"
align=
"center"
label=
"结束时间"
prop=
"endTime"
width=
"180"
:formatter=
"dateFormatter"
/>
<el-table-column
label=
"请假类型"
align=
"center
"
prop=
"type"
>
<el-table-column
align=
"center"
label=
"请假类型
"
prop=
"type"
>
<
template
#
default=
"scope"
>
<dict-tag
:type=
"DICT_TYPE.BPM_OA_LEAVE_TYPE"
:value=
"scope.row.type"
/>
</
template
>
</el-table-column>
<el-table-column
label=
"原因"
align=
"center
"
prop=
"reason"
/>
<el-table-column
align=
"center"
label=
"原因
"
prop=
"reason"
/>
<el-table-column
label=
"申请时间
"
:formatter=
"dateFormatter
"
align=
"center"
label=
"申请时间"
prop=
"createTime"
width=
"180"
:formatter=
"dateFormatter"
/>
<el-table-column
label=
"操作"
align=
"center
"
width=
"200"
>
<el-table-column
align=
"center"
label=
"操作
"
width=
"200"
>
<
template
#
default=
"scope"
>
<el-button
v-hasPermi=
"['bpm:oa-leave:query']"
link
type=
"primary"
@
click=
"handleDetail(scope.row)"
v-hasPermi=
"['bpm:oa-leave:query']"
>
详情
</el-button>
<el-button
v-hasPermi=
"['bpm:oa-leave:query']"
link
type=
"primary"
@
click=
"handleProcessDetail(scope.row)"
v-hasPermi=
"['bpm:oa-leave:query']"
>
进度
</el-button>
<el-button
v-if=
"scope.row.result === 1"
v-hasPermi=
"['bpm:oa-leave:create']"
link
type=
"danger"
@
click=
"cancelLeave(scope.row)"
v-hasPermi=
"['bpm:oa-leave:create']"
v-if=
"scope.row.result === 1"
>
取消
</el-button>
...
...
@@ -131,9 +138,9 @@
</el-table>
<!-- 分页 -->
<Pagination
:total=
"total"
v-model:page=
"queryParams.pageNo"
v-model:limit=
"queryParams.pageSize"
v-model:page=
"queryParams.pageNo"
:total=
"total"
@
pagination=
"getList"
/>
</ContentWrap>
...
...
@@ -228,6 +235,14 @@ const handleProcessDetail = (row) => {
})
}
// fix: 列表不刷新的问题。
watch
(
()
=>
router
.
currentRoute
.
value
,
()
=>
{
getList
()
}
)
/** 初始化 **/
onMounted
(()
=>
{
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