From c78889e71d16d26c03ff59746db47c6d4d2b98e0 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 03 三月 2025 20:41:25 +0800
Subject: [PATCH] Merge branch 'master' into dev
---
src/views/flowable/task/myProcess/send/index.vue | 27 ++++++++++++++-------------
src/views/projectProcess/index.vue | 4 ++--
2 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/src/views/flowable/task/myProcess/send/index.vue b/src/views/flowable/task/myProcess/send/index.vue
index 02da72f..f0a549d 100644
--- a/src/views/flowable/task/myProcess/send/index.vue
+++ b/src/views/flowable/task/myProcess/send/index.vue
@@ -30,19 +30,18 @@
<!-- 鍓嶇疆鑺傜偣鍙┏鍥� -->
<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>
+ <el-popover
+ style="margin-left: 10px" v-if="formDataObj.events.length > 0"
+ 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 class="before">鍓嶇疆闃舵锛�<span>{{formDataObj.beforeNodeName}}</span></div>
</div>
@@ -189,6 +188,7 @@
import {completeSubmitFormTask} from "@/api/flowable/process";
import { flowTaskForm } from "@/api/flowable/todo";
import {getNextFlowNodeByStart} from "@/api/flowable/todo";
+import LogView from "@/views/projectProcess/components/LogView";
import {rejectTask} from "@/api/flowable/process";
import {cancelTaskHangup, taskDelegation, taskHangup, taskJump} from "@/api/projectProcess/projectProcess";
@@ -200,6 +200,7 @@
MyDept,
SingleUser,
MultUser,
+ LogView
},
props: {},
data() {
diff --git a/src/views/projectProcess/index.vue b/src/views/projectProcess/index.vue
index 8e88d59..84fc791 100644
--- a/src/views/projectProcess/index.vue
+++ b/src/views/projectProcess/index.vue
@@ -412,9 +412,9 @@
this.nowProcessInsId = row.processInsId ? row.processInsId : '';
const numericPattern = /^\d+(\.\d+)?$/;
if (numericPattern.test(row.id)) {
- this.projectType = "ENGINEERING"
- } else {
this.projectType = "PROJECT"
+ } else {
+ this.projectType = "ENGINEERING"
}
// // 闃叉锛歩d娌″彉涓嶈Е鍙戠洃鍚�
// this.$refs.runProcess.setSelect(row.flowableProcessId);
--
Gitblit v1.8.0