This commit is contained in:
Pancaihua 2024-10-28 14:44:20 +08:00
parent f95f3942aa
commit 0d8b8afee1
8 changed files with 1291 additions and 20 deletions

View File

@ -0,0 +1,51 @@
import request from '@/config/axios'
// 请假管理 VO
export interface QjglVO {
id: number // id
title: string // 请假标题
reason: string // 请假原因
type: number // 请假类型
startTime: Date // 开始时间
endTime: Date // 结束时间
day: number // 请假天数
filePath: string // 文件路径
userName: string // 作者
deptId: number // 部门id
processInstanceId: string // 流程实例的编号
userId: number // 申请人的用户编号
status: number // 审批状态
}
// 请假管理 API
export const QjglApi = {
// 查询请假管理分页
getQjglPage: async (params: any) => {
return await request.get({ url: `/home/qjgl/page`, params })
},
// 查询请假管理详情
getQjgl: async (id: number) => {
return await request.get({ url: `/home/qjgl/get?id=` + id })
},
// 新增请假管理
createQjgl: async (data: QjglVO) => {
return await request.post({ url: `/home/qjgl/create`, data })
},
// 修改请假管理
updateQjgl: async (data: QjglVO) => {
return await request.put({ url: `/home/qjgl/update`, data })
},
// 删除请假管理
deleteQjgl: async (id: number) => {
return await request.delete({ url: `/home/qjgl/delete?id=` + id })
},
// 导出请假管理 Excel
exportQjgl: async (params) => {
return await request.download({ url: `/home/qjgl/export-excel`, params })
}
}

View File

@ -70,26 +70,6 @@ const remainingRouter: AppRouteRecordRaw[] = [
}
]
},
// {
// path: '/ai/music',
// component: Layout,
// redirect: '/index',
// name: 'AIMusic',
// meta: {},
// children: [
// {
// path: 'index',
// component: () => import('@/views/ai/music/components/index.vue'),
// name: 'AIMusicIndex',
// meta: {
// title: 'AI 音乐',
// icon: 'ep:home-filled',
// noCache: false,
// affix: true
// }
// }
// ]
// },
{
path: '/user',
component: Layout,
@ -641,6 +621,38 @@ const remainingRouter: AppRouteRecordRaw[] = [
component: () => import('@/views/crm/product/detail/index.vue')
}
]
},
{
path: '/Home',
// component: Layout,
name: 'homeCenter',
meta: {hidden: true},
children: [
{
path: 'qjgl/QjglDetail',
component: () => import('@/views/Home/qjgl/QjglDetail.vue'),
name: 'QjglDetail',
meta: {
noCache: true,
hidden: true,
canTo: true,
title: '查看请假流程',
activeMenu: 'qjgl/qjglflow'
}
},
{
path: 'qjgl/QjglCreate',
component: () => import('@/views/Home/qjgl/QjglCreate.vue'),
name: 'QjglCreate',
meta: {
noCache: true,
hidden: true,
canTo: true,
title: '发起请假流程',
activeMenu: 'qjgl/qjglflow'
}
}
]
}
]

View File

