This commit is contained in:
Pancaihua 2024-10-29 15:24:56 +08:00
parent 712573dc13
commit aefd93cc7d
4 changed files with 256 additions and 146 deletions

View File

@ -1,4 +1,5 @@
<template>
<ContentWrap>
<!-- <Dialog :title="dialogTitle" v-model="dialogVisible">-->
<el-form
ref="formRef"
@ -7,60 +8,88 @@
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-row>
<el-col :span="24">
<el-form-item label="请假标题" prop="title">
<el-input v-model="formData.title" placeholder="请输入请假标题" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="起草人" prop="userName">
<el-input v-model="formData.userName" placeholder="请输入起草人" />
</el-form-item>
</el-col>
<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="deptInfo">{{ deptInfo?.name }} </div>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="开始时间" prop="startTime">
<el-date-picker
v-model="formData.startTime"
type="datetime"
value-format="x"
placeholder="选择开始时间"
/>
</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>
</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="选择结束时间"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<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-col>
<el-col :span="12">
<el-form-item label="请假天数" prop="day">
<el-input v-model="formData.day" placeholder="请输入请假天数" />
</el-form-item>
</el-col>
<!-- <el-form-item label="文件路径" prop="filePath">-->
<!-- <el-input v-model="formData.filePath" placeholder="请输入文件路径" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="申请人的用户编号" prop="userId">-->
<!-- <el-input v-model="formData.userId" placeholder="请输入申请人的用户编号" />-->
<!-- </el-form-item>-->
<el-col :span="24">
<el-form-item label="请假原因" prop="reason">
<el-input v-model="formData.reason" placeholder="请输入请假原因" style="height: 100px;" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<!-- <template #footer>-->
<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>
<script setup lang="ts">
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
@ -69,6 +98,8 @@ 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";
import {getUserProfile, ProfileVO} from "@/api/system/user/profile";
import {DeptVO, getDept} from "@/api/system/dept";
/** 请假管理 表单 */
defineOptions({ name: 'QjglCreate' })
@ -89,22 +120,24 @@ const formData = ref({
endTime: undefined,
day: undefined,
filePath: undefined,
userName: undefined,
deptId: undefined,
userName: '',
deptId: '',
processInstanceId: undefined,
userId: undefined,
status: undefined
})
const formRules = reactive({
reason: [{ required: true, message: '请假原因不能为空', trigger: 'blur' }],
title: [{ 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' }]
userName: [{ required: true, message: '起草人不能为空', trigger: 'blur' }],
deptId: [{ required: true, message: '部门不能为空', trigger: 'blur' }]
})
const formRef = ref() // Ref
const userInfo = ref({} as ProfileVO )
const deptInfo = ref({} as DeptVO )
/** 打开弹窗 */
// const open = async (type: string, id?: number) => {
// dialogVisible.value = true
@ -122,6 +155,24 @@ const formRef = ref() // 表单 Ref
// }
// }
// defineExpose({ open }) // open
const getUserInfo = async () => {
if ( formData.value.deptId == '' ){
const users = await getUserProfile()
userInfo.value = users
formData.value.deptId= users.dept.id
deptInfo.value = {} as DeptVO
}else{
const dept = await getDept(formData.value.deptId)
deptInfo.value = dept
userInfo.value = {} as ProfileVO
}
if (formData.value.userName == ''){
const users = await getUserProfile()
formData.value.userName= users.nickname
}
}
//flow begin++++++++++++++++++++
//
const processDefineKey = 'pch-qjgl-001' // Key
@ -151,7 +202,10 @@ const submitForm = async () => {
}
await QjglApi.createQjgl(data)
message.success(t('common.createSuccess'))
message.success(t('发起成功!'))
// Tab
delView(unref(currentRoute))
// await push({ name: 'Qjglindex' })
} finally {
formLoading.value = false
@ -169,8 +223,8 @@ const resetForm = () => {
endTime: undefined,
day: undefined,
filePath: undefined,
userName: undefined,
deptId: undefined,
userName: '',
deptId: '',
processInstanceId: undefined,
userId: undefined,
status: undefined
@ -179,7 +233,7 @@ const resetForm = () => {
}
/** 初始化 */
onMounted(async () => {
// await getUserInfo()
await getUserInfo()
// await getKnowtypeTree()
console.log(processDefineKey,"key1")
const processDefinitionDetail = await DefinitionApi.getProcessDefinition(

View File

@ -1,76 +1,89 @@
<template>
<ContentWrap>
<!-- <Dialog :title="dialogTitle" v-model="dialogVisible">-->
<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-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-row>
<el-col :span="24">
<el-form-item label="请假标题" prop="title">
<el-input v-model="formData.title" placeholder="请输入请假标题" readonly />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="起草人" prop="userName">
<el-input v-model="formData.userName" placeholder="请输入起草人" readonly />
</el-form-item>
</el-col>
<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="deptInfo">{{ deptInfo?.name }} </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="选择开始时间"
readonly
/>
</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="选择结束时间"
readonly
/>
</el-form-item>
</el-col>
<el-col :span="12">
<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-col>
<el-col :span="12">
<el-form-item label="请假天数" prop="day" >
<el-input v-model="formData.day" placeholder="请输入请假天数" readonly/>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="请假原因" prop="reason" >
<el-input v-model="formData.reason" placeholder="请输入请假原因" style="height: 100px;" readonly/>
</el-form-item>
</el-col>
</el-row>
</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>
<script setup lang="ts">
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import { QjglApi, QjglVO } from '@/api/home/qjgl'
import { propTypes } from '@/utils/propTypes'
import {getUserProfile, ProfileVO} from "@/api/system/user/profile";
import {DeptVO, getDept} from "@/api/system/dept";
import * as DefinitionApi from '@/api/bpm/definition'
import * as UserApi from '@/api/system/user'
/** 请假管理 表单 */
defineOptions({ name: 'QjglDetail' })
@ -79,6 +92,7 @@ const message = useMessage() // 消息弹窗
const props = defineProps({
id: propTypes.number.def(undefined)
})
const isReadOnly = ref(true); // true
const dialogVisible = ref(false) //
const dialogTitle = ref('') //
const formLoading = ref(false) // 12
@ -99,15 +113,19 @@ const formData = ref({
status: undefined
})
const formRules = reactive({
reason: [{ required: true, message: '请假原因不能为空', trigger: 'blur' }],
title: [{ 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' }]
userName: [{ required: true, message: '起草人不能为空', trigger: 'blur' }],
deptId: [{ required: true, message: '部门不能为空', trigger: 'blur' }]
})
const userInfo = ref({} as ProfileVO )
const deptInfo = ref({} as DeptVO )
const formRef = ref() // Ref
const { query } = useRoute() //
const queryId = query.id as unknown as number // URL id
/** 打开弹窗 */
// const open = async (type: string, id?: number) => {
// dialogVisible.value = true
@ -124,8 +142,25 @@ const formRef = ref() // 表单 Ref
// }
// }
// }
defineExpose({ open }) // open
// defineExpose({ open }) // open
const getUserInfo = async () => {
if ( formData.value.deptId == '' ){
const users = await getUserProfile()
userInfo.value = users
formData.value.deptId= users.dept.id
deptInfo.value = {} as DeptVO
}else{
const dept = await getDept(formData.value.deptId)
deptInfo.value = dept
userInfo.value = {} as ProfileVO
}
if (formData.value.userName == ''){
const users = await getUserProfile()
formData.value.userName= users.nickname
}
}
/** 提交表单 */
const emit = defineEmits(['success']) // success
const submitForm = async () => {
@ -180,7 +215,7 @@ onMounted(async () => {
formLoading.value = false
}
}
// await getUserInfo()
await getUserInfo()
// await getKnowtypeTree()
})
</script>

View File

@ -81,22 +81,34 @@
<!-- class="!w-240px"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="作者" prop="userName">
<el-form-item label="起草人" prop="userName">
<el-input
v-model="queryParams.userName"
placeholder="请输入作者"
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 label="部门id" prop="deptId">-->
<!-- <el-input-->
<!-- v-model="queryParams.deptId"-->
<!-- :data="deptList"-->
<!-- placeholder="请输入部门id"-->
<!-- clearable-->
<!-- @keyup.enter="handleQuery"-->
<!-- class="!w-240px"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="归属部门" prop="deptId">
<el-tree-select
v-model="queryParams.deptId"
:data="deptList"
:props="defaultProps"
check-strictly
node-key="id"
class="!w-240px"
placeholder="请选择归属部门"
/>
</el-form-item>
<el-form-item label="创建时间" prop="createTime">
@ -188,8 +200,8 @@
<!-- />-->
<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="userName" />
<el-table-column label="部门" align="center" prop="deptName" />
<!-- <el-table-column-->
<!-- label="创建时间"-->
<!-- align="center"-->
@ -199,7 +211,12 @@
<!-- />-->
<!-- <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" prop="status" />-->
<el-table-column align="center" label="审批状态" prop="status" width="120">
<template #default="scope">
<dict-tag :type="DICT_TYPE.BPM_TASK_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button
@ -255,10 +272,11 @@ 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'
import * as DeptApi from "@/api/system/dept";
import {defaultProps, handleTree} from "@/utils/tree";
const deptList = ref<Tree[]>([]) //
/** 请假管理 列表 */
defineOptions({ name: 'Qjgl' })
defineOptions({ name: 'Qjglindex' })
const router = useRouter() //
const message = useMessage() //
const { t } = useI18n() //
@ -293,6 +311,9 @@ const getList = async () => {
const data = await QjglApi.getQjglPage(queryParams)
list.value = data.list
total.value = data.total
//
deptList.value = handleTree(await DeptApi.getSimpleDeptList())
} finally {
loading.value = false
}

View File

@ -168,14 +168,14 @@
>
设计流程
</el-button>
<el-button
link
type="primary"
@click="handleSimpleDesign(scope.row.id)"
v-hasPermi="['bpm:model:update']"
>
仿钉钉设计流程
</el-button>
<!-- <el-button-->
<!-- link-->
<!-- type="primary"-->
<!-- @click="handleSimpleDesign(scope.row.id)"-->
<!-- v-hasPermi="['bpm:model:update']"-->
<!-- >-->
<!-- 仿钉钉设计流程-->
<!-- </el-button>-->
<el-button
link
type="primary"