From 1bfba74b6bea7da6d14b0da1ab8b1efe02e474b3 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 03 一月 2025 13:38:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/flowable/task/myProcess/detail/index.vue | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/views/flowable/task/myProcess/detail/index.vue b/src/views/flowable/task/myProcess/detail/index.vue
index 091bd6a..baa1eae 100644
--- a/src/views/flowable/task/myProcess/detail/index.vue
+++ b/src/views/flowable/task/myProcess/detail/index.vue
@@ -1,8 +1,9 @@
<template>
<div class="app-container">
<el-card class="box-card" >
- <div slot="header" class="clearfix">
- <span class="el-icon-document">浠诲姟璇︽儏</span>
+ <div slot="header" class="clearfix" style="display: flex">
+ <div style="flex: 1" class="el-icon-document">{{`浠诲姟璇︽儏锛歚 + this.goBackParams.processName}}</div>
+ <div style="flex: 2">{{projectName + '鈥斺��' + flowName}}</div>
<el-button style="float: right;" size="mini" type="danger" @click="goBack">鍏抽棴</el-button>
</div>
<el-tabs tab-position="top" v-model="activeName" @tab-click="handleClick">
@@ -13,8 +14,7 @@
<div v-for="(formDataObj, index) in formDataList" :key="index" class="form-warp">
<div v-if="formDataObj.current" style="margin-bottom: 15px;color: #409eff">褰撳墠闃舵锛�<span style="color: red">{{formDataObj.beforeNodeName}}</span></div>
<div v-else style="margin-bottom: 15px;color: #409eff">鍓嶇疆闃舵锛�<span style="color: #d5904b">{{formDataObj.beforeNodeName}}</span></div>
- <div v-if="formDataObj.formJson != null && formDataObj.formJson != ''">
- <div>111</div>
+ <div v-if="formDataObj.formJson !== null && formDataObj.formJson !== ''">
<v-form-render :form-data="formDataObj.formJson" :ref="'form' + index"/>
</div>
<div v-else>
@@ -27,7 +27,7 @@
</div>
</div>
</div>
- <div>
+ <div v-else>
<el-alert
title="褰撳墠鑺傜偣鏃犺〃鍗曟暟鎹�"
type="info"
@@ -57,7 +57,8 @@
>
<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" 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>
@@ -117,6 +118,8 @@
props: {},
data() {
return {
+ projectName: '',
+ flowName: '',
// 妯″瀷xml鏁版嵁
flowData: {},
formDataList: [], // 琛ㄥ崟鍒楄〃
@@ -143,6 +146,8 @@
this.taskForm.taskId = this.$route.query && this.$route.query.taskId;
this.taskForm.procInsId = this.$route.query && this.$route.query.procInsId;
this.goBackParams = this.$route.query && this.$route.query.goBackParams;
+ this.projectName = this.$route.query && this.$route.query.projectName;
+ this.flowName = this.$route.query && this.$route.query.flowName;
// 娴佺▼浠诲姟閲嶈幏鍙栧彉閲忚〃鍗�
this.processVariables( this.taskForm.taskId)
this.getFlowRecordList(this.taskForm.procInsId, this.taskForm.deployId);
@@ -264,11 +269,10 @@
}
.form-warp {
+ min-width: 700px;
padding: 20px;
+ margin-top: 5px;
margin-bottom: 20px;
- box-shadow:
- inset 0 -3em 3em rgba(0, 0, 0, 0.1),
- 0 0 0 2px rgb(239, 239, 239),
- 0.3em 0.3em 1em rgba(0, 0, 0, 0.3);
+ box-shadow: rgba(67, 71, 85, 0.27) 0px 0px 0.25em, rgba(90, 125, 188, 0.05) 0px 0.25em 1em;
}
</style>
--
Gitblit v1.8.0