@ -0,0 +1,214 @@
<template>
<!-- <Dialog :title="dialogTitle" v-model="dialogVisible">-->
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
label-width="100px"
v-loading="formLoading"
>
<el-form-item label="请假标题" prop="title">
<el-input v-model="formData.title" placeholder="请输入请假标题" />
</el-form-item>
<el-form-item label="请假原因" prop="reason">
<el-input v-model="formData.reason" placeholder="请输入请假原因" />
</el-form-item>
<el-form-item label="请假类型" prop="type">
<el-select v-model="formData.type" placeholder="请选择请假类型">
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.BPM_OA_LEAVE_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="开始时间" prop="startTime">
<el-date-picker
v-model="formData.startTime"
type="date"
value-format="x"
placeholder="选择开始时间"
/>
</el-form-item>
<el-form-item label="结束时间" prop="endTime">
<el-date-picker
v-model="formData.endTime"
type="date"
value-format="x"
placeholder="选择结束时间"
/>
</el-form-item>
<el-form-item label="请假天数" prop="day">
<el-input v-model="formData.day" placeholder="请输入请假天数" />
</el-form-item>
<el-form-item label="文件路径" prop="filePath">
<el-input v-model="formData.filePath" placeholder="请输入文件路径" />
</el-form-item>
<el-form-item label="作者" prop="userName">
<el-input v-model="formData.userName" placeholder="请输入作者" />
</el-form-item>
<el-form-item label="部门id" prop="deptId">
<el-input v-model="formData.deptId" placeholder="请输入部门id" />
</el-form-item>
<!-- <el-form-item label="申请人的用户编号" prop="userId">-->
<!-- <el-input v-model="formData.userId" placeholder="请输入申请人的用户编号" />-->
<!-- </el-form-item>-->
</el-form>
<!-- <template #footer>-->
<el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button>
<!-- <el-button @click="dialogVisible = false"> </el-button>-->
<!-- </template>-->
<!-- </Dialog>-->
</template>
<script setup lang="ts">
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import { QjglApi, QjglVO } from '@/api/home/qjgl'
import * as DefinitionApi from '@/api/bpm/definition'
import * as UserApi from '@/api/system/user'
import {useTagsViewStore} from "@/store/modules/tagsView";
/** 请假管理 表单 */
defineOptions({ name: 'QjglCreate' })
const { t } = useI18n() //
const message = useMessage() //
const { delView } = useTagsViewStore() //
const { push, currentRoute } = useRouter() //
// const dialogVisible = ref(false) //
// const dialogTitle = ref('') //
const formLoading = ref(false) // 12
const formType = ref('') // create - update -
const formData = ref({
id: undefined,
title: undefined,
reason: undefined,
type: undefined,
startTime: undefined,
endTime: undefined,
day: undefined,
filePath: undefined,
userName: undefined,
deptId: undefined,
processInstanceId: undefined,
userId: undefined,
status: undefined
})
const formRules = reactive({
reason: [{ required: true, message: '请假原因不能为空', trigger: 'blur' }],
type: [{ required: true, message: '请假类型不能为空', trigger: 'change' }],
startTime: [{ required: true, message: '开始时间不能为空', trigger: 'blur' }],
endTime: [{ required: true, message: '结束时间不能为空', trigger: 'blur' }],
day: [{ required: true, message: '请假天数不能为空', trigger: 'blur' }],
userName: [{ required: true, message: '作者不能为空', trigger: 'blur' }]
})
const formRef = ref() // Ref
/** 打开弹窗 */
// const open = async (type: string, id?: number) => {
// dialogVisible.value = true
// dialogTitle.value = t('action.' + type)
// formType.value = type
// resetForm()
// //
// if (id) {
// formLoading.value = true
// try {
// formData.value = await QjglApi.getQjgl(id)
// } finally {
// formLoading.value = false
// }
// }
// }
// defineExpose({ open }) // open
//flow begin++++++++++++++++++++
//
const processDefineKey = 'pch-qjgl-001' // Key
const startUserSelectTasks = ref([]) //
const startUserSelectAssignees = ref({}) //
const startUserSelectAssigneesFormRef = ref() // Ref
const startUserSelectAssigneesFormRules = ref({}) // Rules
const userList = ref<any[]>([]) //
/** 提交表单 */
const emit = defineEmits(['success']) // success
const submitForm = async () => {
//
await formRef.value.validate()
// ++
if (startUserSelectTasks.value?.length > 0) {
await startUserSelectAssigneesFormRef.value.validate()
}
//
formLoading.value = true
try {
const data = formData.value as unknown as QjglVO
// // ++
if (startUserSelectTasks.value?.length > 0) {
data.startUserSelectAssignees = startUserSelectAssignees.value
}
await QjglApi.createQjgl(data)
message.success(t('common.createSuccess'))
} finally {
formLoading.value = false
}
}
/** 重置表单 */
const resetForm = () => {
formData.value = {
id: undefined,
title: undefined,
reason: undefined,
type: undefined,
startTime: undefined,
endTime: undefined,
day: undefined,
filePath: undefined,
userName: undefined,
deptId: undefined,
processInstanceId: undefined,
userId: undefined,
status: undefined
}
formRef.value?.resetFields()
}
/** 初始化 */
onMounted(async () => {
// await getUserInfo()
// await getKnowtypeTree()
console.log(processDefineKey,"key1")
const processDefinitionDetail = await DefinitionApi.getProcessDefinition(
undefined,
processDefineKey
)
if (!processDefinitionDetail) {
message.error('OA 请假的流程模型未配置,请检查!')
return
}
startUserSelectTasks.value = processDefinitionDetail.startUserSelectTasks
// console.log(startUserSelectTasks.value?.length ,"length")
// console.log(startUserSelectTasks.value ,"startUserSelectTasks.value")
//
if (startUserSelectTasks.value?.length > 0) {
//
for (const userTask of startUserSelectTasks.value) {
startUserSelectAssignees.value[userTask.id] = []
startUserSelectAssigneesFormRules.value[userTask.id] = [
{ required: true, message: '请选择审批人', trigger: 'blur' }
]
}
//
userList.value = await UserApi.getSimpleUserList()
console.log(userList.value ,"userList.value")
}
})
</script>

