!108 重构VUE3【OA示例-请假查询】

Merge pull request !108 from ZanGe丶/dev
This commit is contained in:
芋道源码 2023-04-09 10:20:39 +00:00 committed by Gitee
commit 50efd60e15
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 337 additions and 225 deletions

View File

@ -1,56 +1,107 @@
<template> <template>
<ContentWrap> <Dialog title="发起OA请假流程" v-model="modelVisible">
<!-- 对话框(添加 / 修改) --> <el-form
<Form :schema="allSchemas.formSchema" :rules="rules" ref="formRef" /> ref="formRef"
<!-- 按钮保存 --> :model="formData"
<XButton :rules="formRules"
type="primary" label-width="80px"
:title="t('action.save')" v-loading="formLoading"
:loading="actionLoading" >
@click="submitForm" <el-form-item label="请假类型" prop="type">
<el-select v-model="formData.type" placeholder="请选择请假类型" clearable>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.BPM_OA_LEAVE_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/> />
</ContentWrap> </el-select>
</el-form-item>
<el-form-item label="开始时间" prop="startTime">
<el-date-picker
clearable
v-model="formData.startTime"
type="datetime"
value-format="x"
placeholder="请选择开始时间"
/>
</el-form-item>
<el-form-item label="结束时间" prop="endTime">
<el-date-picker
clearable
v-model="formData.endTime"
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-form-item>
</el-form>
<template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button>
<el-button @click="modelVisible = false"> </el-button>
</template>
</Dialog>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { FormExpose } from '@/components/Form' import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
// import XEUtils from 'xe-utils'
// import
import * as LeaveApi from '@/api/bpm/leave' import * as LeaveApi from '@/api/bpm/leave'
import { rules, allSchemas } from './leave.data'
const { t } = useI18n() //
const message = useMessage() // const message = useMessage() //
const { push } = useRouter() //
// const modelVisible = ref(false) //
const actionLoading = ref(false) // Loading const formLoading = ref(false) // 12
const formRef = ref<FormExpose>() // Ref const formData = ref({
type: undefined,
// reason: undefined,
const submitForm = async () => { startTime: undefined,
const elForm = unref(formRef)?.getElFormRef() endTime: undefined
if (!elForm) return
elForm.validate(async (valid) => {
if (!valid) {
return
}
try {
//
actionLoading.value = true
const data = unref(formRef)?.formModel as LeaveApi.LeaveVO
// data.startTime = XEUtils.toDateString(data.startTime, 'yyyy-MM-dd HH:mm:ss')
// data.endTime = XEUtils.toDateString(data.endTime, 'yyyy-MM-dd HH:mm:ss')
data.startTime = Date.parse(new Date(data.startTime).toString()).toString()
data.endTime = Date.parse(new Date(data.endTime).toString()).toString()
//
await LeaveApi.createLeave(data)
message.success(t('common.createSuccess'))
//
push('/bpm/oa/leave')
} finally {
actionLoading.value = false
}
}) })
const formRules = reactive({
type: [{ required: true, message: '请假类型不能为空', trigger: 'blur' }],
reason: [{ required: true, message: '请假原因不能为空', trigger: 'change' }],
startTime: [{ required: true, message: '请假开始时间不能为空', trigger: 'change' }],
endTime: [{ required: true, message: '请假结束时间不能为空', trigger: 'change' }]
})
const formRef = ref() // Ref
/** 打开弹窗 */
const open = async () => {
modelVisible.value = true
resetForm()
}
/** 重置表单 */
const resetForm = () => {
formData.value = {
type: undefined,
reason: undefined,
startTime: undefined,
endTime: undefined
}
formRef.value?.resetFields()
}
defineExpose({ open }) // open
/** 提交表单 */
const emit = defineEmits(['success']) // success
const submitForm = async () => {
//
if (!formRef) return
const valid = await formRef.value.validate()
if (!valid) return
//
formLoading.value = true
try {
const data = formData.value as unknown as LeaveApi.LeaveVO
await LeaveApi.createLeaveApi(data)
message.success('新增成功')
modelVisible.value = false
//
emit('success')
} finally {
formLoading.value = false
}
} }
</script> </script>

View File

