From f95f6e8390c355bd601849de26b338bb64c97b90 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: 星期五, 07 六月 2024 21:38:17 +0800
Subject: [PATCH] update 优化审批按钮判断
---
src/components/Process/approvalRecord.vue | 116 +++++++++-------------------------------------------------
1 files changed, 18 insertions(+), 98 deletions(-)
diff --git a/src/components/Process/approvalRecord.vue b/src/components/Process/approvalRecord.vue
index 88dccf2..bb4ed91 100644
--- a/src/components/Process/approvalRecord.vue
+++ b/src/components/Process/approvalRecord.vue
@@ -3,59 +3,27 @@
<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 label="娴佺▼鍥�" name="bpmn">
- <!-- <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>-->
<BpmnView ref="bpmnViewRef"></BpmnView>
</el-tab-pane>
- <el-tab-pane label="瀹℃壒淇℃伅" name="info">
+ <el-tab-pane v-loading="loading" label="瀹℃壒淇℃伅" name="info">
<div>
- <el-table :data="historyList" style="width: 100%" border fit max-height="570">
- <el-table-column type="index" label="搴忓彿" align="center" width="50"></el-table-column>
+ <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="name" label="浠诲姟鍚嶇О" sortable align="center"></el-table-column>
- <el-table-column prop="nickName" label="鍔炵悊浜�" sortable align="center"></el-table-column>
+ <el-table-column prop="nickName" :show-overflow-tooltip="true" label="鍔炵悊浜�" sortable align="center">
+ <template #default="scope">
+ <el-tag type="success">{{ scope.row.nickName || '鏃�' }}</el-tag>
+ </template>
+ </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="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 prop="attachmentList" label="闄勪欢" sortable align="center">
<template #default="scope">
<el-popover v-if="scope.row.attachmentList && scope.row.attachmentList.length > 0" placement="right" :width="310" trigger="click">
@@ -73,9 +41,6 @@
</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>
</div>
</el-tab-pane>
@@ -88,14 +53,6 @@
import processApi from '@/api/workflow/processInstance';
import { propTypes } from '@/utils/propTypes';
-type NodeInfo = {
- nickName?: string;
- status?: string;
- startTime?: string;
- endTime?: string;
- runDuration?: string;
-};
-
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const props = defineProps({
@@ -103,62 +60,25 @@
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<NodeInfo>({});
-const graphicX = ref<number | string>(0);
-const graphicY = ref<number | string>(0);
const tabActiveName = ref('bpmn');
const bpmnViewRef = ref<BpmnView>();
//鍒濆鍖栨煡璇㈠鎵硅褰�
-const init = async (instanceId: string) => {
+const init = async (businessKey: string | number) => {
visible.value = true;
loading.value = true;
+ tabActiveName.value = 'bpmn';
historyList.value = [];
- graphicInfoVos.value = [];
- processApi.getHistoryImage(instanceId).then((res) => {
- src.value = 'data:image/png;base64,' + res.data;
- });
- processApi.getHistoryRecord(instanceId).then((resp) => {
- historyList.value = resp.data.historyRecordList;
- graphicInfoVos.value = resp.data.graphicInfoVos;
- nodeListInfo.value = resp.data.nodeListInfo;
- deleteReason.value = resp.data.deleteReason;
+ processApi.getHistoryRecord(businessKey).then((resp) => {
+ historyList.value = resp.data;
loading.value = false;
});
await nextTick(() => {
- bpmnViewRef.value.init(instanceId);
+ bpmnViewRef.value.init(businessKey);
});
-};
-//鎮诞浜嬩欢
-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;
- }
- }
-};
-//鍏抽棴
-const handleMouseLeave = async () => {
- popupVisible.value = false;
};
/** 涓嬭浇鎸夐挳鎿嶄綔 */
@@ -189,8 +109,8 @@
.container {
:deep(.el-dialog .el-dialog__body) {
- max-height: calc(100vh - 300px) !important;
- min-height: calc(100vh - 300px) !important;
+ max-height: calc(100vh - 170px) !important;
+ min-height: calc(100vh - 170px) !important;
}
}
</style>
--
Gitblit v1.9.3