View File

@ -0,0 +1,186 @@
<template>
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
label-width="100px"
v-loading="formLoading"
>
<el-form-item label="请假标题" prop="title">
<el-input v-model="formData.title" placeholder="请输入请假标题" readonly/>
</el-form-item>
<el-form-item label="请假原因" prop="reason">
<el-input v-model="formData.reason" placeholder="请输入请假原因" readonly/>
</el-form-item>
<el-form-item label="请假类型" prop="type">
<el-select v-model="formData.type" placeholder="请选择请假类型" :disabled="isReadOnly" >
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.BPM_OA_LEAVE_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="开始时间" prop="startTime" readonly>
<el-date-picker
v-model="formData.startTime"
type="date"
value-format="x"
placeholder="选择开始时间"
/>
</el-form-item>
<el-form-item label="结束时间" prop="endTime" readonly>
<el-date-picker
v-model="formData.endTime"
type="date"
value-format="x"
placeholder="选择结束时间"
/>
</el-form-item>
<el-form-item label="请假天数" prop="day">
<el-input v-model="formData.day" placeholder="请输入请假天数" />
</el-form-item>
<el-form-item label="文件路径" prop="filePath">
<el-input v-model="formData.filePath" placeholder="请输入文件路径" />
</el-form-item>
<el-form-item label="作者" prop="userName">
<el-input v-model="formData.userName" placeholder="请输入作者" />
</el-form-item>
<el-form-item label="部门id" prop="deptId">
<el-input v-model="formData.deptId" placeholder="请输入部门id" />
</el-form-item>
<el-form-item label="流程实例的编号" prop="processInstanceId">
<el-input v-model="formData.processInstanceId" placeholder="请输入流程实例的编号" />
</el-form-item>
<el-form-item label="申请人的用户编号" prop="userId">
<el-input v-model="formData.userId" placeholder="请输入申请人的用户编号" />
</el-form-item>
<el-form-item label="审批状态" prop="status">
<el-input v-model="formData.status" placeholder="请输入审批状态" />
</el-form-item>
</el-form>
<!-- <template #footer>-->
<!-- <el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button>-->
<!-- <el-button @click="dialogVisible = false"> </el-button>-->
<!-- </template>-->
<!-- </Dialog>-->
</template>
<script setup lang="ts">
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import { QjglApi, QjglVO } from '@/api/home/qjgl'
import { propTypes } from '@/utils/propTypes'
/** 请假管理 表单 */
defineOptions({ name: 'QjglDetail' })
const { t } = useI18n() //
const message = useMessage() //
const props = defineProps({
id: propTypes.number.def(undefined)
})
const dialogVisible = ref(false) //
const dialogTitle = ref('') //
const formLoading = ref(false) // 12
const formType = ref('') // create - update -
const formData = ref({
id: undefined,
title: undefined,
reason: undefined,
type: undefined,
startTime: undefined,
endTime: undefined,
day: undefined,
filePath: undefined,
userName: undefined,
deptId: undefined,
processInstanceId: undefined,
userId: undefined,
status: undefined
})
const formRules = reactive({
reason: [{ required: true, message: '请假原因不能为空', trigger: 'blur' }],
type: [{ required: true, message: '请假类型不能为空', trigger: 'change' }],
startTime: [{ required: true, message: '开始时间不能为空', trigger: 'blur' }],
endTime: [{ required: true, message: '结束时间不能为空', trigger: 'blur' }],
day: [{ required: true, message: '请假天数不能为空', trigger: 'blur' }],
userName: [{ required: true, message: '作者不能为空', trigger: 'blur' }]
})
const formRef = ref() // Ref
/** 打开弹窗 */
// const open = async (type: string, id?: number) => {
// dialogVisible.value = true
// dialogTitle.value = t('action.' + type)
// formType.value = type
// resetForm()
// //
// if (id) {
// formLoading.value = true
// try {
// formData.value = await QjglApi.getQjgl(id)
// } finally {
// formLoading.value = false
// }
// }
// }
defineExpose({ open }) // open
/** 提交表单 */
const emit = defineEmits(['success']) // success
const submitForm = async () => {
//
await formRef.value.validate()
//
formLoading.value = true
try {
const data = formData.value as unknown as QjglVO
if (formType.value === 'create') {
await QjglApi.createQjgl(data)
message.success(t('common.createSuccess'))
} else {
await QjglApi.updateQjgl(data)
message.success(t('common.updateSuccess'))
}
dialogVisible.value = false
//
emit('success')
} finally {
formLoading.value = false
}
}
/** 重置表单 */
const resetForm = () => {
formData.value = {
id: undefined,
title: undefined,
reason: undefined,
type: undefined,
startTime: undefined,
endTime: undefined,
day: undefined,
filePath: undefined,
userName: undefined,
deptId: undefined,
processInstanceId: undefined,
userId: undefined,
status: undefined
}
formRef.value?.resetFields()
}
onMounted(async () => {
const id = props.id || queryId
console.log("id",id)
if (id) {
formLoading.value = true
try {
formData.value = await QjglApi.getQjgl(id)
} finally {
formLoading.value = false
}
}
// await getUserInfo()
// await getKnowtypeTree()
})
</script>

