From e87846bfc7e467836d958632b15a22a901eb51d2 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 09 一月 2025 15:33:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/flowable/task/myProcess/detail/index.vue | 58 ++++++++++++++++++++++++++++++++++------------------------
1 files changed, 34 insertions(+), 24 deletions(-)
diff --git a/src/views/flowable/task/myProcess/detail/index.vue b/src/views/flowable/task/myProcess/detail/index.vue
index f9c5720..9879bd8 100644
--- a/src/views/flowable/task/myProcess/detail/index.vue
+++ b/src/views/flowable/task/myProcess/detail/index.vue
@@ -9,17 +9,41 @@
<el-tabs tab-position="top" v-model="activeName" @tab-click="handleClick">
<!--琛ㄥ崟淇℃伅-->
<el-tab-pane label="琛ㄥ崟淇℃伅" name="1">
+ <!--鍒濆鍖栨祦绋嬪姞杞借〃鍗曚俊鎭�-->
<el-col :span="16" :offset="4">
<div v-if="formDataList && formDataList.length > 0">
- <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 !== ''">
- <v-form-render :form-data="formDataObj.formJson" :ref="'form' + index"/>
+ <div v-for="(formDataObj, index) in formDataList" :key="index" class="form-warp" style="position: relative">
+ <div v-if="formDataObj.current">
+ <div style="margin-bottom: 15px;color: #E6A23C">褰撳墠闃舵锛�<span style="color: #409EFF">{{formDataObj.beforeNodeName}}</span></div>
+ <div v-if="formDataObj.formJson !== null && formDataObj.formJson !== ''">
+ <v-form-render :form-data="formDataObj.formJson" :ref="'form' + index"/>
+ </div>
+ <div v-else>
+ <el-alert
+ title="褰撳墠鑺傜偣鏈粦瀹氳〃鍗�"
+ type="info"
+ :closable="false"
+ >
+ </el-alert>
+ </div>
</div>
- <div v-else>
+ <div v-else-if="formDataList.length > 1">
+ <div style="margin-bottom: 15px;color: #E6A23C">鍓嶇疆闃舵锛�<span style="color: #F56C6C">{{formDataObj.beforeNodeName}}</span></div>
+ <div v-if="formDataObj.formJson !== null && formDataObj.formJson !== ''">
+ <v-form-render :form-data="formDataObj.formJson" :ref="'form' + index"/>
+ </div>
+ <div v-else>
+ <el-alert
+ title="鍓嶇疆鑺傜偣鏈粦瀹氳〃鍗�"
+ type="info"
+ :closable="false"
+ >
+ </el-alert>
+ </div>
+ </div>
+ <div v-if="formDataList.length <= 1">
<el-alert
- title="鑺傜偣鏃犺〃鍗曟暟鎹�"
+ title="涓嶅瓨鍦ㄥ墠缃妭鐐�"
type="info"
:closable="false"
>
@@ -27,22 +51,7 @@
</div>
</div>
</div>
- <div v-else>
- <el-alert
- title="褰撳墠鑺傜偣鏃犺〃鍗曟暟鎹�"
- type="info"
- :closable="false"
- >
- </el-alert>
- <el-alert
- style="margin-top: 20px"
- title="鍓嶇疆鑺傜偣鏃犺〃鍗曟暟鎹�"
- type="info"
- :closable="false"
- >
- </el-alert>
- </div>
- </el-col>
+ </el-col>
</el-tab-pane>
<!--娴佺▼娴佽浆璁板綍-->
<el-tab-pane label="娴佽浆璁板綍" name="2">
@@ -57,7 +66,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>
--
Gitblit v1.8.0