@ -1,42 +1,40 @@
<template> <template>
<ContentWrap> <Dialog title="详情" v-model="modelVisible" :scroll="true" :max-height="200">
<!-- 详情 --> <el-descriptions border :column="1">
<Descriptions :schema="allSchemas.detailSchema" :data="formData" /> <el-descriptions-item label="请假类型">
<el-button @click="routerReturn" type="primary">返回</el-button> <dict-tag :type="DICT_TYPE.BPM_OA_LEAVE_TYPE" :value="detailData.type" />
</ContentWrap> </el-descriptions-item>
<el-descriptions-item label="开始时间">
{{ formatDate(detailData.startTime) }}
</el-descriptions-item>
<el-descriptions-item label="结束时间">
{{ formatDate(detailData.endTime) }}
</el-descriptions-item>
<el-descriptions-item label="原因">
{{ detailData.reason }}
</el-descriptions-item>
</el-descriptions>
</Dialog>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
// import import { DICT_TYPE } from '@/utils/dict'
import { formatDate } from '@/utils/formatTime'
import * as LeaveApi from '@/api/bpm/leave' import * as LeaveApi from '@/api/bpm/leave'
import { allSchemas } from '@/views/bpm/oa/leave/leave.data'
import { useRouter } from 'vue-router'
const router = useRouter()
const { query } = useRoute() //
const message = useMessage() //
const id = ref() // const modelVisible = ref(false) //
// const detailLoading = ref(false) //
const formData = ref({ const detailData = ref() //
startTime: undefined,
endTime: undefined,
type: undefined,
reason: undefined
})
const routerReturn = () => { /** 打开弹窗 */
router.back() const open = async (data: LeaveApi.LeaveVO) => {
modelVisible.value = true
//
detailLoading.value = true
try {
detailData.value = data
} finally {
detailLoading.value = false
} }
onMounted(() => {
id.value = query.id
if (!id.value) {
message.error('未传递 id 参数,无法查看 OA 请假信息')
return
} }
// defineExpose({ open }) // open
LeaveApi.getLeave(id.value).then((data) => {
formData.value = data
})
})
</script> </script>

View File

