abu/wzj-vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add 添加请假申请示例，添加流程定义文件部署

Browse Source
This commit is contained in:
gssong 2023-07-22 23:22:05 +08:00
parent 6bb08cc757
commit ff236d1e7a
7 changed files with 484 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/api/demo/leave/index.ts Normal file
View File

@ -0,0 +1,63 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import { LeaveVO, LeaveForm, LeaveQuery } from '@/api/demo/leave/types';
/**
* 查询请假列表
* @param query
* @returns {*}
*/
export const listLeave = (query?: LeaveQuery): AxiosPromise<LeaveVO[]> => {
return request({
url: '/demo/leave/list',
method: 'get',
params: query
});
};
/**
* 查询请假详细
* @param id
*/
export const getLeave = (id: string | number): AxiosPromise<LeaveVO> => {
return request({
url: '/demo/leave/' + id,
method: 'get'
});
};
/**
* 新增请假
* @param data
*/
export const addLeave = (data: LeaveForm) => {
return request({
url: '/demo/leave',
method: 'post',
data: data
});
};
/**
* 修改请假
* @param data
*/
export const updateLeave = (data: LeaveForm) => {
return request({
url: '/demo/leave',
method: 'put',
data: data
});
};
/**
* 删除请假
* @param id
*/
export const delLeave = (id: string | number | Array<string | number>) => {
return request({
url: '/demo/leave/' + id,
method: 'delete'
});
};

58
src/api/demo/leave/types.ts Normal file
View File

@ -0,0 +1,58 @@
export interface LeaveVO {
/**
* 主键
*/
id: string | number;
/**
* 标题
*/
title: string;
/**
* 请假天数
*/
leaveDays: number;
/**
* 备注
*/
remark: string;
}
export interface LeaveForm extends BaseEntity {
/**
* 主键
*/
id?: string | number;
/**
* 标题
*/
title?: string;
/**
* 请假天数
*/
leaveDays?: number;
/**
* 备注
*/
remark?: string;
}
export interface LeaveQuery extends PageQuery {
/**
* 标题
*/
title?: string;
/**
* 请假天数
*/
leaveDays?: number;
}

12
src/api/workflow/processDefinition/index.ts
View File

@ -71,4 +71,16 @@ export const convertToModel = (processDefinitionId: string) => {
});
};
/**
* 通过zip或xml部署流程定义
* @returns
*/
export function deployProcessFile(data: any) {
return request({
url: '/workflow/processDefinition/deployByFile',
method: 'post',
data: data
})
}

26
src/components/Process/submitVerify.vue
View File

