Compare commits

...

4 Commits

Author SHA1 Message Date
XaoLi717
3d19cef801 加班管理 2024-11-07 11:33:33 +08:00
XaoLi717
633f9a38ec 加班管理 2024-11-07 11:32:28 +08:00
XaoLi717
7b30610ba9 加班管理 2024-11-07 11:15:41 +08:00
XaoLi717
3d647a6e27 流程ui优化 2024-11-07 11:15:10 +08:00
9 changed files with 660 additions and 39 deletions

View File

@ -0,0 +1,52 @@
import request from '@/config/axios'
// 加班管理 VO
export interface JbglVO {
id: number // id
title: string // 申请标题
userName: string // 申请人名字
userId: number // 申请人id
deptName: string // 申请部门名字
deptId: number // 申请部门id
usageDate: Date // 申请时间
type: number // 加班类型
startDate: Date // 加班开始时间
endDate: Date // 加班结束时间
duration: number // 加班总时长
reason: string // 加班原因
status: number // 审批状态
processInstanceId: string // 流程实例的编号
}
// 加班管理 API
export const JbglApi = {
// 查询加班管理分页
getJbglPage: async (params: any) => {
return await request.get({ url: `/home/jbgl/page`, params })
},
// 查询加班管理详情
getJbgl: async (id: number) => {
return await request.get({ url: `/home/jbgl/get?id=` + id })
},
// 新增加班管理
createJbgl: async (data: JbglVO) => {
return await request.post({ url: `/home/jbgl/create`, data })
},
// 修改加班管理
updateJbgl: async (data: JbglVO) => {
return await request.put({ url: `/home/jbgl/update`, data })
},
// 删除加班管理
deleteJbgl: async (id: number) => {
return await request.delete({ url: `/home/jbgl/delete?id=` + id })
},
// 导出加班管理 Excel
exportJbgl: async (params) => {
return await request.download({ url: `/home/jbgl/export-excel`, params })
},
}

View File

