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/components/Process/approvalRecord.vue | 200 ++++++++++++++++++++++---------------------------
1 files changed, 89 insertions(+), 111 deletions(-)
diff --git a/src/components/Process/approvalRecord.vue b/src/components/Process/approvalRecord.vue
index eb40228..baf86a7 100644
--- a/src/components/Process/approvalRecord.vue
+++ b/src/components/Process/approvalRecord.vue
@@ -1,137 +1,108 @@
<template>
- <el-dialog v-model="visible" draggable title="瀹℃壒璁板綍" :width="props.width" :height="props.height" append-to-body
- :close-on-click-modal="false">
- <div v-loading="loading">
- <div style="width: 100%;height: 300px;overflow: auto;position: relative;">
- <div v-for="(graphic, index) in graphicInfoVos" :key="index" :style="{
- position: 'absolute',
- left: `${graphic.x}px`,
- top: `${graphic.y}px`,
- width: `${graphic.width}px`,
- height: `${graphic.height}px`,
- cursor: 'pointer',
- zIndex: 99
- }" @mouseover="handleMouseOver(graphic)" @mouseleave="handleMouseLeave()"></div>
- <!-- 寮瑰嚭鐨� div 鍏冪礌 -->
- <div v-show="popupVisible" class="triangle" :style="{
- position: 'absolute',
- left: `${graphicX}px`,
- top: `${graphicY}px`,
- backgroundColor: '#fff',
- padding: '10px',
- zIndex: 100
- }">
- <p>瀹℃壒浜哄憳: {{ nodeInfo.nickName }}</p>
- <p>鑺傜偣鐘舵�侊細{{ nodeInfo.status }}</p>
- <p>寮�濮嬫椂闂达細{{ nodeInfo.startTime }}</p>
- <p>缁撴潫鏃堕棿锛歿{ nodeInfo.endTime }}</p>
- <p>瀹℃壒鑰楁椂锛歿{ nodeInfo.runDuration }}</p>
- </div>
- <el-image :src="src" />
- </div>
- <div>
- <el-table :data="historyList" style="width: 100%" border fit max-height="570">
- <el-table-column label="娴佺▼瀹℃壒鍘嗗彶璁板綍" align="center">
- <el-table-column type="index" label="搴忓彿" align="center" width="50"></el-table-column>
- <el-table-column prop="name" label="浠诲姟鍚嶇О" sortable align="center"></el-table-column>
- <el-table-column prop="nickName" label="鍔炵悊浜�" sortable align="center"></el-table-column>
- <el-table-column label="鐘舵��" sortable align="center">
- <template #default="scope">
- <el-tag type="success">{{ scope.row.statusName }}</el-tag>
- </template>
- </el-table-column>
- <el-table-column prop="comment" label="瀹℃壒鎰忚" sortable align="center"></el-table-column>
- <el-table-column prop="attachmentList" label="闄勪欢" sortable align="center">
- <template #default="scope">
- <el-popover placement="right" v-if="scope.row.attachmentList && scope.row.attachmentList.length > 0" :width="310" trigger="click">
+ <div class="container">
+ <el-dialog v-model="visible" draggable title="瀹℃壒璁板綍" :width="props.width" :height="props.height" :close-on-click-modal="false">
+ <el-tabs v-model="tabActiveName" class="demo-tabs">
+ <el-tab-pane v-loading="loading" label="娴佺▼鍥�" name="bpmn">
+ <img :src="imgUrl" width="100%" style="margin: 0 auto" />
+ </el-tab-pane>
+ <el-tab-pane v-loading="loading" label="瀹℃壒淇℃伅" name="info">
+ <div>
+ <el-table :data="historyList" style="width: 100%" border fit>
+ <el-table-column type="index" label="搴忓彿" align="center" width="60"></el-table-column>
+ <el-table-column prop="nodeName" label="浠诲姟鍚嶇О" sortable align="center"></el-table-column>
+ <el-table-column prop="approveName" :show-overflow-tooltip="true" label="鍔炵悊浜�" sortable align="center">
+ <template #default="scope">
+ <template v-if="scope.row.approveName">
+ <el-tag v-for="(item, index) in scope.row.approveName.split(',')" :key="index" type="success">{{ item }}</el-tag>
+ </template>
+ <template v-else> <el-tag type="success">鏃�</el-tag></template>
+ </template>
+ </el-table-column>
+ <el-table-column prop="flowStatus" label="鐘舵��" width="80" sortable align="center">
+ <template #default="scope">
+ <dict-tag :options="wf_task_status" :value="scope.row.flowStatus"></dict-tag>
+ </template>
+ </el-table-column>
+ <el-table-column prop="message" label="瀹℃壒鎰忚" :show-overflow-tooltip="true" sortable align="center"></el-table-column>
+ <el-table-column prop="createTime" label="寮�濮嬫椂闂�" width="160" :show-overflow-tooltip="true" sortable align="center"></el-table-column>
+ <el-table-column prop="updateTime" label="缁撴潫鏃堕棿" width="160" :show-overflow-tooltip="true" sortable align="center"></el-table-column>
+ <el-table-column
+ prop="runDuration"
+ label="杩愯鏃跺父"
+ width="140"
+ :show-overflow-tooltip="true"
+ sortable
+ align="center"
+ ></el-table-column>
+ <el-table-column prop="attachmentList" width="120" label="闄勪欢" align="center">
+ <template #default="scope">
+ <el-popover v-if="scope.row.attachmentList && scope.row.attachmentList.length > 0" placement="right" :width="310" trigger="click">
<template #reference>
- <el-button style="margin-right: 16px">闄勪欢</el-button>
+ <el-button type="primary" style="margin-right: 16px">闄勪欢</el-button>
</template>
<el-table border :data="scope.row.attachmentList">
- <el-table-column prop="name" width="202" :show-overflow-tooltip="true" label="闄勪欢鍚嶇О"></el-table-column>
+ <el-table-column prop="originalName" width="202" :show-overflow-tooltip="true" label="闄勪欢鍚嶇О"></el-table-column>
<el-table-column prop="name" width="80" align="center" :show-overflow-tooltip="true" label="鎿嶄綔">
<template #default="tool">
- <el-button type="text" @click="handleDownload(tool.row.contentId)">涓嬭浇</el-button>
+ <el-button type="text" @click="handleDownload(tool.row.ossId)">涓嬭浇</el-button>
</template>
</el-table-column>
</el-table>
-
</el-popover>
- </template>
- </el-table-column>
- <el-table-column prop="startTime" label="寮�濮嬫椂闂�" sortable align="center"></el-table-column>
- <el-table-column prop="endTime" label="缁撴潫鏃堕棿" sortable align="center"></el-table-column>
- <el-table-column prop="runDuration" label="杩愯鏃堕暱" sortable align="center"></el-table-column>
- </el-table-column>
- </el-table>
- </div>
- </div>
- </el-dialog>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ </el-tab-pane>
+ </el-tabs>
+ </el-dialog>
+ </div>
</template>
<script lang="ts" setup>
-import { getHistoryImage, getHistoryRecord } from '@/api/workflow/processInstance';
+import { flowImage } from '@/api/workflow/instance';
+import { propTypes } from '@/utils/propTypes';
+import { listByIds } from '@/api/system/oss';
+
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-import { ref } from 'vue';
+const { wf_task_status } = toRefs<any>(proxy?.useDict('wf_task_status'));
const props = defineProps({
- width: {
- type: String,
- default: '70%'
- },
- height: {
- type: String,
- default: '100%'
- }
+ width: propTypes.string.def('80%'),
+ height: propTypes.string.def('100%')
});
const loading = ref(false);
-const src = ref('');
const visible = ref(false);
const historyList = ref<Array<any>>([]);
-const deleteReason = ref<string>('');
-const graphicInfoVos = ref<Array<any>>([]);
-const nodeListInfo = ref<Array<any>>([]);
-const popupVisible = ref(false);
-const nodeInfo = ref<any>({});
-const graphicX = ref<number | string>(0);
-const graphicY = ref<number | string>(0);
+const tabActiveName = ref('bpmn');
+const imgUrl = ref('');
+
//鍒濆鍖栨煡璇㈠鎵硅褰�
-const init = async (processInstanceId: string) => {
+const init = async (businessId: string | number) => {
visible.value = true;
loading.value = true;
+ tabActiveName.value = 'bpmn';
historyList.value = [];
- graphicInfoVos.value = [];
- getHistoryImage(processInstanceId).then((res) => {
- src.value = 'data:image/png;base64,' + res.data
- });
- getHistoryRecord(processInstanceId).then((response) => {
- historyList.value = response.data.historyRecordList;
- graphicInfoVos.value = response.data.graphicInfoVos;
- nodeListInfo.value = response.data.nodeListInfo;
- deleteReason.value = response.data.deleteReason;
- loading.value = false;
- });
-};
-//鎮诞浜嬩欢
-const handleMouseOver = async (graphic: any) => {
- graphicX.value = graphic.x + graphic.width + 10;
- graphicY.value = graphic.y - graphic.height + -10;
- nodeInfo.value = {};
- if (nodeListInfo.value && nodeListInfo.value.length > 0) {
- let info = nodeListInfo.value.find((e: any) => e.taskDefinitionKey == graphic.nodeId);
- if (info) {
- nodeInfo.value = {
- nickName: info.nickName,
- status: info.status,
- startTime: info.startTime,
- endTime: info.endTime,
- runDuration: info.runDuration
- };
- popupVisible.value = true;
+ flowImage(businessId).then((resp) => {
+ if (resp.data) {
+ historyList.value = resp.data.list;
+ imgUrl.value = 'data:image/gif;base64,' + resp.data.image;
+ if (historyList.value.length > 0) {
+ historyList.value.forEach((item) => {
+ if (item.ext) {
+ getIds(item.ext).then((res) => {
+ item.attachmentList = res.data;
+ });
+ } else {
+ item.attachmentList = [];
+ }
+ });
+ }
+ loading.value = false;
}
- }
+ });
};
-//鍏抽棴
-const handleMouseLeave = async () => {
- popupVisible.value = false;
+const getIds = async (ids: string | number) => {
+ const res = await listByIds(ids);
+ return res;
};
/** 涓嬭浇鎸夐挳鎿嶄綔 */
@@ -145,7 +116,7 @@
init
});
</script>
-<style scoped>
+<style lang="scss" scoped>
.triangle {
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
border-radius: 6px;
@@ -159,4 +130,11 @@
border: 15px solid;
border-color: transparent #fff transparent transparent;
}
+
+.container {
+ :deep(.el-dialog .el-dialog__body) {
+ max-height: calc(100vh - 170px) !important;
+ min-height: calc(100vh - 170px) !important;
+ }
+}
</style>
--
Gitblit v1.9.3