@ -1,83 +1,237 @@
<template> <template>
<ContentWrap> <content-wrap>
<XTable @register="registerTable"> <!-- 搜索工作栏 -->
<template #toolbar_buttons> <el-form
<!-- 操作发起请假 --> class="-mb-15px"
<XButton type="primary" preIcon="ep:plus" title="发起请假" @click="handleCreate()" /> :model="queryParams"
</template> ref="queryFormRef"
<template #actionbtns_default="{ row }"> :inline="true"
<!-- 操作: 取消请假 --> label-width="68px"
<XTextButton >
preIcon="ep:delete" <el-form-item label="请假类型" prop="type">
title="取消请假" <el-select
v-hasPermi="['bpm:oa-leave:create']" v-model="queryParams.type"
v-if="row.result === 1" placeholder="请选择请假类型"
@click="cancelLeave(row)" 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>
<XTextButton preIcon="ep:view" :title="t('action.detail')" @click="handleDetail(row)" /> </el-form-item>
<!-- 操作: 审批进度 --> <el-form-item label="申请时间" prop="createTime">
<XTextButton preIcon="ep:edit-pen" title="审批进度" @click="handleProcessDetail(row)" /> <el-date-picker
</template> v-model="queryParams.createTime"
</XTable> value-format="YYYY-MM-DD HH:mm:ss"
</ContentWrap> type="daterange"
</template> 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="result">
<el-select v-model="queryParams.result" placeholder="请选择结果" clearable class="!w-240px">
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</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>
<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 @click="handleCreate()"
><Icon icon="ep:plus" class="mr-5px" /> 发起请假</el-button
>
</el-form-item>
</el-form>
</content-wrap>
<script setup lang="ts"> <!-- 列表 -->
// import <content-wrap>
import { ElMessageBox } from 'element-plus' <el-table v-loading="loading" :data="list">
// import <el-table-column label="申请编号" align="center" prop="id" />
import { allSchemas } from './leave.data' <el-table-column label="状态" align="center" 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="开始时间"
align="center"
prop="startTime"
width="180"
:formatter="dateFormatter"
/>
<el-table-column
label="结束时间"
align="center"
prop="endTime"
width="180"
:formatter="dateFormatter"
/>
<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="reason" />
<el-table-column
label="申请时间"
align="center"
prop="createTime"
width="180"
:formatter="dateFormatter"
/>
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
width="200"
>
<template #default="scope">
<el-button
link
type="primary"
@click="cancelLeave(scope.row)"
v-hasPermi="['bpm:oa-leave:create']"
v-if="scope.row.result === 1"
>取消</el-button
>
<el-button
link
type="primary"
@click="handleDetail(scope.row)"
v-hasPermi="['bpm:oa-leave:query']"
>详情</el-button
>
<el-button
link
type="primary"
@click="handleProcessDetail(scope.row)"
v-hasPermi="['bpm:oa-leave:query']"
>进度</el-button
>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</content-wrap>
<!-- 表单弹窗详情 -->
<LeaveDetail ref="detailRef" />
<!-- 表单弹窗添加 -->
<LeaveForm ref="formRef" @success="getList" />
</template>
<script setup lang="ts" name="OaLeave">
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
import { dateFormatter } from '@/utils/formatTime'
import * as LeaveApi from '@/api/bpm/leave' import * as LeaveApi from '@/api/bpm/leave'
import * as ProcessInstanceApi from '@/api/bpm/processInstance' import * as ProcessInstanceApi from '@/api/bpm/processInstance'
import LeaveDetail from './detail.vue'
import LeaveForm from './create.vue'
const loading = ref(true) //
const total = ref(0) //
const list = ref([]) //
const { t } = useI18n() //
const message = useMessage() // const message = useMessage() //
const { push } = useRouter() // const router = useRouter()
const queryParams = reactive({
const [registerTable, { reload }] = useXTable({ pageNo: 1,
allSchemas: allSchemas, pageSize: 10,
getListApi: LeaveApi.getLeavePage type: undefined,
result: undefined,
reason: undefined,
createTime: []
}) })
const queryFormRef = ref() //
// /** 查询列表 */
const handleCreate = () => { const getList = async () => {
push({ loading.value = true
name: 'OALeaveCreate' try {
}) const data = await LeaveApi.getLeavePageApi(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 handleCreate = () => {
formRef.value.open()
}
/** 详情操作 */
const detailRef = ref()
const handleDetail = (data: LeaveApi.LeaveVO) => {
detailRef.value.open(data)
}
//
const cancelLeave = (row) => { const cancelLeave = (row) => {
ElMessageBox.prompt('请输入取消原因', '取消流程', { ElMessageBox.prompt('请输入取消原因', '取消流程', {
confirmButtonText: t('common.ok'), confirmButtonText: '确定',
cancelButtonText: t('common.cancel'), cancelButtonText: '取消',
inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // inputPattern: /^[\s\S]*.*\S[\s\S]*$/, //
inputErrorMessage: '取消原因不能为空' inputErrorMessage: '取消原因不能为空'
}).then(async ({ value }) => { }).then(async ({ value }) => {
await ProcessInstanceApi.cancelProcessInstance(row.id, value) await ProcessInstanceApi.cancelProcessInstanceApi(row.id, value)
message.success('取消成功') message.success('取消成功')
reload()
})
}
//
const handleDetail = (row) => {
push({
name: 'OALeaveDetail',
query: {
id: row.id
}
}) })
} }
// //
const handleProcessDetail = (row) => { const handleProcessDetail = (row) => {
push({ router.push({
name: 'BpmProcessInstanceDetail', name: 'BpmProcessInstanceDetail',
query: { query: {
id: row.processInstanceId id: row.processInstanceId
} }
}) })
} }
/** 初始化 **/
onMounted(() => {
getList()
})
</script> </script>

View File

@ -1,91 +0,0 @@
import type { VxeCrudSchema } from '@/hooks/web/useVxeCrudSchemas'
const { t } = useI18n() // 国际化
// 表单校验
export const rules = reactive({
startTime: [{ required: true, message: '开始时间不能为空', trigger: 'blur' }],
endTime: [{ required: true, message: '结束时间不能为空', trigger: 'blur' }],
type: [{ required: true, message: '请假类型不能为空', trigger: 'change' }]
})
// crudSchemas
const crudSchemas = reactive<VxeCrudSchema>({
primaryKey: 'id',
primaryType: 'id',
primaryTitle: '申请编号',
action: true,
actionWidth: '260',
searchSpan: 8,
columns: [
{
title: t('common.status'),
field: 'result',
dictType: DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT,
dictClass: 'number',
isSearch: true,
isForm: false
},
{
title: t('common.startTimeText'),
field: 'startTime',
formatter: 'formatDay',
table: {
width: 180
},
detail: {
dateFormat: 'YYYY-MM-DD'
},
form: {
component: 'DatePicker'
}
},
{
title: t('common.endTimeText'),
field: 'endTime',
formatter: 'formatDay',
table: {
width: 180
},
detail: {
dateFormat: 'YYYY-MM-DD'
},
form: {
component: 'DatePicker'
}
},
{
title: '请假类型',
field: 'type',
dictType: DICT_TYPE.BPM_OA_LEAVE_TYPE,
dictClass: 'number',
isSearch: true
},
{
title: '原因',
field: 'reason',
isSearch: true,
componentProps: {
type: 'textarea',
rows: 4
}
},
{
title: '申请时间',
field: 'createTime',
formatter: 'formatDate',
table: {
width: 180
},
isSearch: true,
search: {
show: true,
itemRender: {
name: 'XDataTimePicker'
}
},
isForm: false
}
]
})
export const { allSchemas } = useVxeCrudSchemas(crudSchemas)