View File

@ -0,0 +1,214 @@
<template>
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
label-width="100px"
v-loading="formLoading"
>
<el-form-item label="请假标题" prop="title">
<el-input v-model="formData.title" placeholder="请输入请假标题" />
</el-form-item>
<el-form-item label="请假原因" prop="reason">
<el-input v-model="formData.reason" placeholder="请输入请假原因" />
</el-form-item>
<el-form-item label="请假类型" prop="type">
<el-select v-model="formData.type" placeholder="请选择请假类型">
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.BPM_OA_LEAVE_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="开始时间" prop="startTime">
<el-date-picker
v-model="formData.startTime"
type="date"
value-format="x"
placeholder="选择开始时间"
/>
</el-form-item>
<el-form-item label="结束时间" prop="endTime">
<el-date-picker
v-model="formData.endTime"
type="date"
value-format="x"
placeholder="选择结束时间"
/>
</el-form-item>
<el-form-item label="请假天数" prop="day">
<el-input v-model="formData.day" placeholder="请输入请假天数" />
</el-form-item>
<el-form-item label="文件路径" prop="filePath">
<el-input v-model="formData.filePath" placeholder="请输入文件路径" />
</el-form-item>
<el-form-item label="作者" prop="userName">
<el-input v-model="formData.userName" placeholder="请输入作者" />
</el-form-item>
<el-form-item label="部门id" prop="deptId">
<el-input v-model="formData.deptId" placeholder="请输入部门id" />
</el-form-item>
<el-form-item label="流程实例的编号" prop="processInstanceId">
<el-input v-model="formData.processInstanceId" placeholder="请输入流程实例的编号" />
</el-form-item>
<el-form-item label="申请人的用户编号" prop="userId">
<el-input v-model="formData.userId" placeholder="请输入申请人的用户编号" />
</el-form-item>
<el-form-item label="审批状态" prop="status">
<el-input v-model="formData.status" placeholder="请输入审批状态" />
</el-form-item>
</el-form>
<!-- <template #footer>-->
<el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button>
<!-- <el-button @click="dialogVisible = false"> </el-button>-->
<!-- </template>-->
<!-- </Dialog>-->
</template>
<script setup lang="ts">
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import { QjglApi, QjglVO } from '@/api/home/qjgl'
import * as DefinitionApi from '@/api/bpm/definition'
import * as UserApi from '@/api/system/user'
import {useTagsViewStore} from "@/store/modules/tagsView";
/** 请假管理 表单 */
defineOptions({ name: 'QjglForm' })
const { t } = useI18n() //
const message = useMessage() //
const { delView } = useTagsViewStore() //
const { push, currentRoute } = useRouter() //
// const dialogVisible = ref(false) //
// const dialogTitle = ref('') //
const formLoading = ref(false) // 12
const formType = ref('') // create - update -
const formData = ref({
id: undefined,
title: undefined,
reason: undefined,
type: undefined,
startTime: undefined,
endTime: undefined,
day: undefined,
filePath: undefined,
userName: undefined,
deptId: undefined,
processInstanceId: undefined,
userId: undefined,
status: undefined
})
const formRules = reactive({
reason: [{ required: true, message: '请假原因不能为空', trigger: 'blur' }],
type: [{ required: true, message: '请假类型不能为空', trigger: 'change' }],
startTime: [{ required: true, message: '开始时间不能为空', trigger: 'blur' }],
endTime: [{ required: true, message: '结束时间不能为空', trigger: 'blur' }],
day: [{ required: true, message: '请假天数不能为空', trigger: 'blur' }],
userName: [{ required: true, message: '作者不能为空', trigger: 'blur' }]
})
const formRef = ref() // Ref
/** 打开弹窗 */
// const open = async (type: string, id?: number) => {
// dialogVisible.value = true
// dialogTitle.value = t('action.' + type)
// formType.value = type
// resetForm()
// //
// if (id) {
// formLoading.value = true
// try {
// formData.value = await QjglApi.getQjgl(id)
// } finally {
// formLoading.value = false
// }
// }
// }
// defineExpose({ open }) // open
//flow begin++++++++++++++++++++
//
const processDefineKey = 'my-test-flow03' // Key
const startUserSelectTasks = ref([]) //
const startUserSelectAssignees = ref({}) //
const startUserSelectAssigneesFormRef = ref() // Ref
const startUserSelectAssigneesFormRules = ref({}) // Rules
const userList = ref<any[]>([]) //
/** 提交表单 */
const emit = defineEmits(['success']) // success
const submitForm = async () => {
//
await formRef.value.validate()
// ++
if (startUserSelectTasks.value?.length > 0) {
await startUserSelectAssigneesFormRef.value.validate()
}
//
formLoading.value = true
try {
const data = formData.value as unknown as QjglVO
// ++
if (startUserSelectTasks.value?.length > 0) {
data.startUserSelectAssignees = startUserSelectAssignees.value
}
await QjglApi.createQjgl(data)
message.success(t('common.createSuccess'))
formLoading.value = false
} finally {
//formLoading.value = false
}
}
/** 重置表单 */
const resetForm = () => {
formData.value = {
id: undefined,
title: undefined,
reason: undefined,
type: undefined,
startTime: undefined,
endTime: undefined,
day: undefined,
filePath: undefined,
userName: undefined,
deptId: undefined,
processInstanceId: undefined,
userId: undefined,
status: undefined
}
formRef.value?.resetFields()
}
/** 初始化 */
onMounted(async () => {
// await getUserInfo()
// await getKnowtypeTree()
const processDefinitionDetail = await DefinitionApi.getProcessDefinition(
undefined,
processDefineKey
)
if (!processDefinitionDetail) {
message.error('OA 请假的流程模型未配置,请检查!')
return
}
startUserSelectTasks.value = processDefinitionDetail.startUserSelectTasks
console.log(startUserSelectTasks.value?.length ,"length")
//
if (startUserSelectTasks.value?.length > 0) {
//
for (const userTask of startUserSelectTasks.value) {
startUserSelectAssignees.value[userTask.id] = []
startUserSelectAssigneesFormRules.value[userTask.id] = [
{ required: true, message: '请选择审批人', trigger: 'blur' }
]
}
//
userList.value = await UserApi.getSimpleUserList()
}
})
</script>

