Compare commits

...

3 Commits

Author SHA1 Message Date
XaoLi717
f3f08ba3ba 加班管理 2024-11-07 15:40:08 +08:00
XaoLi717
77a422f4a2 加班管理 2024-11-07 15:35:00 +08:00
XaoLi717
6697bc8583 加班管理 2024-11-07 15:34:25 +08:00
11 changed files with 808 additions and 8 deletions

View File

@ -696,7 +696,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
noCache: true,
hidden: true,
canTo: true,
title: '发起办公用品流程',
title: '发起用品管理流程',
activeMenu: '/Home/bgyp/Bgypflow'
}
},
@ -708,10 +708,34 @@ const remainingRouter: AppRouteRecordRaw[] = [
noCache: true,
hidden: true,
canTo: true,
title: '查看办公用品流程',
title: '查看用品管理流程',
activeMenu: '/Home/bgyp/Bgypflow'
}
},
{
path: 'jbgl/JbglCreate',
component: () => import('@/views/Home/jbgl/JbglCreate.vue'),
name: 'JbglCreate',
meta: {
noCache: true,
hidden: true,
canTo: true,
title: '发起加班管理流程',
activeMenu: '/Home/jbgl/Jbglflow'
}
},
{
path: 'jbgl/JbglDetail',
component: () => import('@/views/Home/jbgl/JbglDetail.vue'),
name: 'JbglDetail',
meta: {
noCache: true,
hidden: true,
canTo: true,
title: '查看加班管理流程',
activeMenu: '/Home/jbgl/Jbglflow'
}
},
]
},
]

View File

@ -1,5 +1,5 @@
<template>
<el-card >
<el-card shadow="never">
<template #header>
<span style="font-size: 16px">创建用品管理流程</span>
</template>

View File

@ -1,5 +1,5 @@
<template>
<el-card>
<el-card shadow="never">
<template #header>
<span style="font-size: 16px">用品管理流程</span>
</template>

View File

@ -1,5 +1,5 @@
<template>
<el-card >
<el-card shadow="never">
<template #header>
<span style="font-size: 16px">创建车辆管理流程</span>
</template>

View File

@ -1,5 +1,5 @@
<template>
<el-card>
<el-card shadow="never">
<template #header>
<span style="font-size: 16px">车辆管理流程</span>
</template>

View File

