From 5a04ad14ef19b86ad4fd401af5f7d7272e8e01fe Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 14 二月 2025 15:02:58 +0800
Subject: [PATCH] 流程推进详情页查看流程日志优化
---
src/views/projectProcess/detail/index.vue | 138 ++++++++++++++++++++--------------
src/views/projectProcess/components/LogView.vue | 64 +++++++++++----
2 files changed, 126 insertions(+), 76 deletions(-)
diff --git a/src/views/projectProcess/components/LogView.vue b/src/views/projectProcess/components/LogView.vue
index 0b70921..588b93c 100644
--- a/src/views/projectProcess/components/LogView.vue
+++ b/src/views/projectProcess/components/LogView.vue
@@ -2,61 +2,74 @@
<div>
<div v-if="logList && logList.length > 0">
<div class="log-warp" v-for="log in logList" :key="'log' + log.id">
- <div v-if="log.eventType === 'FINISHED'">
+ <div class="log" v-if="log.eventType === 'FINISHED'">
<div>
<span class="tag name">{{log.nickName}}</span>
- 鍦�
+ 浜�
<span class="tag time">{{log.gmtCreate}}</span>
- 瀹屾垚浜嗕换鍔�
+ <span class="tag op">瀹屾垚</span>
+ 浜嗕换鍔�
<span class="tag taskName">{{log.taskName}}</span>
</div>
</div>
- <div v-else-if="log.eventType === 'REJECT'">
+ <div class="log" v-else-if="log.eventType === 'REJECT'">
<div>
<span class="tag name">{{log.nickName}}</span>
- 鍦�
+ 浜�
<span class="tag time">{{log.gmtCreate}}</span>
- 椹冲洖浜嗕换鍔�
+ <span class="tag reject">椹冲洖</span>
+ 浜嗕换鍔�
<span class="tag taskName">{{log.taskName}}</span>
+ 锛�
+ <span class="tag reject">椹冲洖鍘熷洜</span>
+ 锛�
+ <span class="tag">{{log.eventDataObj.reason}}</span>
</div>
- <div>椹冲洖鍘熷洜</div>
</div>
- <div v-else-if="log.eventType === 'DELEGATE'">
+ <div class="log" v-else-if="log.eventType === 'DELEGATE'">
<div>
<span class="tag name">{{log.nickName}}</span>
- 鍦�
+ 浜�
<span class="tag time">{{log.gmtCreate}}</span>
灏嗕换鍔�
<span class="tag taskName">{{log.taskName}}</span>
<span class="tag op">杞姙</span>
- 缁欎簡璋佽皝璋�
+ 缁欎簡
+ <span class="tag">{{log.eventDataObj.afterHandlerNames.join('銆�')}}</span>
</div>
</div>
- <div v-else-if="log.eventType === 'JUMP'">
+ <div class="log" v-else-if="log.eventType === 'JUMP'">
<div>
<span class="tag name">{{log.nickName}}</span>
- 鍦�
+ 浜�
<span class="tag time">{{log.gmtCreate}}</span>
- <span class="tag op">璺宠繃</span>
+ <span class="tag jump">璺宠繃</span>
浜嗕换鍔�
<span class="tag taskName">{{log.taskName}}</span>
+ 锛�
+ <span class="tag jump">璺宠繃璇存槑</span>
+ 锛�
+ <span class="tag">{{log.eventDataObj.desc}}</span>
</div>
- <div>璺宠繃璇存槑</div>
</div>
- <div v-else-if="log.eventType === 'SUPERVISE'">
+ <div class="log" v-else-if="log.eventType === 'SUPERVISE'">
<div>
<span class="tag name">{{log.nickName}}</span>
- 鍦�
+ 浜�
<span class="tag time">{{log.gmtCreate}}</span>
- <span class="tag op">鐫ｅ姙</span>
+ <span class="tag db">鐫ｅ姙</span>
浜嗕换鍔�
<span class="tag taskName">{{log.taskName}}</span>
+ 锛�
+ <span class="tag db">鐫ｅ姙淇℃伅</span>
+ 锛�
+ <span class="tag">{{log.eventDataObj.content}}</span>
</div>
</div>
- <div v-else-if="log.eventType === 'TEAM_WORK'">
+ <div class="log" v-else-if="log.eventType === 'TEAM_WORK'">
<div>
<span class="tag name">{{log.nickName}}</span>
- 鍦�
+ 浜�
<span class="tag time">{{log.gmtCreate}}</span>
閭�璇蜂簡璋佽皝璋�
<span class="tag op">鍗忓悓鍔炵悊</span>
@@ -89,6 +102,16 @@
</script>
<style scoped>
+.log-warp {
+ font-size: 18px;
+}
+.log {
+ width: 100%;
+ margin-bottom: 15px;
+ overflow-wrap: break-word;
+ background-color: #E4E7ED;
+ padding: 5px 0px;
+}
.tag {
margin: 0 5px;
}
@@ -102,6 +125,9 @@
color: #409EFF;
}
.op {
+ color: #67C23A;
+}
+.reject, .db, .jump {
color: #F56C6C;
}
</style>
diff --git a/src/views/projectProcess/detail/index.vue b/src/views/projectProcess/detail/index.vue
index bcb344a..8a62dfd 100644
--- a/src/views/projectProcess/detail/index.vue
+++ b/src/views/projectProcess/detail/index.vue
@@ -37,7 +37,7 @@
</el-form>
<div style="position: absolute; right: 0; top: 0">
<el-button @click="openProcessImg" v-loading="imgLoading" type="primary">娴佺▼鍥�</el-button>
- <el-button @click="openRecord" type="info" v-loading="recordLoading">娴佽浆璁板綍</el-button>
+ <el-button @click="openRecord" type="info" v-loading="recordLoading">娴佺▼鏃ュ織</el-button>
</div>
</div>
<div class="table">
@@ -156,61 +156,72 @@
</div>
</el-dialog>
- <el-dialog
- :title="`${this.queryParams.processName}锛氭祦杞褰昤"
+ <el-drawer
+ :title="`${this.queryParams.processName}锛氭祦绋嬫棩蹇梎"
:visible.sync="processRecordShow"
- :fullscreen="true"
- :close-on-click-modal="false"
- :destroy-on-close="true"
- >
- <div>
- <div class="block">
- <el-timeline>
- <el-timeline-item
- v-for="(item,index ) in flowRecordList"
- :key="index"
- :icon="setIcon(item.finishTime)"
- :color="setColor(item.finishTime)"
- >
- <p style="font-weight: 700">{{item.taskName}}
- <span v-if="item.comment && item.comment.type === '3'" style="color: red">(鎵ц浜嗛┏鍥�)</span>
- <span v-if="item.overtime && item.overtime==='red'" style="color: red">(宸茶秴鏃�)</span>
- <span v-if="item.overtime && item.overtime==='yellow'" style="color: orange">(鍗冲皢瓒呮椂)</span>
- </p>
- <el-card :body-style="{ padding: '10px' }">
- <el-descriptions class="margin-top" :column="1" size="small" border>
- <el-descriptions-item v-if="item.assigneeName" label-class-name="my-label">
- <template slot="label"><i class="el-icon-user"></i>鍔炵悊浜�</template>
- {{item.assigneeName}}
- <el-tag type="info" size="mini">{{item.deptName}}</el-tag>
- </el-descriptions-item>
- <el-descriptions-item v-if="item.candidate" label-class-name="my-label">
- <template slot="label"><i class="el-icon-user"></i>鍊欓�夊姙鐞�</template>
- {{item.candidate}}
- </el-descriptions-item>
- <el-descriptions-item label-class-name="my-label">
- <template slot="label"><i class="el-icon-date"></i>鎺ユ敹鏃堕棿</template>
- {{item.createTime}}
- </el-descriptions-item>
- <el-descriptions-item v-if="item.finishTime" label-class-name="my-label">
- <template slot="label"><i class="el-icon-date"></i>澶勭悊鏃堕棿</template>
- {{item.finishTime}}
- </el-descriptions-item>
- <el-descriptions-item v-if="item.duration" label-class-name="my-label">
- <template slot="label"><i class="el-icon-time"></i>鑰楁椂</template>
- {{item.duration}}
- </el-descriptions-item>
- <el-descriptions-item v-if="item.comment" label-class-name="my-label">
- <template slot="label"><i class="el-icon-tickets"></i>澶勭悊鎰忚</template>
- {{item.comment.comment}}
- </el-descriptions-item>
- </el-descriptions>
- </el-card>
- </el-timeline-item>
- </el-timeline>
- </div>
- </div>
- </el-dialog>
+ direction="ltr"
+ :modal="false"
+ size="800px"
+ >
+ <log-view style="padding: 10px 20px" :log-list="logList"/>
+ </el-drawer>
+
+<!-- <el-dialog-->
+<!-- :title="`${this.queryParams.processName}锛氭祦杞褰昤"-->
+<!-- :visible.sync="processRecordShow"-->
+<!-- :fullscreen="true"-->
+<!-- :close-on-click-modal="false"-->
+<!-- :destroy-on-close="true"-->
+<!-- >-->
+<!-- <div>-->
+<!-- <log-view :log-list="logList"/>-->
+<!--<!– <div class="block">–>-->
+<!--<!– <el-timeline>–>-->
+<!--<!– <el-timeline-item–>-->
+<!--<!– v-for="(item,index ) in flowRecordList"–>-->
+<!--<!– :key="index"–>-->
+<!--<!– :icon="setIcon(item.finishTime)"–>-->
+<!--<!– :color="setColor(item.finishTime)"–>-->
+<!--<!– >–>-->
+<!--<!– <p style="font-weight: 700">{{item.taskName}}–>-->
+<!--<!– <span v-if="item.comment && item.comment.type === '3'" style="color: red">(鎵ц浜嗛┏鍥�)</span>–>-->
+<!--<!– <span v-if="item.overtime && item.overtime==='red'" style="color: red">(宸茶秴鏃�)</span>–>-->
+<!--<!– <span v-if="item.overtime && item.overtime==='yellow'" style="color: orange">(鍗冲皢瓒呮椂)</span>–>-->
+<!--<!– </p>–>-->
+<!--<!– <el-card :body-style="{ padding: '10px' }">–>-->
+<!--<!– <el-descriptions class="margin-top" :column="1" size="small" border>–>-->
+<!--<!– <el-descriptions-item v-if="item.assigneeName" label-class-name="my-label">–>-->
+<!--<!– <template slot="label"><i class="el-icon-user"></i>鍔炵悊浜�</template>–>-->
+<!--<!– {{item.assigneeName}}–>-->
+<!--<!– <el-tag type="info" size="mini">{{item.deptName}}</el-tag>–>-->
+<!--<!– </el-descriptions-item>–>-->
+<!--<!– <el-descriptions-item v-if="item.candidate" label-class-name="my-label">–>-->
+<!--<!– <template slot="label"><i class="el-icon-user"></i>鍊欓�夊姙鐞�</template>–>-->
+<!--<!– {{item.candidate}}–>-->
+<!--<!– </el-descriptions-item>–>-->
+<!--<!– <el-descriptions-item label-class-name="my-label">–>-->
+<!--<!– <template slot="label"><i class="el-icon-date"></i>鎺ユ敹鏃堕棿</template>–>-->
+<!--<!– {{item.createTime}}–>-->
+<!--<!– </el-descriptions-item>–>-->
+<!--<!– <el-descriptions-item v-if="item.finishTime" label-class-name="my-label">–>-->
+<!--<!– <template slot="label"><i class="el-icon-date"></i>澶勭悊鏃堕棿</template>–>-->
+<!--<!– {{item.finishTime}}–>-->
+<!--<!– </el-descriptions-item>–>-->
+<!--<!– <el-descriptions-item v-if="item.duration" label-class-name="my-label">–>-->
+<!--<!– <template slot="label"><i class="el-icon-time"></i>鑰楁椂</template>–>-->
+<!--<!– {{item.duration}}–>-->
+<!--<!– </el-descriptions-item>–>-->
+<!--<!– <el-descriptions-item v-if="item.comment" label-class-name="my-label">–>-->
+<!--<!– <template slot="label"><i class="el-icon-tickets"></i>澶勭悊鎰忚</template>–>-->
+<!--<!– {{item.comment.comment}}–>-->
+<!--<!– </el-descriptions-item>–>-->
+<!--<!– </el-descriptions>–>-->
+<!--<!– </el-card>–>-->
+<!--<!– </el-timeline-item>–>-->
+<!--<!– </el-timeline>–>-->
+<!--<!– </div>–>-->
+<!-- </div>-->
+<!-- </el-dialog>-->
<el-dialog :visible.sync="superviseShow" width="1000px" title="鐫ｅ姙" append-to-body>
<el-form ref="superviseForm" :model="superviseForm" :rules="superviseRules" label-width="80px">
<el-form-item label="鐫ｅ姙鍐呭" prop="content">
@@ -233,16 +244,20 @@
} from "@/api/projectProcess/projectProcess";
import {flowXmlAndNode} from "@/api/flowable/definition";
import BpmnViewer from '@/components/Process/viewer';
+import LogView from "@/views/projectProcess/components/LogView";
import {flowRecord} from "@/api/flowable/finished";
import {editProject} from "@/api/projectEngineering/projectInfo";
+import {getProjectProcessLog} from "@/api/flowLog/flowLog";
export default {
name: "Detail",
components: {
- BpmnViewer
+ BpmnViewer,
+ LogView
},
data() {
return {
+ logList: [], // 娴佺▼鏃ュ織
processRecordShow: false, // 娴佽浆璁板綍鏄剧ず
flowRecordList: [], // 娴佺▼娴佽浆鏁版嵁
recordLoading: false, // 娴佽浆璁板綍鍔犺浇
@@ -341,7 +356,7 @@
}
},
openRecord() {
- this.getFlowRecordList(this.queryParams.processInsId);
+ this.getFlowLogList(this.queryParams.processInsId);
},
openProcessImg() {
this.imgLoading = true
@@ -363,6 +378,15 @@
this.processRecordShow = true
})
},
+ getFlowLogList(procInsId) {
+ const params = {processInsId: procInsId, projectId: this.queryParams.projectId}
+ this.recordLoading = true
+ getProjectProcessLog(params).then(res => {
+ this.logList = res.data;
+ this.recordLoading = false
+ this.processRecordShow = true
+ })
+ },
unitFormatter(row) {
if (row.handlerType === 'USER') {
return null;
--
Gitblit v1.8.0