View File

@ -0,0 +1,209 @@
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible">
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
label-width="100px"
v-loading="formLoading"
>
<el-form-item label="请假标题" prop="title">
<el-input v-model="formData.title" placeholder="请输入请假标题" />
</el-form-item>
<el-form-item label="请假原因" prop="reason">
<el-input v-model="formData.reason" placeholder="请输入请假原因" />
</el-form-item>
<el-form-item label="请假类型" prop="type">
<el-select v-model="formData.type" placeholder="请选择请假类型">
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.BPM_OA_LEAVE_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="开始时间" prop="startTime">
<el-date-picker
v-model="formData.startTime"
type="date"
value-format="x"
placeholder="选择开始时间"
/>
</el-form-item>
<el-form-item label="结束时间" prop="endTime">
<el-date-picker
v-model="formData.endTime"
type="date"
value-format="x"
placeholder="选择结束时间"
/>
</el-form-item>
<el-form-item label="请假天数" prop="day">
<el-input v-model="formData.day" placeholder="请输入请假天数" />
</el-form-item>
<el-form-item label="文件路径" prop="filePath">
<el-input v-model="formData.filePath" placeholder="请输入文件路径" />
</el-form-item>
<el-form-item label="作者" prop="userName">
<el-input v-model="formData.userName" placeholder="请输入作者" />
</el-form-item>
<el-form-item label="部门id" prop="deptId">
<el-input v-model="formData.deptId" placeholder="请输入部门id" />
</el-form-item>
<el-form-item label="申请人的用户编号" prop="userId">
<el-input v-model="formData.userId" placeholder="请输入申请人的用户编号" />
</el-form-item>
</el-form>
<template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button>
<el-button @click="dialogVisible = false"> </el-button>
</template>
</Dialog>
</template>
<script setup lang="ts">
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import { QjglApi, QjglVO } from '@/api/home/qjgl'
import * as DefinitionApi from '@/api/bpm/definition'
import * as UserApi from '@/api/system/user'
import {useTagsViewStore} from "@/store/modules/tagsView";
/** 请假管理 表单 */
defineOptions({ name: 'QjglForm' })
const { t } = useI18n() //
const message = useMessage() //
const { delView } = useTagsViewStore() //
const { push, currentRoute } = useRouter() //
// const dialogVisible = ref(false) //
// const dialogTitle = ref('') //
const formLoading = ref(false) // 12
const formType = ref('') // create - update -
const formData = ref({
id: undefined,
title: undefined,
reason: undefined,
type: undefined,
startTime: undefined,
endTime: undefined,
day: undefined,
filePath: undefined,
userName: undefined,
deptId: undefined,
processInstanceId: undefined,
userId: undefined,
status: undefined
})
const formRules = reactive({
reason: [{ required: true, message: '请假原因不能为空', trigger: 'blur' }],
type: [{ required: true, message: '请假类型不能为空', trigger: 'change' }],
startTime: [{ required: true, message: '开始时间不能为空', trigger: 'blur' }],
endTime: [{ required: true, message: '结束时间不能为空', trigger: 'blur' }],
day: [{ required: true, message: '请假天数不能为空', trigger: 'blur' }],
userName: [{ required: true, message: '作者不能为空', trigger: 'blur' }]
})
const formRef = ref() // Ref
/** 打开弹窗 */
// const open = async (type: string, id?: number) => {
// dialogVisible.value = true
// dialogTitle.value = t('action.' + type)
// formType.value = type
// resetForm()
// //
// if (id) {
// formLoading.value = true
// try {
// formData.value = await QjglApi.getQjgl(id)
// } finally {
// formLoading.value = false
// }
// }
// }
// defineExpose({ open }) // open
//flow begin++++++++++++++++++++
//
const processDefineKey = 'my-test-flow03' // Key
const startUserSelectTasks = ref([]) //
const startUserSelectAssignees = ref({}) //
const startUserSelectAssigneesFormRef = ref() // Ref
const startUserSelectAssigneesFormRules = ref({}) // Rules
const userList = ref<any[]>([]) //
/** 提交表单 */
const emit = defineEmits(['success']) // success
const submitForm = async () => {
//
await formRef.value.validate()
// ++
if (startUserSelectTasks.value?.length > 0) {
await startUserSelectAssigneesFormRef.value.validate()
}
//
formLoading.value = true
try {
const data = formData.value as unknown as QjglVO
// ++
if (startUserSelectTasks.value?.length > 0) {
data.startUserSelectAssignees = startUserSelectAssignees.value
}
await QjglApi.createQjgl(data)
message.success(t('common.createSuccess'))
} finally {
formLoading.value = false
}
}
/** 重置表单 */
const resetForm = () => {
formData.value = {
id: undefined,
title: undefined,
reason: undefined,
type: undefined,
startTime: undefined,
endTime: undefined,
day: undefined,
filePath: undefined,
userName: undefined,
deptId: undefined,
processInstanceId: undefined,
userId: undefined,
status: undefined
}
formRef.value?.resetFields()
}
/** 初始化 */
onMounted(async () => {
// await getUserInfo()
// await getKnowtypeTree()
const processDefinitionDetail = await DefinitionApi.getProcessDefinition(
undefined,
processDefineKey
)
if (!processDefinitionDetail) {
message.error('OA 请假的流程模型未配置,请检查!')
return
}
startUserSelectTasks.value = processDefinitionDetail.startUserSelectTasks
console.log(startUserSelectTasks.value?.length ,"length")
//
if (startUserSelectTasks.value?.length > 0) {
//
for (const userTask of startUserSelectTasks.value) {
startUserSelectAssignees.value[userTask.id] = []
startUserSelectAssigneesFormRules.value[userTask.id] = [
{ required: true, message: '请选择审批人', trigger: 'blur' }
]
}
//
userList.value = await UserApi.getSimpleUserList()
}
})
</script>

