From e423d8afcf5b9666e166565d0509b621ebab17e7 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 13 一月 2025 14:11:00 +0800
Subject: [PATCH] !172 合并 warmflow 功能分支 * update 优化 流程定义页面 点击复制之后跳转到未发布列表 * update 优化 流程定义页面 增加加载loading层 * fix: v-model处理有延迟 需要手动处理 * update 调整流程定义查询 * Merge remote-tracking branch 'origin/dev' into warm-flw-future * update 调整可驳回的节点 * update: 调整文案 * update: 激活/挂起改为switch操作 * update 优化 代码删除无用输出 * update 统一抄送人使用昵称展示 * update 调整分类接口 * update 统一业务id参数 * update 删除默认顶节点 * !168 优化流程分类 * update 恢复误删除代码 * update 优化流程分类 * update 修复 路由跳转未改全 * [update] * fix 修复一些问题 * update 重构流程分类表 * update 流程定义增加表单路径与编辑功能 修复一些其他bug * fix 修复 一些问题 * update 变量统一命名 * add 增加示例 * Merge branch 'warm-flw-future' of https://gitee.com/JavaLionLi/plus-ui… * update 调整办理人 * Merge remote-tracking branch 'origin/dev' into warm-flw-future * add 增加示例 * update 调整审批记录 添加流程导出 * remove 删除无用代码 * remove 删除无用代码 * [update] * [fix] * 流程干预删除委托 * 增加附件 * 附件修改 * 申请人查询修改 * 1.修改查询条件 * !167 fix 修复 import路径修改不全问题 * fix 修复 import路径修改不全问题 * !166 update 清除 ProcessPreview 引用 * update 清除 ProcessPreview 引用 * remove 删除 bpmn.js 设计器 * remove 删除 bpmn.js 设计器 * remove 删除 bpmn.js 设计器 * remove 删除 bpmn.js 设计器 * fix 修复 前端路径修改不全问题 * update 优化接口请求路径 * add 添加作废 * add 添加流程干预 * update 调整加签，减签 * update 调整加签，减签 * add 增加流程查看 * update 调整委托，转办 * update 调整流程变量显示 * update 调整办理人修改 * update 调整流程实例状态页面 * update 调整已办页面 * add 添加流程撤销 * update 调整任务，流程实例 ，流程定义页面 * Merge branch 'dev' into warm-flw-future * update 调整流程定义页面 * add 添加流程变量查看 * update 调整设计器路由名称 * update 调整办理人 * update 调整设计器uri * update 调整设计器请求uri 调整待办状态 * update 调整办理 驳回 终止等状态 * add 添加模型新增 * add 添加warm-ui设计器,删除无用代码 * Merge remote-tracking branch 'origin/dev' into warm-flw-future * add 添加流程设计 * update 调整驳回 * update 调整视图类型错误 * Merge branch 'warm-flw-future' of https://gitee.com/JavaLionLi/plus-ui… * 添加已办，未办 * Merge remote-tracking branch 'origin/dev' into warm-flw-future * update 调整流程实例，待办查询 * add 添加代办人，调整提交按钮校验 * update 调整流程定义查询 * add添加流程定义激活 挂起 * add 添加流程文件部署 调整流程发布 * update 优化 时间搜索组件统一 * Merge remote-tracking branch 'origin/dev' into warm-flw-future * fix 修复 用户管理编辑安全权限错误问题 * Merge remote-tracking branch 'origin/dev' into warm-flw-future * update 优化 类型报错问题 * update 优化 切换租户后刷新首页 * update 优化 实现表格行选中切换 * update 优化 使用 vueuse 重构 websocket 实现 * update 优化 使用 vueuse 重构 websocket 实现 * fix 修复 登出后重新登录 sse推送报错问题 * reset 回滚 代码修改 采用其他方案 * fix 修复 登出后重新登录 sse推送报错问题 * update 优化 删除无用代码 * update element-plus 2.7.5 => 2.7.8 * reset 回滚 错误修复 * update 优化 代码生成器编辑页禁用缓存 防止同步后页面不更新问题 * fix 修复 代码生成同步点击取消报错问题 * 初始化添加warm-flow
---
src/views/workflow/leave/index.vue | 267 ++++++++++++-----------------------------------------
1 files changed, 61 insertions(+), 206 deletions(-)
diff --git a/src/views/workflow/leave/index.vue b/src/views/workflow/leave/index.vue
index c7550b2..64f0c57 100644
--- a/src/views/workflow/leave/index.vue
+++ b/src/views/workflow/leave/index.vue
@@ -2,7 +2,7 @@
<div class="p-2">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
<div v-show="showSearch" class="search">
- <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="68px">
+ <el-form ref="queryFormRef" :model="queryParams" :inline="true">
<el-form-item label="璇峰亣澶╂暟" prop="startLeaveDays">
<el-input v-model="queryParams.startLeaveDays" placeholder="璇疯緭鍏ヨ鍋囧ぉ鏁�" clearable @keyup.enter="handleQuery" />
</el-form-item>
@@ -22,16 +22,16 @@
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
- <el-button v-hasPermi="['demo:leave:add']" type="primary" plain icon="Plus" @click="handleAdd">鏂板</el-button>
+ <el-button v-hasPermi="['workflow:leave:add']" type="primary" plain icon="Plus" @click="handleAdd">鏂板</el-button>
</el-col>
<el-col :span="1.5">
- <el-button v-hasPermi="['demo:leave:export']" type="warning" plain icon="Download" @click="handleExport">瀵煎嚭</el-button>
+ <el-button v-hasPermi="['workflow:leave:export']" type="warning" plain icon="Download" @click="handleExport">瀵煎嚭</el-button>
</el-col>
- <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>
+ <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
</el-row>
</template>
- <el-table v-loading="loading" :data="leaveList" @selection-change="handleSelectionChange">
+ <el-table v-loading="loading" border :data="leaveList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column v-if="false" label="涓婚敭" align="center" prop="id" />
<el-table-column label="璇峰亣绫诲瀷" align="center">
@@ -51,107 +51,56 @@
</el-table-column>
<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">
+ <el-table-column align="center" label="娴佺▼鐘舵��" min-width="70">
<template #default="scope">
- <el-tag type="success">{{ scope.row.processInstanceVo.businessStatusName }}</el-tag>
+ <dict-tag :options="wf_business_status" :value="scope.row.status"></dict-tag>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" align="center" width="162">
<template #default="scope">
- <el-tooltip
- v-if="
- scope.row.processInstanceVo.businessStatus === 'draft' ||
- scope.row.processInstanceVo.businessStatus === 'cancel' ||
- scope.row.processInstanceVo.businessStatus === 'back'
- "
- content="淇敼"
- placement="top"
- >
- <el-button v-hasPermi="['demo:leave:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
- </el-tooltip>
- <el-tooltip
- v-if="
- scope.row.processInstanceVo.businessStatus === 'draft' ||
- scope.row.processInstanceVo.businessStatus === 'cancel' ||
- scope.row.processInstanceVo.businessStatus === 'back'
- "
- content="鍒犻櫎"
- placement="top"
- >
- <el-button v-hasPermi="['demo:leave:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
- </el-tooltip>
- <el-tooltip v-if="scope.row.processInstanceVo.businessStatus === 'waiting'" content="鎾ら攢" placement="top">
- <el-button link type="primary" icon="Notification" @click="handleCancelProcessApply(scope.row.processInstanceVo.id)"></el-button>
- </el-tooltip>
- <el-tooltip v-if="scope.row.processInstanceVo.businessStatus === 'waiting'" content="瀹℃壒璁板綍" placement="top">
- <el-button link type="primary" icon="Document" @click="handleApprovalRecord(scope.row.processInstanceVo.id)"></el-button>
- </el-tooltip>
+ <el-row :gutter="10" class="mb8">
+ <el-col :span="1.5" v-if="scope.row.status === 'draft' || scope.row.status === 'cancel' || scope.row.status === 'back'">
+ <el-button v-hasPermi="['workflow:leave:edit']" size="small" type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+ >淇敼</el-button
+ >
+ </el-col>
+ <el-col :span="1.5" v-if="scope.row.status === 'draft' || scope.row.status === 'cancel' || scope.row.status === 'back'">
+ <el-button v-hasPermi="['workflow:leave:remove']" size="small" type="primary" icon="Delete" @click="handleDelete(scope.row)"
+ >鍒犻櫎</el-button
+ >
+ </el-col>
+ </el-row>
+ <el-row :gutter="10" class="mb8">
+ <el-col :span="1.5">
+ <el-button type="primary" size="small" icon="View" @click="handleView(scope.row)">鏌ョ湅</el-button>
+ </el-col>
+ <el-col :span="1.5" v-if="scope.row.status === 'waiting'">
+ <el-button size="small" type="primary" icon="Notification" @click="handleCancelProcessApply(scope.row.id)">鎾ら攢</el-button>
+ </el-col>
+ </el-row>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" :total="total" @pagination="getList" />
</el-card>
- <!-- 娣诲姞鎴栦慨鏀硅鍋囧璇濇 -->
- <el-dialog v-model="dialog.visible" :title="dialog.title" width="800px" append-to-body>
- <el-form ref="leaveFormRef" v-loading="loading" :model="form" :rules="rules" label-width="80px">
- <el-form-item label="璇峰亣绫诲瀷" prop="leaveType">
- <el-select v-model="form.leaveType" placeholder="璇烽�夋嫨璇峰亣绫诲瀷" style="width: 100%">
- <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
- </el-select>
- </el-form-item>
- <el-form-item label="璇峰亣鏃堕棿">
- <el-date-picker
- v-model="leaveTime"
- type="daterange"
- range-separator="To"
- start-placeholder="寮�濮嬫椂闂�"
- end-placeholder="缁撴潫鏃堕棿"
- @change="changeLeaveTime()"
- />
- </el-form-item>
- <el-form-item label="璇峰亣澶╂暟" prop="leaveDays">
- <el-input v-model="form.leaveDays" disabled type="number" placeholder="璇疯緭鍏ヨ鍋囧ぉ鏁�" />
- </el-form-item>
- <el-form-item label="璇峰亣鍘熷洜" prop="remark">
- <el-input v-model="form.remark" type="textarea" :rows="3" 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" :task-variables="taskVariables" @submit-callback="submitCallback" />
- <!-- 瀹℃壒璁板綍 -->
- <approvalRecord ref="approvalRecordRef" />
</div>
</template>
<script setup name="Leave" lang="ts">
-import { addLeave, delLeave, getLeave, listLeave, updateLeave } from '@/api/workflow/leave';
-import { cancelProcessApply } from '@/api/workflow/processInstance';
+import { delLeave, listLeave } from '@/api/workflow/leave';
+import { cancelProcessApply } from '@/api/workflow/instance';
import { LeaveForm, LeaveQuery, LeaveVO } from '@/api/workflow/leave/types';
-import { startWorkFlow } from '@/api/workflow/task';
-import SubmitVerify from '@/components/Process/submitVerify.vue';
-import ApprovalRecord from '@/components/Process/approvalRecord.vue';
-import { AxiosResponse } from 'axios';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-
+const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status'));
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 leaveTime = ref<Array<string>>([]);
const options = [
{
value: '1',
@@ -170,51 +119,21 @@
label: '濠氬亣'
}
];
-//鎻愪氦缁勪欢
-const submitVerifyRef = ref<InstanceType<typeof SubmitVerify>>();
-//瀹℃壒璁板綍缁勪欢
-const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
const queryFormRef = ref<ElFormInstance>();
-const leaveFormRef = ref<ElFormInstance>();
-const submitFormData = ref<Record<string, any>>({
- businessKey: '',
- processKey: '',
- variables: {}
-});
-const taskVariables = ref<Record<string, any>>({});
-
-const dialog = reactive<DialogOption>({
- visible: false,
- title: ''
-});
-
-const initFormData: LeaveForm = {
- id: undefined,
- leaveType: undefined,
- startDate: undefined,
- endDate: undefined,
- leaveDays: undefined,
- remark: undefined
-};
const data = reactive<PageData<LeaveForm, LeaveQuery>>({
- form: { ...initFormData },
+ form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
startLeaveDays: undefined,
endLeaveDays: undefined
},
- rules: {
- id: [{ required: true, message: '涓婚敭涓嶈兘涓虹┖', trigger: 'blur' }],
- leaveType: [{ required: true, message: '璇峰亣绫诲瀷涓嶈兘涓虹┖', trigger: 'blur' }],
- leaveTime: [{ required: true, message: '璇峰亣鏃堕棿涓嶈兘涓虹┖', trigger: 'blur' }],
- leaveDays: [{ required: true, message: '璇峰亣澶╂暟涓嶈兘涓虹┖', trigger: 'blur' }]
- }
+ rules: {}
});
-const { queryParams, form, rules } = toRefs(data);
+const { queryParams } = toRefs(data);
/** 鏌ヨ璇峰亣鍒楄〃 */
const getList = async () => {
@@ -223,19 +142,6 @@
leaveList.value = res.rows;
total.value = res.total;
loading.value = false;
-};
-
-/** 鍙栨秷鎸夐挳 */
-const cancel = () => {
- reset();
- dialog.visible = false;
-};
-
-/** 琛ㄥ崟閲嶇疆 */
-const reset = () => {
- form.value = { ...initFormData };
- leaveTime.value = [];
- leaveFormRef.value?.resetFields();
};
/** 鎼滅储鎸夐挳鎿嶄綔 */
@@ -259,61 +165,35 @@
/** 鏂板鎸夐挳鎿嶄綔 */
const handleAdd = () => {
- dialog.visible = true;
- dialog.title = '娣诲姞璇峰亣鐢宠';
- nextTick(() => {
- reset();
+ proxy.$tab.closePage(proxy.$route);
+ proxy.$router.push({
+ path: `/workflow/leaveEdit/index`,
+ query: {
+ type: 'add'
+ }
});
};
-const changeLeaveTime = () => {
- const startDate = new Date(leaveTime.value[0]).getTime();
- const endDate = new Date(leaveTime.value[1]).getTime();
- const diffInMilliseconds = endDate - startDate;
- form.value.leaveDays = Math.floor(diffInMilliseconds / (1000 * 60 * 60 * 24));
-};
/** 淇敼鎸夐挳鎿嶄綔 */
const handleUpdate = (row?: LeaveVO) => {
- buttonLoading.value = false;
- dialog.visible = true;
- dialog.title = '淇敼璇峰亣鐢宠';
- nextTick(async () => {
- reset();
- const _id = row?.id || ids.value[0];
- const res = await getLeave(_id);
- Object.assign(form.value, res.data);
- leaveTime.value = [];
- leaveTime.value.push(form.value.startDate);
- leaveTime.value.push(form.value.endDate);
+ proxy.$tab.closePage(proxy.$route);
+ proxy.$router.push({
+ path: `/workflow/leaveEdit/index`,
+ query: {
+ id: row.id,
+ type: 'update'
+ }
});
};
-/** 鎻愪氦鎸夐挳 */
-const submitForm = (status: string) => {
- if (leaveTime.value.length === 0) {
- proxy?.$modal.msgError('璇峰亣鏃堕棿涓嶈兘涓虹┖');
- return;
- }
- leaveFormRef.value?.validate(async (valid: boolean) => {
- form.value.startDate = leaveTime.value[0];
- form.value.endDate = leaveTime.value[1];
- if (valid) {
- buttonLoading.value = true;
- let res: AxiosResponse<LeaveVO>;
- if (form.value.id) {
- res = await updateLeave(form.value);
- } else {
- res = await addLeave(form.value);
- }
- form.value = res.data;
- if (status === 'draft') {
- buttonLoading.value = false;
- proxy?.$modal.msgSuccess('鏆傚瓨鎴愬姛');
- dialog.visible = false;
- await getList();
- } else {
- await handleStartWorkFlow(res.data);
- }
+/** 鏌ョ湅鎸夐挳鎿嶄綔 */
+const handleView = (row?: LeaveVO) => {
+ proxy.$tab.closePage(proxy.$route);
+ proxy.$router.push({
+ path: `/workflow/leaveEdit/index`,
+ query: {
+ id: row.id,
+ type: 'view'
}
});
};
@@ -330,7 +210,7 @@
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
const handleExport = () => {
proxy?.download(
- 'demo/leave/export',
+ 'workflow/leave/export',
{
...queryParams.value
},
@@ -338,40 +218,15 @@
);
};
-//鎻愪氦鐢宠
-const handleStartWorkFlow = async (data: LeaveVO) => {
- submitFormData.value.processKey = 'leave7';
- submitFormData.value.businessKey = data.id;
- //娴佺▼鍙橀噺
- taskVariables.value = {
- entity: data,
- leaveDays: data.leaveDays,
- userList: [1, 2],
- userList2: [1, 2]
- };
- submitFormData.value.variables = taskVariables.value;
- const resp = await startWorkFlow(submitFormData.value);
- if (submitVerifyRef.value) {
- buttonLoading.value = false;
- submitVerifyRef.value.openDialog(resp.data.taskId);
- }
-};
-//瀹℃壒璁板綍
-const handleApprovalRecord = (id: string) => {
- if (approvalRecordRef.value) {
- approvalRecordRef.value.init(id);
- }
-};
-//鎻愪氦鍥炶皟
-const submitCallback = async () => {
- dialog.visible = false;
- handleQuery();
-};
/** 鎾ら攢鎸夐挳鎿嶄綔 */
const handleCancelProcessApply = async (id: string) => {
await proxy?.$modal.confirm('鏄惁纭鎾ら攢褰撳墠鍗曟嵁锛�');
loading.value = true;
- await cancelProcessApply(id).finally(() => (loading.value = false));
+ let data = {
+ businessId: id,
+ message: '鐢宠浜烘挙閿�娴佺▼锛�'
+ };
+ await cancelProcessApply(data).finally(() => (loading.value = false));
await getList();
proxy?.$modal.msgSuccess('鎾ら攢鎴愬姛');
};
--
Gitblit v1.9.3