diff --git a/src/views/bpm/oa/leave/create.vue b/src/views/bpm/oa/leave/create.vue
index 9e99e814..dd932627 100644
--- a/src/views/bpm/oa/leave/create.vue
+++ b/src/views/bpm/oa/leave/create.vue
@@ -1,56 +1,107 @@
<template>
- <ContentWrap>
- <!-- 对话框(添加 / 修改) -->
- <Form :schema="allSchemas.formSchema" :rules="rules" ref="formRef" />
- <!-- 按钮：保存 -->
- <XButton
- type="primary"
- :title="t('action.save')"
- :loading="actionLoading"
- @click="submitForm"
- />
- </ContentWrap>
+ <Dialog title="发起OA请假流程" v-model="modelVisible">
+ <el-form
+ ref="formRef"
+ :model="formData"
+ :rules="formRules"
+ label-width="80px"
+ v-loading="formLoading"
+ >
+ <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"
+ />
+ </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>
<script setup lang="ts">
-import { FormExpose } from '@/components/Form'
-// import XEUtils from 'xe-utils'
-
-// 业务相关的 import
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
import * as LeaveApi from '@/api/bpm/leave'
-import { rules, allSchemas } from './leave.data'
-
-const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗
-const { push } = useRouter() // 路由
-// 表单参数
-const actionLoading = ref(false) // 按钮 Loading
-const formRef = ref<FormExpose>() // 表单 Ref
+const modelVisible = ref(false) // 弹窗的是否展示
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formData = ref({
+ type: undefined,
+ reason: undefined,
+ startTime: undefined,
+ endTime: undefined
+})
+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 () => {
- const elForm = unref(formRef)?.getElFormRef()
- 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
- }
- })
+ // 校验表单
+ 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>
diff --git a/src/views/bpm/oa/leave/detail.vue b/src/views/bpm/oa/leave/detail.vue
index e35de6e5..31e54de3 100644
--- a/src/views/bpm/oa/leave/detail.vue
+++ b/src/views/bpm/oa/leave/detail.vue
@@ -1,42 +1,40 @@
<template>
- <ContentWrap>
- <!-- 详情 -->
- <Descriptions :schema="allSchemas.detailSchema" :data="formData" />
- <el-button @click="routerReturn" type="primary">返回</el-button>
- </ContentWrap>
+ <Dialog title="详情" v-model="modelVisible" :scroll="true" :max-height="200">
+ <el-descriptions border :column="1">
+ <el-descriptions-item label="请假类型">
+ <dict-tag :type="DICT_TYPE.BPM_OA_LEAVE_TYPE" :value="detailData.type" />
+ </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>
-
<script setup lang="ts">
-// 业务相关的 import
+import { DICT_TYPE } from '@/utils/dict'
+import { formatDate } from '@/utils/formatTime'
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 formData = ref({
- startTime: undefined,
- endTime: undefined,
- type: undefined,
- reason: undefined
-})
+const modelVisible = ref(false) // 弹窗的是否展示
+const detailLoading = ref(false) // 表单的加载中
+const detailData = ref() // 详情数据
-const routerReturn = () => {
- router.back()
-}
-
-onMounted(() => {
- id.value = query.id
- if (!id.value) {
- message.error('未传递 id 参数，无法查看 OA 请假信息')
- return
+/** 打开弹窗 */
+const open = async (data: LeaveApi.LeaveVO) => {
+ modelVisible.value = true
+ // 设置数据
+ detailLoading.value = true
+ try {
+ detailData.value = data
+ } finally {
+ detailLoading.value = false
}
- // 获得请假信息
- LeaveApi.getLeave(id.value).then((data) => {
- formData.value = data
- })
-})
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
</script>
diff --git a/src/views/bpm/oa/leave/index.vue b/src/views/bpm/oa/leave/index.vue
index 22d86dfe..c6979f1a 100644
--- a/src/views/bpm/oa/leave/index.vue
+++ b/src/views/bpm/oa/leave/index.vue
@@ -1,83 +1,237 @@
<template>
- <ContentWrap>
- <XTable @register="registerTable">
- <template #toolbar_buttons>
- <!-- 操作：发起请假 -->
- <XButton type="primary" preIcon="ep:plus" title="发起请假" @click="handleCreate()" />
- </template>
- <template #actionbtns_default="{ row }">
- <!-- 操作: 取消请假 -->
- <XTextButton
- preIcon="ep:delete"
- title="取消请假"
- v-hasPermi="['bpm:oa-leave:create']"
- v-if="row.result === 1"
- @click="cancelLeave(row)"
+ <content-wrap>
+ <!-- 搜索工作栏 -->
+ <el-form
+ class="-mb-15px"
+ :model="queryParams"
+ ref="queryFormRef"
+ :inline="true"
+ label-width="68px"
+ >
+ <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="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"
/>
- <!-- 操作: 详情 -->
- <XTextButton preIcon="ep:view" :title="t('action.detail')" @click="handleDetail(row)" />
- <!-- 操作: 审批进度 -->
- <XTextButton preIcon="ep:edit-pen" title="审批进度" @click="handleProcessDetail(row)" />
- </template>
- </XTable>
- </ContentWrap>
-</template>
+ </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
-import { ElMessageBox } from 'element-plus'
-// 业务相关的 import
-import { allSchemas } from './leave.data'
+ <!-- 列表 -->
+ <content-wrap>
+ <el-table v-loading="loading" :data="list">
+ <el-table-column label="申请编号" align="center" prop="id" />
+ <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 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 { push } = useRouter() // 路由
-
-const [registerTable, { reload }] = useXTable({
- allSchemas: allSchemas,
- getListApi: LeaveApi.getLeavePage
+const router = useRouter()
+const queryParams = reactive({
+ pageNo: 1,
+ pageSize: 10,
+ type: undefined,
+ result: undefined,
+ reason: undefined,
+ createTime: []
})
+const queryFormRef = ref() // 搜索的表单
-// 发起请假
-const handleCreate = () => {
- push({
- name: 'OALeaveCreate'
- })
+/** 查询列表 */
+const getList = async () => {
+ loading.value = true
+ 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) => {
ElMessageBox.prompt('请输入取消原因', '取消流程', {
- confirmButtonText: t('common.ok'),
- cancelButtonText: t('common.cancel'),
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
inputErrorMessage: '取消原因不能为空'
}).then(async ({ value }) => {
- await ProcessInstanceApi.cancelProcessInstance(row.id, value)
+ await ProcessInstanceApi.cancelProcessInstanceApi(row.id, value)
message.success('取消成功')
- reload()
- })
-}
-
-// 详情
-const handleDetail = (row) => {
- push({
- name: 'OALeaveDetail',
- query: {
- id: row.id
- }
})
}
// 审批进度
const handleProcessDetail = (row) => {
- push({
+ router.push({
name: 'BpmProcessInstanceDetail',
query: {
id: row.processInstanceId
}
})
}
+
+/** 初始化 **/
+onMounted(() => {
+ getList()
+})
</script>
diff --git a/src/views/bpm/oa/leave/leave.data.ts b/src/views/bpm/oa/leave/leave.data.ts
deleted file mode 100644
index 5b6f2c52..00000000
--- a/src/views/bpm/oa/leave/leave.data.ts
+++ /dev/null
@@ -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)