View File

@ -0,0 +1,383 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<el-form
class="-mb-15px"
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="68px"
>
<el-form-item label="请假标题" prop="title">
<el-input
v-model="queryParams.title"
placeholder="请输入请假标题"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<!-- <el-form-item label="请假原因" prop="reason">-->
<!-- <el-input-->
<!-- v-model="queryParams.reason"-->
<!-- placeholder="请输入请假原因"-->
<!-- clearable-->
<!-- @keyup.enter="handleQuery"-->
<!-- class="!w-240px"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="请假类型" prop="type">
<el-select
v-model="queryParams.type"
placeholder="请选择请假类型"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.BPM_OA_LEAVE_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="开始时间" prop="startTime">-->
<!-- <el-date-picker-->
<!-- v-model="queryParams.startTime"-->
<!-- 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"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="结束时间" prop="endTime">-->
<!-- <el-date-picker-->
<!-- v-model="queryParams.endTime"-->
<!-- 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"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="请假天数" prop="day">-->
<!-- <el-input-->
<!-- v-model="queryParams.day"-->
<!-- placeholder="请输入请假天数"-->
<!-- clearable-->
<!-- @keyup.enter="handleQuery"-->
<!-- class="!w-240px"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="文件路径" prop="filePath">-->
<!-- <el-input-->
<!-- v-model="queryParams.filePath"-->
<!-- placeholder="请输入文件路径"-->
<!-- clearable-->
<!-- @keyup.enter="handleQuery"-->
<!-- class="!w-240px"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="作者" prop="userName">
<el-input
v-model="queryParams.userName"
placeholder="请输入作者"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="部门id" prop="deptId">
<el-input
v-model="queryParams.deptId"
placeholder="请输入部门id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<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"
/>
</el-form-item>
<!-- <el-form-item label="流程实例的编号" prop="processInstanceId">-->
<!-- <el-input-->
<!-- v-model="queryParams.processInstanceId"-->
<!-- placeholder="请输入流程实例的编号"-->
<!-- clearable-->
<!-- @keyup.enter="handleQuery"-->
<!-- class="!w-240px"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="申请人的用户编号" prop="userId">-->
<!-- <el-input-->
<!-- v-model="queryParams.userId"-->
<!-- placeholder="请输入申请人的用户编号"-->
<!-- clearable-->
<!-- @keyup.enter="handleQuery"-->
<!-- class="!w-240px"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="审批状态" prop="status">-->
<!-- <el-input-->
<!-- v-model="queryParams.status"-->
<!-- placeholder="请输入审批状态"-->
<!-- clearable-->
<!-- @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()"
v-hasPermi="['home:qjgl:create']"
>
<Icon icon="ep:plus" class="mr-5px" /> 发起请假
</el-button>
<el-button
type="success"
plain
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['home:qjgl:export']"
>
<Icon icon="ep:download" class="mr-5px" /> 导出
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<!-- <el-table-column label="id" align="center" prop="id" />-->
<el-table-column label="请假标题" align="center" prop="title" />
<!-- <el-table-column label="请假原因" align="center" prop="reason" />-->
<el-table-column label="请假类型" align="center" 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="startTime"-->
<!-- :formatter="dateFormatter"-->
<!-- width="180px"-->
<!-- />-->
<!-- <el-table-column-->
<!-- label="结束时间"-->
<!-- align="center"-->
<!-- prop="endTime"-->
<!-- :formatter="dateFormatter"-->
<!-- width="180px"-->
<!-- />-->
<el-table-column label="请假天数" align="center" prop="day" />
<!-- <el-table-column label="文件路径" align="center" prop="filePath" />-->
<el-table-column label="作者" align="center" prop="userName" />
<el-table-column label="部门id" align="center" prop="deptId" />
<!-- <el-table-column-->
<!-- label="创建时间"-->
<!-- align="center"-->
<!-- prop="createTime"-->
<!-- :formatter="dateFormatter"-->
<!-- width="180px"-->
<!-- />-->
<!-- <el-table-column label="流程实例的编号" align="center" prop="processInstanceId" />-->
<!-- <el-table-column label="申请人的用户编号" align="center" prop="userId" />-->
<el-table-column label="审批状态" align="center" prop="status" />
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button
v-hasPermi="['bpm:oa-leave:query']"
link
type="primary"
@click="handleDetail(scope.row)"
>
详情
</el-button>
<el-button
link
type="danger"
@click="handleProcessDetail(scope.row)"
v-hasPermi="['bpm:knowledge:delete']"
>
进度
</el-button>
<!-- <el-button-->
<!-- link-->
<!-- type="primary"-->
<!-- @click="openForm('update', scope.row.id)"-->
<!-- v-hasPermi="['home:qjgl:update']"-->
<!-- >-->
<!-- 编辑-->
<!-- </el-button>-->
<!-- <el-button-->
<!-- link-->
<!-- type="danger"-->
<!-- @click="handleDelete(scope.row.id)"-->
<!-- v-hasPermi="['home:qjgl:delete']"-->
<!-- >-->
<!-- 删除-->
<!-- </el-button>-->
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</ContentWrap>
<!-- 表单弹窗添加/修改 -->
<!-- <QjglForm ref="formRef" @success="getList" />-->
</template>
<script setup lang="ts">
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import { dateFormatter } from '@/utils/formatTime'
import download from '@/utils/download'
import { QjglApi, QjglVO } from '@/api/home/qjgl'
// import QjglForm from './QjglFormbk.vue'
/** 请假管理 列表 */
defineOptions({ name: 'Qjgl' })
const router = useRouter() //
const message = useMessage() //
const { t } = useI18n() //
const loading = ref(true) //
const list = ref<QjglVO[]>([]) //
const total = ref(0) //
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
title: undefined,
reason: undefined,
type: undefined,
startTime: [],
endTime: [],
day: undefined,
filePath: undefined,
userName: undefined,
deptId: undefined,
createTime: [],
processInstanceId: undefined,
userId: undefined,
status: undefined
})
const queryFormRef = ref() //
const exportLoading = ref(false) //
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await QjglApi.getQjglPage(queryParams)
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value.resetFields()
handleQuery()
}
/** 添加/修改操作 */
const formRef = ref()
const openForm = (type: string, id?: number) => {
formRef.value.open(type, id)
}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
try {
//
await message.delConfirm()
//
await QjglApi.deleteQjgl(id)
message.success(t('common.delSuccess'))
//
await getList()
} catch {}
}
// flowBegin++++++++++++++++++
/** 添加操作 */
const handleCreate = () => {
router.push({ name: 'QjglCreate' })
}
/** 详情操作 */
const handleDetail = (row: QjglApi.QjglVO) => {
router.push({
name: 'QjglDetail',
query: {
id: row.id
}
})
}
/** 审批进度 */
const handleProcessDetail = (row) => {
router.push({
name: 'BpmProcessInstanceDetail',
query: {
id: row.processInstanceId
}
})
}
// fix:
watch(
() => router.currentRoute.value,
() => {
getList()
}
)
// flowOver++++++++++++++++++
/** 导出按钮操作 */
const handleExport = async () => {
try {
//
await message.exportConfirm()
//
exportLoading.value = true
const data = await QjglApi.exportQjgl(queryParams)
download.excel(data, '请假管理.xls')
} catch {
} finally {
exportLoading.value = false
}
}
/** 初始化 **/
onMounted(() => {
getList()
})
</script>

View File

@ -210,7 +210,9 @@ onMounted(async () => {
return
}
startUserSelectTasks.value = processDefinitionDetail.startUserSelectTasks
console.log(startUserSelectTasks.value?.length ,"length")
console.log(startUserSelectTasks.value ,"startUserSelectTasks.value")
//
if (startUserSelectTasks.value?.length > 0) {
//