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 | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/src/components/Process/approvalRecord.vue b/src/components/Process/approvalRecord.vue
index 04694d1..bb4ed91 100644
--- a/src/components/Process/approvalRecord.vue
+++ b/src/components/Process/approvalRecord.vue
@@ -5,18 +5,25 @@
<el-tab-pane label="娴佺▼鍥�" name="bpmn">
<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>
- <el-table-column type="index" label="搴忓彿" align="center" width="50"></el-table-column>
+ <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">
@@ -34,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>
@@ -58,23 +62,22 @@
const loading = ref(false);
const visible = ref(false);
const historyList = ref<Array<any>>([]);
-const deleteReason = ref<string>('');
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 = [];
- processApi.getHistoryRecord(instanceId).then((resp) => {
- historyList.value = resp.data.historyRecordList;
- 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);
});
};
--
Gitblit v1.9.3