@ -1,6 +1,6 @@
<template>
<el-dialog v-model="dialog.visible" v-loading="loading" :title="dialog.title" width="50%" draggable :close-on-click-modal="false">
<el-form :model="form" label-width="120px">
<el-dialog v-model="dialog.visible" :title="dialog.title" width="50%" draggable :close-on-click-modal="false">
<el-form :model="form" label-width="120px" v-loading="loading">
<el-form-item label="消息提醒">
<el-checkbox-group v-model="form.messageType">
<el-checkbox label="1" name="type" disabled>站内信</el-checkbox>
@ -28,18 +28,13 @@ import { ComponentInternalInstance } from 'vue';
import { ElForm } from 'element-plus';
import { completeTask, backProcess, getBusinessStatus } from '@/api/workflow/task';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const props = defineProps({
taskId: {
type: String,
required: true,
default: ''
}
});
//遮罩层
const loading = ref(true);
//流程状态
const businessStatus = ref('');
//任务id
const taskId = ref('');
const dialog = reactive<DialogOption>({
visible: false,
@ -53,12 +48,15 @@ const form = ref<Record<string, any>>({
messageType: ['1']
});
//打开弹窗
const openDialog = (visible?: any) => {
const openDialog = (visible?: any,id?: string) => {
taskId.value = id
form.value.message = undefined;
dialog.visible = visible;
loading.value = true;
nextTick(() => {
getBusinessStatus(props.taskId).then((response) => {
getBusinessStatus(taskId.value).then((response) => {
businessStatus.value = response.data;
loading.value = false;
});
});
};
@ -68,8 +66,9 @@ const emits = defineEmits(['submitCallback']);
/** 办理流程 */
const handleCompleteTask = async () => {
form.value.taskId = props.taskId;
form.value.taskId = taskId.value;
await proxy?.$modal.confirm('是否确认提交？');
loading.value = true
await completeTask(form.value).finally(() => (loading.value = false));
dialog.visible = false;
emits('submitCallback');
@ -78,8 +77,9 @@ const handleCompleteTask = async () => {
/** 驳回流程 */
const handleBackProcess = async () => {
form.value.taskId = props.taskId;
form.value.taskId = taskId.value;
await proxy?.$modal.confirm('是否确认驳回到申请人？');
loading.value = true
await backProcess(form.value).finally(() => (loading.value = false));
dialog.visible = false;
emits('submitCallback');

298
src/views/demo/leave/index.vue Normal file
View File

@ -0,0 +1,298 @@
<template>
<div class="p-2">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
<div class="search" v-show="showSearch">
<el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
<el-form-item label="标题" prop="title">
<el-input v-model="queryParams.title" placeholder="请输入标题" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="请假天数" prop="leaveDays">
<el-input v-model="queryParams.leaveDays" placeholder="请输入请假天数" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</div>
</transition>
<el-card shadow="never">
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['demo:leave:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['demo:leave:edit']">修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['demo:leave:remove']"
>删除</el-button
>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['demo:leave:export']">导出</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
</template>
<el-table v-loading="loading" :data="leaveList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="主键" align="center" prop="id" v-if="true" />
<el-table-column label="标题" align="center" prop="title" />
<el-table-column label="请假天数" align="center" prop="leaveDays" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column align="center" prop="businessStatusName" label="流程状态" min-width="70">
<template #default="scope">
<el-tag type="success">{{scope.row.processInstanceVo.businessStatusName}}</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip
content="修改"
placement="top"
v-if="scope.row.processInstanceVo.businessStatus === 'draft'||scope.row.processInstanceVo.businessStatus === 'cancel'||scope.row.processInstanceVo.businessStatus === 'back'"
>
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['demo:leave:edit']"></el-button>
</el-tooltip>
<el-tooltip
content="删除"
placement="top"
v-if="scope.row.processInstanceVo.businessStatus === 'draft'||scope.row.processInstanceVo.businessStatus === 'cancel'||scope.row.processInstanceVo.businessStatus === 'back'"
>
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['demo:leave:remove']"></el-button>
</el-tooltip>
<el-tooltip content="撤销" placement="top" v-if="scope.row.processInstanceVo.businessStatus === 'waiting'">
<el-button link type="primary" icon="Promotion" @click="handleCancelProcessApply(scope.row.processInstanceVo.id)"></el-button>
</el-tooltip>
</template>
</el-table-column>
</el-table>
<pagination v-show="total>0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card>
<!-- 添加或修改请假对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
<el-form ref="leaveFormRef" :model="form" :rules="rules" label-width="80px" v-loading="loading">
<el-form-item label="标题" prop="title">
<el-input v-model="form.title" placeholder="请输入标题" />
</el-form-item>
<el-form-item label="请假天数" prop="leaveDays">
<el-input v-model="form.leaveDays" type="number" placeholder="请输入请假天数" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" :rows="2" placeholder="请输入备注" />
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button :loading="buttonLoading" type="info" @click="submitForm('draft')">暂 存</el-button>
<el-button :loading="buttonLoading" type="primary" @click="submitForm('submit')">提 交</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</template>
</el-dialog>
<!-- 提交组件 -->
<submitVerify ref="submitVerifyRef" @submitCallback="submitCallback" />
</div>
</template>
<script setup name="Leave" lang="ts">
import { listLeave, getLeave, delLeave, addLeave, updateLeave } from '@/api/demo/leave';
import { cancelProcessApply } from '@/api/workflow/processInstance';
import { LeaveVO, LeaveQuery, LeaveForm } from '@/api/demo/leave/types';
import { ComponentInternalInstance } from 'vue';
import { ElForm } from 'element-plus';
import { startWorkFlow } from '@/api/workflow/task';
import SubmitVerify from '@/components/Process/submitVerify.vue';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const leaveList = ref<LeaveVO[]>([]);
const buttonLoading = ref(false);
const loading = ref(true);
const showSearch = ref(true);
const ids = ref<Array<string | number>>([]);
const single = ref(true);
const multiple = ref(true);
const total = ref(0);
//提交组件
const submitVerifyRef = ref<InstanceType<typeof SubmitVerify>>();
const queryFormRef = ref(ElForm);
const leaveFormRef = ref(ElForm);
const submitFormData = ref<Record<string, any>>({
businessKey: '',
processKey: '',
variables: {}
});
const dialog = reactive<DialogOption>({
visible: false,
title: ''
});
const initFormData: LeaveForm = {
id: undefined,
title: undefined,
leaveDays: undefined,
remark: undefined
};
const data = reactive<PageData<LeaveForm, LeaveQuery>>({
form: { ...initFormData },
queryParams: {
pageNum: 1,
pageSize: 10,
title: undefined,
leaveDays: undefined
},
rules: {
id: [{ required: true, message: '主键不能为空', trigger: 'blur' }],
title: [{ required: true, message: '标题不能为空', trigger: 'blur' }],
leaveDays: [{ required: true, message: '请假天数不能为空', trigger: 'blur' }],
remark: [{ required: true, message: '备注不能为空', trigger: 'blur' }]
}
});
const { queryParams, form, rules } = toRefs(data);
/** 查询请假列表 */
const getList = async () => {
loading.value = true;
const res = await listLeave(queryParams.value);
leaveList.value = res.rows;
total.value = res.total;
loading.value = false;
};
/** 取消按钮 */
const cancel = () => {
reset();
dialog.visible = false;
};
/** 表单重置 */
const reset = () => {
form.value = { ...initFormData };
leaveFormRef.value.resetFields();
};
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
};
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value.resetFields();
handleQuery();
};
/** 多选框选中数据 */
const handleSelectionChange = (selection: LeaveVO[]) => {
ids.value = selection.map((item) => item.id);
single.value = selection.length != 1;
multiple.value = !selection.length;
};
/** 新增按钮操作 */
const handleAdd = () => {
dialog.visible = true;
dialog.title = '添加请假申请';
nextTick(() => {
reset();
});
};
/** 修改按钮操作 */
const handleUpdate = (row?: LeaveVO) => {
loading.value = true;
dialog.visible = true;
dialog.title = '修改请假申请';
nextTick(async () => {
reset();
const _id = row?.id || ids.value[0];
const res = await getLeave(_id);
loading.value = false;
Object.assign(form.value, res.data);
});
};
/** 提交按钮 */
const submitForm = (status: string) => {
leaveFormRef.value.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
let res = {};
if (form.value.id) {
res = await updateLeave(form.value).finally(() => (buttonLoading.value = false));
} else {
res = await addLeave(form.value).finally(() => (buttonLoading.value = false));
}
if (status === 'draft') {
proxy?.$modal.msgSuccess('暂存成功');
dialog.visible = false;
} else {
handleStartWorkFlow(res.data);
}
await getList();
}
});
};
/** 删除按钮操作 */
const handleDelete = async (row?: LeaveVO) => {
const _ids = row?.id || ids.value;
await proxy?.$modal.confirm('是否确认删除请假编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
await delLeave(_ids);
proxy?.$modal.msgSuccess('删除成功');
await getList();
};
/** 导出按钮操作 */
const handleExport = () => {
proxy?.download(
'demo/leave/export',
{
...queryParams.value
},
`leave_${new Date().getTime()}.xlsx`
);
};
//提交申请
const handleStartWorkFlow = async (data: any) => {
submitFormData.value.processKey = 'test';
submitFormData.value.businessKey = data.id;
submitFormData.value.variables = {
leaveDays: data.leaveDays,
userList: [1]
};
startWorkFlow(submitFormData.value).then((response) => {
if (submitVerifyRef.value) {
submitVerifyRef.value.openDialog(true, response.data.taskId);
}
});
};
//提交回调
const submitCallback = async (data: any) => {
dialog.visible = false;
handleQuery();
};
/** 撤销按钮操作 */
const handleCancelProcessApply = async (id: string) => {
await proxy?.$modal.confirm('是否确认撤销当前单据？');
loading.value = true;
await cancelProcessApply(id).finally(() => (loading.value = false));
getList();
proxy?.$modal.msgSuccess('撤销成功');
};
onMounted(() => {
getList();
});
</script>

74
src/views/workflow/processDefinition/index.vue
View File

@ -38,6 +38,13 @@
</el-card>
</div>
</transition>
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
<div class="mb-[10px]" v-show="showSearch">
<el-card shadow="hover">
<el-button type="primary" icon="UploadFilled" @click="uploadDialog.visible = true">部署流程文件</el-button>
</el-card>
</div>
</transition>
<el-card shadow="hover">
<template #header>
<el-row :gutter="10" class="mb8">
@ -87,9 +94,6 @@
<el-col :span="1.5">
<el-button link type="primary" icon="Sort" @click="handleConvertToModel(scope.row)"> 转换模型 </el-button>
</el-col>
<el-col :span="1.5">
<el-button link type="primary" icon="Pointer" @click="openHandleStartWorkFlow(scope.row)">启动流程</el-button>
</el-col>
</el-row>
</template>
</el-table-column>
@ -107,13 +111,14 @@
<!-- 预览图片或xml -->
<process-preview ref="previewRef" :url="url" :type="type" />
<el-dialog v-model="dialog.visible" :title="dialog.title" width="30%">
<template #footer>
<span class="dialog-footer">
<el-button @click="dialog.visible = false">取消</el-button>
<el-button type="primary" @click="handleStartWorkFlow"> 提交流程 </el-button>
</span>
</template>
<!-- 部署文件 -->
<el-dialog v-if="uploadDialog.visible" v-model="uploadDialog.visible" :title="uploadDialog.title" width="30%">
<el-upload class="upload-demo" drag accept="application/zip,application/xml,.bpmn" :http-request="handerDeployProcessFile">
<el-icon class="UploadFilled"><upload-filled /></el-icon>
<div class="el-upload__text"><em>点击上传，选择BPMN流程文件</em></div>
<div class="el-upload__text">仅支持 .zip、.bpmn20.xml、bpmn 格式文件</div>
<div class="el-upload__text">PS:如若部署请部署从本项目模型管理导出的数据</div>
</el-upload>
</el-dialog>
</div>
</template>
@ -125,9 +130,9 @@ import {
processDefinitionXml,
deleteProcessDefinition,
updateProcessDefState,
convertToModel
convertToModel,
deployProcessFile
} from '@/api/workflow/processDefinition';
import { startWorkFlow, completeTask } from '@/api/workflow/task';
import { ComponentInternalInstance } from 'vue';
import ProcessPreview from './components/processPreview.vue';
import { listCategory } from '@/api/workflow/category';
@ -163,6 +168,11 @@ const dialog = reactive<DialogOption>({
title: '启动'
});
const uploadDialog = reactive<DialogOption>({
visible: false,
title: '部署流程文件'
});
// 查询参数
const queryParams = ref<Record<string, any>>({
pageNum: 1,
@ -295,30 +305,22 @@ const handleConvertToModel = async (row: any) => {
proxy?.$modal.msgSuccess('操作成功');
};
/** 打开启动流程弹窗 */
const openHandleStartWorkFlow = async (row: any) => {
submitFormData.value.processKey = row.key;
submitFormData.value.businessKey = Date.parse(new Date());
submitFormData.value.variables = {
userList:[1,2]
//部署文件
const handerDeployProcessFile = async (data: any) => {
let formData = new FormData();
if (queryParams.value.categoryCode === 'ALL') {
proxy?.$modal.msgError('顶级节点不可作为分类！');
return false;
}
dialog.visible = true;
};
/** 启动流程 */
const handleStartWorkFlow = async () => {
await proxy?.$modal.confirm('是否确认启动流程？');
startWorkFlow(submitFormData.value).then((response) => {
handleCompleteTask(response.data.taskId);
});
};
/** 办理流程 */
const handleCompleteTask = async (taskId: string) => {
let param = {
taskId: taskId
};
await completeTask(param).finally(() => (loading.value = false));
getList();
proxy?.$modal.msgSuccess('操作成功');
dialog.visible = false;
if (!queryParams.value.categoryCode) {
proxy?.$modal.msgError('请选择左侧要上传的分类！');
return false;
}
formData.append('file', data.file);
formData.append('categoryCode', queryParams.value.categoryCode);
await deployProcessFile(formData);
uploadDialog.visible = false;
proxy?.$modal.msgSuccess('部署成功');
handleQuery();
};
</script>

7
src/views/workflow/task/index.vue
View File

@ -105,7 +105,7 @@
<!-- 审批记录 -->
<approvalRecord ref="approvalRecordRef" />
<!-- 提交组件 -->
<submitVerify ref="submitVerifyRef" :taskId="taskId" @submitCallback="handleQuery" />
<submitVerify ref="submitVerifyRef" @submitCallback="handleQuery" />
</div>
</template>
@ -133,8 +133,6 @@ const showSearch = ref(true);
const total = ref(0);
// 模型定义表格数据
const taskList = ref([]);
// 任务id
const taskId = ref('');
// 查询参数
const queryParams = ref<Record<string, any>>({
pageNum: 1,
@ -202,8 +200,7 @@ const getFinishList = () => {
//提交
const submitVerifyOpen = async (id: string) => {
if (submitVerifyRef.value) {
taskId.value = id;
submitVerifyRef.value.openDialog(true);
submitVerifyRef.value.openDialog(true,id);
}
};