@ -0,0 +1,186 @@
<template>
<el-card shadow="never">
<template #header>
<span style="font-size: 16px">创建加班管理流程</span>
</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="userName">
<div class="pull-left" v-show="true" v-if="userInfo">{{ userInfo}} </div>
<div class="pull-left" v-show="true" v-if="!userInfo">获取失败 </div>
</el-form-item>
<el-form-item label="申请部门名字" prop="deptName">
<div class="pull-left" v-show="true" v-if="deptInfo">{{ deptInfo}} </div>
<div class="pull-left" v-show="true" v-if="!deptInfo">获取失败 </div>
</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>
<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'
import { JbglApi, JbglVO } from '@/api/home/jbgl'
import * as DefinitionApi from '@/api/bpm/definition'
import * as UserApi from '@/api/system/user'
import {useTagsViewStore} from "@/store/modules/tagsView";
import {getUserProfile} from "@/api/system/user/profile";
/** 加班管理 表单 */
defineOptions({ name: 'JbglCreate' })
const { t } = useI18n() //
const message = useMessage() //
const formLoading = ref(false) // 12
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 { delView } = useTagsViewStore()//
const { push, currentRoute } = useRouter()
const processDefineKey = 'jbgl-001' // Key
const startUserSelectTasks = ref([]) //
const startUserSelectAssignees = ref({}) //
const startUserSelectAssigneesFormRef = ref() // Ref
const startUserSelectAssigneesFormRules = ref({}) // Rules
const userList = ref<any[]>([]) //
const deptInfo = ref('') //
const userInfo = ref('') //
//
const getUserInfo = async () => {
const user = await getUserProfile();
formData.value.deptId = formData.value.deptId || user.dept.id;
formData.value.deptName = formData.value.deptName || user.dept.name;
formData.value.userName = formData.value.userName || user.nickname;
deptInfo.value = formData.value.deptName ?? '';
userInfo.value = formData.value.userName ?? '';
};
/** 提交表单 */
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 JbglVO
if(startUserSelectTasks.value?.length > 0){
data.startUserSelectAssignees = startUserSelectAssignees.value
}
await JbglApi.createJbgl(data)
message.success(t('common.createSuccess'))
delView(unref(currentRoute))
await push({name: 'Jbgl'})
} finally {
formLoading.value = false
}
}
/** 初始化 */
onMounted(async () => {
await getUserInfo()
const processDefinitionDetail = await DefinitionApi.getProcessDefinition(
undefined,
processDefineKey
)
if (!processDefinitionDetail) {
message.error('车辆管理流程模型未配置,请检查!')
return
}
startUserSelectTasks.value = processDefinitionDetail.startUserSelectTasks
//
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()
}
})
const formRules = reactive({
title: [{ required: true, message: '申请标题不能为空', 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
</script>

View File

@ -0,0 +1,137 @@
<template>
<el-card shadow="never">
<template #header>
<span style="font-size: 16px">加班管理流程</span>
</template>
<el-form
ref="formRef"
:model="formData"
label-width="100px"
v-loading="formLoading"
>
<el-form-item label="申请标题" prop="title">
<el-input v-model="formData.title" placeholder="请输入申请标题" disabled />
</el-form-item>
<el-form-item label="申请人名字" prop="userName">
<div class="pull-left" v-show="true" v-if="userInfo">{{ userInfo}} </div>
<div class="pull-left" v-show="true" v-if="!userInfo">获取失败 </div>
</el-form-item>
<el-form-item label="申请部门名字" prop="deptName">
<div class="pull-left" v-show="true" v-if="deptInfo">{{ deptInfo}} </div>
<div class="pull-left" v-show="true" v-if="!deptInfo">获取失败 </div>
</el-form-item>
<el-form-item label="申请时间" prop="usageDate">
<el-date-picker
v-model="formData.usageDate"
type="date"
value-format="x"
placeholder="选择申请时间"
disabled
/>
</el-form-item>
<el-form-item label="加班类型" prop="type">
<el-select v-model="formData.type" placeholder="请选择加班类型" disabled>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.JBGL_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
disabled
/>
</el-select>
</el-form-item>
<el-form-item label="加班开始时间" prop="startDate">
<el-date-picker
v-model="formData.startDate"
type="date"
value-format="x"
placeholder="选择加班开始时间"
disabled
/>
</el-form-item>
<el-form-item label="加班结束时间" prop="endDate">
<el-date-picker
v-model="formData.endDate"
type="date"
value-format="x"
placeholder="选择加班结束时间"
disabled
/>
</el-form-item>
<el-form-item label="加班总时长" prop="duration">
<el-input v-model="formData.duration" placeholder="请输入加班总时长" disabled />
</el-form-item>
<el-form-item label="加班原因" prop="reason">
<el-input v-model="formData.reason" type="textarea" placeholder="请输入加班原因" disabled />
</el-form-item>
</el-form>
</el-card>
</template>
<script setup lang="ts">
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import { JbglApi } from '@/api/home/jbgl'
import {propTypes} from "@/utils/propTypes";
import {getUserProfile} from "@/api/system/user/profile";
/** 加班管理 表单 */
defineOptions({ name: 'JbglDetail' })
const { t } = useI18n() //
const message = useMessage() //
const formLoading = ref(false) // 12
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 deptInfo = ref('') //
const userInfo = ref('') //
//
const getUserInfo = async () => {
const user = await getUserProfile();
formData.value.deptId = formData.value.deptId || user.dept.id;
formData.value.deptName = formData.value.deptName || user.dept.name;
formData.value.userName = formData.value.userName || user.nickname;
deptInfo.value = formData.value.deptName ?? '';
userInfo.value = formData.value.userName ?? '';
};
//
const { query } = useRoute() //
const props = defineProps({
id: propTypes.number.def(undefined)
})
const detailLoading = ref(false) //
const queryId = query.id as unknown as number // URL id
/** 获得数据 */
const getInfo = async () => {
detailLoading.value = true
try {
formData.value = await JbglApi.getJbgl(props.id || queryId)
//
} finally {
detailLoading.value = false
}
}
const formRef = ref() // Ref
onMounted(()=>{
getUserInfo()
getInfo()
})
</script>

View File

@ -0,0 +1,182 @@
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible"
style="width: 70%">
<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"
>
<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>
<template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button>
<el-button @click="dialogVisible = false"> </el-button>
</template>
</el-card>
</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>

View File

@ -0,0 +1,271 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<el-form
class="-mb-15px"
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="68px"
>
<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="部门名字" prop="deptName">
<el-input
v-model="queryParams.deptName"
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.JBGL_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</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: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="序号" align="center" type="index" width="60" />
<!-- <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="dateFormatter2"
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="dateFormatter2"
width="180px"
/>
<el-table-column
label="结束时间"
align="center"
prop="endDate"
:formatter="dateFormatter2"
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" >
<template #default="scope">
<dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<!-- <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
v-hasPermi="['home:clgl:update']"
link
type="primary"
@click="handleDetail(scope.row)"
>
详情
</el-button>
<el-button
v-hasPermi="['home:clgl:update']"
link
type="danger"
@click="handleProcessDetail(scope.row)"
>
进度
</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 {dateFormatter2} from '@/utils/formatTime'
import download from '@/utils/download'
import { JbglApi, JbglVO } from '@/api/home/jbgl'
import JbglForm from './JbglForm.vue'
import * as LeaveApi from '@/api/bpm/leave'
import router from "@/router";
/** 加班管理 列表 */
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 handleCreate = () => {
router.push({ name: 'JbglCreate' })
}
/** 详情操作 */
const handleDetail = (row: LeaveApi.LeaveVO) => {
router.push({
name: 'JbglDetail',
query: {
id: row.id
}
})
}
/** 审批进度 */
const handleProcessDetail = (row) => {
router.push({
name: 'BpmProcessInstanceDetail',
query: {
id: row.processInstanceId
}
})
}
// fix:
watch(
() => router.currentRoute.value,
() => {
getList()
}
)
/** 查询列表 */
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 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,5 @@
<template>
<el-card >
<el-card shadow="never" >
<template #header>
<span style="font-size: 16px">创建请假管理流程</span>
</template>

View File

@ -1,5 +1,5 @@
<template>
<el-card>
<el-card shadow="never">
<template #header>
<span style="font-size: 16px">请假管理流程</span>
</template>