From e4dcc725b84c282e1a86cdefa23403326e8e3fe6 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期日, 02 三月 2025 17:21:02 +0800
Subject: [PATCH] 流程详情、办理时展示任务的特殊操作日志

---
 src/views/flowable/task/myProcess/send/index.vue   |   15 ++++++++++++++-
 src/views/flowable/task/myProcess/detail/index.vue |   16 +++++++++++++++-
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/views/flowable/task/myProcess/detail/index.vue b/src/views/flowable/task/myProcess/detail/index.vue
index ca06721..12e1c8f 100644
--- a/src/views/flowable/task/myProcess/detail/index.vue
+++ b/src/views/flowable/task/myProcess/detail/index.vue
@@ -30,6 +30,19 @@
                   >
                   </el-alert>
                 </div>
+                <div style="position: absolute;top: 10px; right: 20px" v-if="formDataObj.events.length > 0">
+                  <el-popover
+                    placement="right-start"
+                    title="浠诲姟鏃ュ織"
+                    width="600"
+                    trigger="hover"
+                    >
+                    <div v-if="formDataObj.events.length > 0">
+                      <log-view :log-list="formDataObj.events"/>
+                    </div>
+                    <el-button slot="reference">浠诲姟鏃ュ織</el-button>
+                  </el-popover>
+                </div>
                 <div v-if="formDataList.length <= 1">
                   <div class="before_none">鍓嶇疆闃舵锛�<span>涓嶅瓨鍦ㄥ墠缃樁娈�</span></div>
                   <el-alert
@@ -109,12 +122,13 @@
 import {getProcessVariables, flowXmlAndNode} from "@/api/flowable/definition";
 import {flowTaskForm, flowTaskFormDetail} from "@/api/flowable/todo";
 import BpmnViewer from '@/components/Process/viewer';
+import LogView from "@/views/projectProcess/components/LogView";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "Record",
   components: {
-    BpmnViewer
+    BpmnViewer, LogView
   },
   props: {},
   data() {
diff --git a/src/views/flowable/task/myProcess/send/index.vue b/src/views/flowable/task/myProcess/send/index.vue
index 07e4096..02da72f 100644
--- a/src/views/flowable/task/myProcess/send/index.vue
+++ b/src/views/flowable/task/myProcess/send/index.vue
@@ -17,7 +17,7 @@
                   <!--     褰撳墠鑺傜偣鍙崗鍚屻�佽浆鍔炵瓑鎿嶄綔         -->
                   <div class="op-list">
                     <el-button size="small" type="primary" :disabled="formDataObj.taskStatus === '鎸傝捣' || submitLoading" v-loading="submitLoading" @click="submitForm">纭骞舵彁浜�</el-button>
-                    <el-button size="small" type="primary" disabled @click="submitForm">鍗忓悓鍔炵悊(鍔熻兘寮�鍙戜腑)</el-button>
+<!--                    <el-button size="small" type="primary" disabled @click="submitForm">鍗忓悓鍔炵悊(鍔熻兘寮�鍙戜腑)</el-button>-->
                     <el-button size="small" type="primary" :disabled="formDataObj.taskStatus === '鎸傝捣'" @click="openDelegation(formDataList[0].beforeNodeName)">杞姙</el-button>
                     <el-button v-if="formDataObj.canJump" :disabled="formDataObj.taskStatus === '鎸傝捣'" size="small" type="primary" @click="jumpTask()">璺宠繃</el-button>
                     <el-button v-if="formDataObj.canWait" :disabled="formDataObj.taskStatus === '鎸傝捣'" size="small" type="primary" >瀹圭己</el-button>
@@ -30,6 +30,19 @@
                   <!--     鍓嶇疆鑺傜偣鍙┏鍥�         -->
                   <div class="reject-but">
                     <el-button type="danger" size="small" @click="openRejectTask(formDataObj.beforeNodeName)">椹� 鍥�</el-button>
+                    <div style="margin-left: 10px" v-if="formDataObj.events.length > 0">
+                      <el-popover
+                        placement="right-start"
+                        title="浠诲姟鏃ュ織"
+                        width="600"
+                        trigger="hover"
+                      >
+                        <div v-if="formDataObj.events.length > 0">
+                          <log-view :log-list="formDataObj.events"/>
+                        </div>
+                        <el-button slot="reference">浠诲姟鏃ュ織</el-button>
+                      </el-popover>
+                    </div>
                   </div>
                   <div class="before">鍓嶇疆闃舵锛�<span>{{formDataObj.beforeNodeName}}</span></div>
                 </div>

--
Gitblit v1.8.0