@ -124,6 +124,7 @@ export enum DICT_TYPE {
CLGL_CAR_TYPE = 'clgl_car_type',
BGYP_USAGE_NAME = 'bgyp_usage_name',
BGYP_UNIT = 'bgyp_unit',
JBGL_TYPE = 'jbgl_type',
// ========== SYSTEM 模块 ==========
SYSTEM_USER_SEX = 'system_user_sex',

View File

@ -1,5 +1,8 @@
<template>
<ContentWrap>
<el-card >
<template #header>
<span style="font-size: 16px">创建用品管理流程</span>
</template>
<el-form
ref="formRef"
:model="formData"
@ -80,8 +83,10 @@
<el-input v-model="formData.usagePurpose" type="textarea" placeholder="请输入申请用途" />
</el-form-item>
</el-form>
<template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button>
</ContentWrap>
</template>
</el-card>
</template>
<script setup lang="ts">
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'

View File

@ -1,5 +1,8 @@
<template>
<ContentWrap>
<el-card>
<template #header>
<span style="font-size: 16px">用品管理流程</span>
</template>
<el-form
ref="formRef"
:model="formData"
@ -82,7 +85,7 @@
<el-input v-model="formData.usagePurpose" type="textarea" placeholder="请输入申请用途" disabled />
</el-form-item>
</el-form>
</ContentWrap>
</el-card>
</template>
<script setup lang="ts">
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'

View File

@ -1,5 +1,8 @@
<template>
<ContentWrap>
<el-card >
<template #header>
<span style="font-size: 16px">创建车辆管理流程</span>
</template>
<el-form
ref="formRef"
:model="formData"
@ -104,8 +107,10 @@
<el-input v-model="formData.carRemark" type="textarea" placeholder="请输入备注" />
</el-form-item>
</el-form>
<el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button>
</ContentWrap>
<template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button>
</template>
</el-card>
</template>
<script setup lang="ts">
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'

View File

@ -1,5 +1,8 @@
<template>
<ContentWrap>
<el-card>
<template #header>
<span style="font-size: 16px">车辆管理流程</span>
</template>
<el-form
ref="formRef"
:model="formData"
@ -108,7 +111,7 @@
<el-input v-model="formData.carRemark" type="textarea" placeholder="请输入备注" disabled />
</el-form-item>
</el-form>
</ContentWrap>
</el-card>
</template>
<script setup lang="ts">
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'

543
src/views/Home/jbgl/bk.vue Normal file
View File

@ -0,0 +1,543 @@
<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="userName">
<el-input v-model="formData.userName" placeholder="请输入申请人名字" />
</el-form-item>
<el-form-item label="申请人id" prop="userId">
<el-input v-model="formData.userId" placeholder="请输入申请人id" />
</el-form-item>
<el-form-item label="申请部门名字" prop="deptName">
<el-input v-model="formData.deptName" 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="usageDate">
<el-date-picker
v-model="formData.usageDate"
type="date"
value-format="x"
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.JBGL_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="加班开始时间" prop="startDate">
<el-date-picker
v-model="formData.startDate"
type="date"
value-format="x"
placeholder="选择加班开始时间"
/>
</el-form-item>
<el-form-item label="加班结束时间" prop="endDate">
<el-date-picker
v-model="formData.endDate"
type="date"
value-format="x"
placeholder="选择加班结束时间"
/>
</el-form-item>
<el-form-item label="加班总时长" prop="duration">
<el-input v-model="formData.duration" placeholder="请输入加班总时长" />
</el-form-item>
<el-form-item label="加班原因" prop="reason">
<el-input v-model="formData.reason" type="textarea" placeholder="请输入加班原因" />
</el-form-item>
<el-form-item label="审批状态" prop="status">
<el-radio-group v-model="formData.status">
<el-radio label="1">请选择字典生成</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="流程实例的编号" prop="processInstanceId">
<el-input v-model="formData.processInstanceId" 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 { JbglApi, JbglVO } from '@/api/home/jbgl'
/** 加班管理 表单 */
defineOptions({ name: 'JbglForm' })
const { t } = useI18n() //
const message = useMessage() //
const dialogVisible = ref(false) //
const dialogTitle = ref('') //
const formLoading = ref(false) // 12
const formType = ref('') // create - update -
const formData = ref({
id: undefined,
title: undefined,
userName: undefined,
userId: undefined,
deptName: undefined,
deptId: undefined,
usageDate: undefined,
type: undefined,
startDate: undefined,
endDate: undefined,
duration: undefined,
reason: undefined,
status: undefined,
processInstanceId: undefined,
})
const formRules = reactive({
title: [{ required: true, message: '申请标题不能为空', trigger: 'blur' }],
userId: [{ required: true, message: '申请人id不能为空', trigger: 'blur' }],
deptId: [{ required: true, message: '申请部门id不能为空', trigger: 'blur' }],
usageDate: [{ required: true, message: '申请时间不能为空', trigger: 'blur' }],
type: [{ required: true, message: '加班类型不能为空', trigger: 'change' }],
startDate: [{ required: true, message: '加班开始时间不能为空', trigger: 'blur' }],
endDate: [{ required: true, message: '加班结束时间不能为空', trigger: 'blur' }],
duration: [{ 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 JbglApi.getJbgl(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 JbglVO
if (formType.value === 'create') {
await JbglApi.createJbgl(data)
message.success(t('common.createSuccess'))
} else {
await JbglApi.updateJbgl(data)
message.success(t('common.updateSuccess'))
}
dialogVisible.value = false
//
emit('success')
} finally {
formLoading.value = false
}
}
/** 重置表单 */
const resetForm = () => {
formData.value = {
id: undefined,
title: undefined,
userName: undefined,
userId: undefined,
deptName: undefined,
deptId: undefined,
usageDate: undefined,
type: undefined,
startDate: undefined,
endDate: undefined,
duration: undefined,
reason: undefined,
status: undefined,
processInstanceId: undefined,
}
formRef.value?.resetFields()
}
</script>
//--------------------------------------------------------------------------------------------------
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<el-form
class="-mb-15px"
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="68px"
>
<el-form-item label="id" prop="id">
<el-input
v-model="queryParams.id"
placeholder="请输入id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<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="userName">
<el-input
v-model="queryParams.userName"
placeholder="请输入申请人名字"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="申请人id" prop="userId">
<el-input
v-model="queryParams.userId"
placeholder="请输入申请人id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="申请部门名字" prop="deptName">
<el-input
v-model="queryParams.deptName"
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="usageDate">
<el-date-picker
v-model="queryParams.usageDate"
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="type">
<el-select
v-model="queryParams.type"
placeholder="请选择加班类型"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.JBGL_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="加班开始时间" prop="startDate">
<el-date-picker
v-model="queryParams.startDate"
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="endDate">
<el-date-picker
v-model="queryParams.endDate"
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="duration">
<el-input
v-model="queryParams.duration"
placeholder="请输入加班总时长"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="审批状态" prop="status">
<el-select
v-model="queryParams.status"
placeholder="请选择审批状态"
clearable
class="!w-240px"
>
<el-option label="请选择字典生成" value="" />
</el-select>
</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="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>
<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="openForm('create')"
v-hasPermi="['home:jbgl:create']"
>
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
<el-button
type="success"
plain
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['home:jbgl: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="userName" />
<el-table-column label="申请人id" align="center" prop="userId" />
<el-table-column label="申请部门名字" align="center" prop="deptName" />
<el-table-column label="申请部门id" align="center" prop="deptId" />
<el-table-column
label="申请时间"
align="center"
prop="usageDate"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="加班类型" align="center" prop="type">
<template #default="scope">
<dict-tag :type="DICT_TYPE.JBGL_TYPE" :value="scope.row.type" />
</template>
</el-table-column>
<el-table-column
label="加班开始时间"
align="center"
prop="startDate"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column
label="加班结束时间"
align="center"
prop="endDate"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="加班总时长" align="center" prop="duration" />
<el-table-column label="加班原因" align="center" prop="reason" />
<el-table-column label="审批状态" align="center" prop="status" />
<el-table-column label="流程实例的编号" align="center" prop="processInstanceId" />
<el-table-column
label="创建时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['home:jbgl:update']"
>
编辑
</el-button>
<el-button
link
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['home:jbgl: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>
<!-- 表单弹窗添加/修改 -->
<JbglForm 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 { JbglApi, JbglVO } from '@/api/home/jbgl'
import JbglForm from './JbglForm.vue'
/** 加班管理 列表 */
defineOptions({ name: 'Jbgl' })
const message = useMessage() //
const { t } = useI18n() //
const loading = ref(true) //
const list = ref<JbglVO[]>([]) //
const total = ref(0) //
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
id: undefined,
title: undefined,
userName: undefined,
userId: undefined,
deptName: undefined,
deptId: undefined,
usageDate: [],
type: undefined,
startDate: [],
endDate: [],
duration: undefined,
reason: undefined,
status: undefined,
processInstanceId: undefined,
createTime: [],
})
const queryFormRef = ref() //
const exportLoading = ref(false) //
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await JbglApi.getJbglPage(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 JbglApi.deleteJbgl(id)
message.success(t('common.delSuccess'))
//
await getList()
} catch {}
}
/** 导出按钮操作 */
const handleExport = async () => {
try {
//
await message.exportConfirm()
//
exportLoading.value = true
const data = await JbglApi.exportJbgl(queryParams)
download.excel(data, '加班管理.xls')
} catch {
} finally {
exportLoading.value = false
}
}
/** 初始化 **/
onMounted(() => {
getList()
})
</script>

View File

@ -1,5 +1,8 @@
<template>
<ContentWrap>
<el-card >
<template #header>
<span style="font-size: 16px">创建请假管理流程</span>
</template>
<!-- <Dialog :title="dialogTitle" v-model="dialogVisible">-->
<el-form
ref="formRef"
@ -79,17 +82,20 @@
</el-col>
</el-row>
</el-form>
<el-form>
<el-form-item>
<el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button>
</el-form-item>
</el-form>
<!-- <el-form>-->
<!-- <el-form-item>-->
<!-- <el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button>-->
<!-- </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>-->
</ContentWrap>
<template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button>
</template>
</el-card>
</template>
<script setup lang="ts">
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'

View File

@ -1,12 +1,14 @@
<template>
<ContentWrap>
<!-- <Dialog :title="dialogTitle" v-model="dialogVisible">-->
<el-card>
<template #header>
<span style="font-size: 16px">请假管理流程</span>
</template>
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
label-width="100px"
v-loading="formLoading"
ref="formRef"
:model="formData"
:rules="formRules"
label-width="100px"
v-loading="formLoading"
>
<el-row>
<el-col :span="24">
@ -22,29 +24,29 @@
<el-col :span="12">
<el-form-item label="部门" prop="deptId">
<el-input v-model="formData.deptId" placeholder="请输入部门" v-show="false" />
<!-- <div class="pull-left" v-show="true" v-if="userInfo?.dept">{{ userInfo?.dept.name }} </div>-->
<!-- <div class="pull-left" v-show="true" v-if="userInfo?.dept">{{ userInfo?.dept.name }} </div>-->
<div class="pull-left" v-show="true" v-if="deptInfo">{{ deptInfo }} </div>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="开始时间" prop="startTime" readonly>
<el-date-picker
v-model="formData.startTime"
type="datetime"
value-format="x"
placeholder="选择开始时间"
disabled
v-model="formData.startTime"
type="datetime"
value-format="x"
placeholder="选择开始时间"
disabled
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="结束时间" prop="endTime" >
<el-date-picker
v-model="formData.endTime"
type="datetime"
value-format="x"
placeholder="选择结束时间"
disabled
v-model="formData.endTime"
type="datetime"
value-format="x"
placeholder="选择结束时间"
disabled
/>
</el-form-item>
</el-col>
@ -53,10 +55,10 @@
<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"
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>
@ -74,7 +76,8 @@
</el-col>
</el-row>
</el-form>
</ContentWrap>
</el-card>
<!-- <Dialog :title="dialogTitle" v-model="dialogVisible">-->
</template>
<script setup lang="ts">
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'