From 7e2445e59ae0f5aaa39b9b8c1fbdf32ed080f5c7 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 03 一月 2025 10:09:21 +0800
Subject: [PATCH] 流程推进页面设置前端缓存,实际处理人展示逻辑调整
---
src/views/flowable/task/myProcess/detail/index.vue | 5 ++---
src/views/projectProcess/detail/index.vue | 14 ++++++++------
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/views/flowable/task/myProcess/detail/index.vue b/src/views/flowable/task/myProcess/detail/index.vue
index 091bd6a..bcfd691 100644
--- a/src/views/flowable/task/myProcess/detail/index.vue
+++ b/src/views/flowable/task/myProcess/detail/index.vue
@@ -13,8 +13,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 +26,7 @@
</div>
</div>
</div>
- <div>
+ <div v-else>
<el-alert
title="褰撳墠鑺傜偣鏃犺〃鍗曟暟鎹�"
type="info"
diff --git a/src/views/projectProcess/detail/index.vue b/src/views/projectProcess/detail/index.vue
index 4d7dc5f..7398d8a 100644
--- a/src/views/projectProcess/detail/index.vue
+++ b/src/views/projectProcess/detail/index.vue
@@ -126,7 +126,7 @@
} from "@/api/projectProcess/projectProcess";
export default {
- name: "index",
+ name: "Detail",
data() {
return {
loading: false,
@@ -174,19 +174,21 @@
}
},
finalFinishedFormatter(row) {
- if (row.taskStatus === '鏈紑濮�') {
+ // 涓嶆槸宸插畬鎴愮殑鐘舵�佹病鏈夊疄闄呭鐞嗕汉锛屽凡瀹屾垚鐨勭姸鎬佸彧鏈変竴涓汉
+ if (row.taskStatus !== '宸插畬鎴�') {
return null
+ } else {
+ return row.handlerName
}
- return row.handlerName.join('銆�')
},
showHandle(row) {
- console.log(this.$store.state.user, "鐢ㄦ埛淇℃伅")
if (row.taskStatus === '寰呭姙') {
if (row.handlerType === "USER") {
- return this.$store.state.user.id === row.handlerId
+ console.log(row.handlerId.indexOf(this.$store.state.user.id) !== -1, "鎴戞槸涓嶆槸")
+ return row.handlerId.indexOf(this.$store.state.user.id) !== -1
} else if (row.handlerType === "DEPT") {
console.log(this.$store.state.user.deptId, "閮ㄩ棬id", row.handlerUnitId)
- return this.$store.state.user.deptId === row.handlerUnitId
+ return row.handlerUnitId.indexOf(this.$store.state.user.deptId) !== -1
// return this.$store.state.user.name === '甯傚彂灞曟敼闈╁' || this.$store.state.user.name === '甯備綇寤哄眬'
} else if (row.handlerType === "ROLE") {
return this.$auth.hasRole(row.handlerUnitName)
--
Gitblit v1.8.0